diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 91bf9f9..e3a2c99 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -11,7 +11,9 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -20,13 +22,11 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -104,8 +103,8 @@ JzvdStd videoPlayerView; @BindView(R.id.addImageView) ImageView addImageView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -125,7 +124,7 @@ private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; private UploadVideoPresenterImpl uploadVideoPresenter; private String audioUrl, videoUrl; @@ -164,10 +163,8 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @SuppressLint("ClickableViewAccessibility") @@ -534,7 +531,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); imageList.add(url); @@ -542,21 +539,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -618,7 +615,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 91bf9f9..e3a2c99 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -11,7 +11,9 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -20,13 +22,11 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -104,8 +103,8 @@ JzvdStd videoPlayerView; @BindView(R.id.addImageView) ImageView addImageView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -125,7 +124,7 @@ private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; private UploadVideoPresenterImpl uploadVideoPresenter; private String audioUrl, videoUrl; @@ -164,10 +163,8 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @SuppressLint("ClickableViewAccessibility") @@ -534,7 +531,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); imageList.add(url); @@ -542,21 +539,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -618,7 +615,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index aa02a1c..b7b71f5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -62,8 +61,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -73,7 +72,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -97,10 +96,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -217,7 +214,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -273,7 +270,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -281,21 +278,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 91bf9f9..e3a2c99 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -11,7 +11,9 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -20,13 +22,11 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -104,8 +103,8 @@ JzvdStd videoPlayerView; @BindView(R.id.addImageView) ImageView addImageView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -125,7 +124,7 @@ private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; private UploadVideoPresenterImpl uploadVideoPresenter; private String audioUrl, videoUrl; @@ -164,10 +163,8 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @SuppressLint("ClickableViewAccessibility") @@ -534,7 +531,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); imageList.add(url); @@ -542,21 +539,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -618,7 +615,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index aa02a1c..b7b71f5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -62,8 +61,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -73,7 +72,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -97,10 +96,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -217,7 +214,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -273,7 +270,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -281,21 +278,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 964490e..f4f3501 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -29,7 +29,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -71,8 +70,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -90,7 +89,7 @@ private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; @Override @@ -115,10 +114,8 @@ .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -331,28 +328,28 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -401,7 +398,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 91bf9f9..e3a2c99 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -11,7 +11,9 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -20,13 +22,11 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -104,8 +103,8 @@ JzvdStd videoPlayerView; @BindView(R.id.addImageView) ImageView addImageView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -125,7 +124,7 @@ private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; private UploadVideoPresenterImpl uploadVideoPresenter; private String audioUrl, videoUrl; @@ -164,10 +163,8 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @SuppressLint("ClickableViewAccessibility") @@ -534,7 +531,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); imageList.add(url); @@ -542,21 +539,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -618,7 +615,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index aa02a1c..b7b71f5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -62,8 +61,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -73,7 +72,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -97,10 +96,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -217,7 +214,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -273,7 +270,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -281,21 +278,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 964490e..f4f3501 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -29,7 +29,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -71,8 +70,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -90,7 +89,7 @@ private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; @Override @@ -115,10 +114,8 @@ .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -331,28 +328,28 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -401,7 +398,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b8f97ec..496edba 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -57,8 +56,8 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -121,19 +120,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 91bf9f9..e3a2c99 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -11,7 +11,9 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -20,13 +22,11 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -104,8 +103,8 @@ JzvdStd videoPlayerView; @BindView(R.id.addImageView) ImageView addImageView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -125,7 +124,7 @@ private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; private UploadVideoPresenterImpl uploadVideoPresenter; private String audioUrl, videoUrl; @@ -164,10 +163,8 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @SuppressLint("ClickableViewAccessibility") @@ -534,7 +531,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); imageList.add(url); @@ -542,21 +539,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -618,7 +615,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index aa02a1c..b7b71f5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -62,8 +61,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -73,7 +72,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -97,10 +96,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -217,7 +214,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -273,7 +270,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -281,21 +278,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 964490e..f4f3501 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -29,7 +29,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -71,8 +70,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -90,7 +89,7 @@ private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; @Override @@ -115,10 +114,8 @@ .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -331,28 +328,28 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -401,7 +398,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b8f97ec..496edba 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -57,8 +56,8 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -121,19 +120,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index c3b3b66..5f6a3e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -39,7 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -87,16 +86,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseOpinionView) TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; - @BindView(R.id.caseVerifyRecyclerView) - RecyclerView caseVerifyRecyclerView; + @BindView(R.id.verifyGridView) + GridView verifyGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -139,7 +138,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private ImageRecycleViewAdapter verifyImageAdapter; + private ImageGridViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -168,10 +167,8 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); - verifyImageAdapter = new ImageRecycleViewAdapter(this); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(verifyImageAdapter); + verifyImageAdapter = new ImageGridViewAdapter(this); + verifyGridView.setAdapter(verifyImageAdapter); } @Override @@ -226,19 +223,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -386,7 +381,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -402,7 +397,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -533,7 +528,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = verifyImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -541,22 +536,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); //九宫格点击事件 - verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + verifyGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - verifyImageAdapter.setDeleteView(true); - verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + verifyImageAdapter.isDeleteVisible(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 91bf9f9..e3a2c99 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -11,7 +11,9 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -20,13 +22,11 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -104,8 +103,8 @@ JzvdStd videoPlayerView; @BindView(R.id.addImageView) ImageView addImageView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -125,7 +124,7 @@ private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; private UploadVideoPresenterImpl uploadVideoPresenter; private String audioUrl, videoUrl; @@ -164,10 +163,8 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @SuppressLint("ClickableViewAccessibility") @@ -534,7 +531,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); imageList.add(url); @@ -542,21 +539,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -618,7 +615,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index aa02a1c..b7b71f5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -62,8 +61,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -73,7 +72,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -97,10 +96,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -217,7 +214,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -273,7 +270,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -281,21 +278,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 964490e..f4f3501 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -29,7 +29,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -71,8 +70,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -90,7 +89,7 @@ private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; @Override @@ -115,10 +114,8 @@ .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -331,28 +328,28 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -401,7 +398,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b8f97ec..496edba 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -57,8 +56,8 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -121,19 +120,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index c3b3b66..5f6a3e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -39,7 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -87,16 +86,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseOpinionView) TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; - @BindView(R.id.caseVerifyRecyclerView) - RecyclerView caseVerifyRecyclerView; + @BindView(R.id.verifyGridView) + GridView verifyGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -139,7 +138,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private ImageRecycleViewAdapter verifyImageAdapter; + private ImageGridViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -168,10 +167,8 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); - verifyImageAdapter = new ImageRecycleViewAdapter(this); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(verifyImageAdapter); + verifyImageAdapter = new ImageGridViewAdapter(this); + verifyGridView.setAdapter(verifyImageAdapter); } @Override @@ -226,19 +223,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -386,7 +381,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -402,7 +397,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -533,7 +528,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = verifyImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -541,22 +536,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); //九宫格点击事件 - verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + verifyGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - verifyImageAdapter.setDeleteView(true); - verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + verifyImageAdapter.isDeleteVisible(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 3cedbfe..8b08041 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -57,8 +56,8 @@ EditText shopKeeperView; @BindView(R.id.phoneNumberView) EditText phoneNumberView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -67,7 +66,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopChangePresenterImpl shopChangePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; private ArrayList realPaths = new ArrayList<>();//真实图片路径 @@ -91,10 +90,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -153,7 +150,7 @@ ToastHelper.showToast("店主名还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -235,7 +232,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -243,21 +240,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 91bf9f9..e3a2c99 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -11,7 +11,9 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -20,13 +22,11 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -104,8 +103,8 @@ JzvdStd videoPlayerView; @BindView(R.id.addImageView) ImageView addImageView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -125,7 +124,7 @@ private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; private UploadVideoPresenterImpl uploadVideoPresenter; private String audioUrl, videoUrl; @@ -164,10 +163,8 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @SuppressLint("ClickableViewAccessibility") @@ -534,7 +531,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); imageList.add(url); @@ -542,21 +539,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -618,7 +615,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index aa02a1c..b7b71f5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -62,8 +61,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -73,7 +72,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -97,10 +96,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -217,7 +214,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -273,7 +270,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -281,21 +278,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 964490e..f4f3501 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -29,7 +29,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -71,8 +70,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -90,7 +89,7 @@ private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; @Override @@ -115,10 +114,8 @@ .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -331,28 +328,28 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -401,7 +398,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b8f97ec..496edba 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -57,8 +56,8 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -121,19 +120,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index c3b3b66..5f6a3e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -39,7 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -87,16 +86,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseOpinionView) TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; - @BindView(R.id.caseVerifyRecyclerView) - RecyclerView caseVerifyRecyclerView; + @BindView(R.id.verifyGridView) + GridView verifyGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -139,7 +138,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private ImageRecycleViewAdapter verifyImageAdapter; + private ImageGridViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -168,10 +167,8 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); - verifyImageAdapter = new ImageRecycleViewAdapter(this); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(verifyImageAdapter); + verifyImageAdapter = new ImageGridViewAdapter(this); + verifyGridView.setAdapter(verifyImageAdapter); } @Override @@ -226,19 +223,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -386,7 +381,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -402,7 +397,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -533,7 +528,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = verifyImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -541,22 +536,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); //九宫格点击事件 - verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + verifyGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - verifyImageAdapter.setDeleteView(true); - verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + verifyImageAdapter.isDeleteVisible(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 3cedbfe..8b08041 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -57,8 +56,8 @@ EditText shopKeeperView; @BindView(R.id.phoneNumberView) EditText phoneNumberView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -67,7 +66,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopChangePresenterImpl shopChangePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; private ArrayList realPaths = new ArrayList<>();//真实图片路径 @@ -91,10 +90,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -153,7 +150,7 @@ ToastHelper.showToast("店主名还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -235,7 +232,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -243,21 +240,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 381b704..d371d17 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -80,7 +80,7 @@ @Override public void initEvent() { - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", "", "", pageIndex); + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); calendarView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -98,7 +98,7 @@ endGroup = endGroupPosition;//结束月份位置 endChild = endChildPosition;//结束对应月份中日的位置 dateView.setText(startDate + "~" + endDate); - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", startDate, endDate, pageIndex); } }).builder(); @@ -110,7 +110,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); @@ -119,7 +119,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 91bf9f9..e3a2c99 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -11,7 +11,9 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -20,13 +22,11 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -104,8 +103,8 @@ JzvdStd videoPlayerView; @BindView(R.id.addImageView) ImageView addImageView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -125,7 +124,7 @@ private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; private UploadVideoPresenterImpl uploadVideoPresenter; private String audioUrl, videoUrl; @@ -164,10 +163,8 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @SuppressLint("ClickableViewAccessibility") @@ -534,7 +531,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); imageList.add(url); @@ -542,21 +539,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -618,7 +615,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index aa02a1c..b7b71f5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -62,8 +61,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -73,7 +72,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -97,10 +96,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -217,7 +214,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -273,7 +270,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -281,21 +278,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 964490e..f4f3501 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -29,7 +29,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -71,8 +70,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -90,7 +89,7 @@ private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; @Override @@ -115,10 +114,8 @@ .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -331,28 +328,28 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -401,7 +398,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b8f97ec..496edba 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -57,8 +56,8 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -121,19 +120,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index c3b3b66..5f6a3e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -39,7 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -87,16 +86,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseOpinionView) TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; - @BindView(R.id.caseVerifyRecyclerView) - RecyclerView caseVerifyRecyclerView; + @BindView(R.id.verifyGridView) + GridView verifyGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -139,7 +138,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private ImageRecycleViewAdapter verifyImageAdapter; + private ImageGridViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -168,10 +167,8 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); - verifyImageAdapter = new ImageRecycleViewAdapter(this); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(verifyImageAdapter); + verifyImageAdapter = new ImageGridViewAdapter(this); + verifyGridView.setAdapter(verifyImageAdapter); } @Override @@ -226,19 +223,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -386,7 +381,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -402,7 +397,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -533,7 +528,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = verifyImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -541,22 +536,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); //九宫格点击事件 - verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + verifyGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - verifyImageAdapter.setDeleteView(true); - verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + verifyImageAdapter.isDeleteVisible(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 3cedbfe..8b08041 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -57,8 +56,8 @@ EditText shopKeeperView; @BindView(R.id.phoneNumberView) EditText phoneNumberView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -67,7 +66,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopChangePresenterImpl shopChangePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; private ArrayList realPaths = new ArrayList<>();//真实图片路径 @@ -91,10 +90,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -153,7 +150,7 @@ ToastHelper.showToast("店主名还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -235,7 +232,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -243,21 +240,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 381b704..d371d17 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -80,7 +80,7 @@ @Override public void initEvent() { - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", "", "", pageIndex); + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); calendarView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -98,7 +98,7 @@ endGroup = endGroupPosition;//结束月份位置 endChild = endChildPosition;//结束对应月份中日的位置 dateView.setText(startDate + "~" + endDate); - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", startDate, endDate, pageIndex); } }).builder(); @@ -110,7 +110,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); @@ -119,7 +119,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0d7053a..3662274 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -3,17 +3,17 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -27,7 +27,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAdjustFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -66,14 +65,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.optionEditView) @@ -207,19 +206,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -250,19 +247,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 91bf9f9..e3a2c99 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -11,7 +11,9 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -20,13 +22,11 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -104,8 +103,8 @@ JzvdStd videoPlayerView; @BindView(R.id.addImageView) ImageView addImageView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -125,7 +124,7 @@ private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; private UploadVideoPresenterImpl uploadVideoPresenter; private String audioUrl, videoUrl; @@ -164,10 +163,8 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @SuppressLint("ClickableViewAccessibility") @@ -534,7 +531,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); imageList.add(url); @@ -542,21 +539,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -618,7 +615,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index aa02a1c..b7b71f5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -62,8 +61,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -73,7 +72,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -97,10 +96,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -217,7 +214,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -273,7 +270,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -281,21 +278,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 964490e..f4f3501 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -29,7 +29,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -71,8 +70,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -90,7 +89,7 @@ private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; @Override @@ -115,10 +114,8 @@ .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -331,28 +328,28 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -401,7 +398,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b8f97ec..496edba 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -57,8 +56,8 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -121,19 +120,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index c3b3b66..5f6a3e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -39,7 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -87,16 +86,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseOpinionView) TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; - @BindView(R.id.caseVerifyRecyclerView) - RecyclerView caseVerifyRecyclerView; + @BindView(R.id.verifyGridView) + GridView verifyGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -139,7 +138,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private ImageRecycleViewAdapter verifyImageAdapter; + private ImageGridViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -168,10 +167,8 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); - verifyImageAdapter = new ImageRecycleViewAdapter(this); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(verifyImageAdapter); + verifyImageAdapter = new ImageGridViewAdapter(this); + verifyGridView.setAdapter(verifyImageAdapter); } @Override @@ -226,19 +223,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -386,7 +381,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -402,7 +397,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -533,7 +528,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = verifyImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -541,22 +536,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); //九宫格点击事件 - verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + verifyGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - verifyImageAdapter.setDeleteView(true); - verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + verifyImageAdapter.isDeleteVisible(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 3cedbfe..8b08041 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -57,8 +56,8 @@ EditText shopKeeperView; @BindView(R.id.phoneNumberView) EditText phoneNumberView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -67,7 +66,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopChangePresenterImpl shopChangePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; private ArrayList realPaths = new ArrayList<>();//真实图片路径 @@ -91,10 +90,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -153,7 +150,7 @@ ToastHelper.showToast("店主名还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -235,7 +232,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -243,21 +240,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 381b704..d371d17 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -80,7 +80,7 @@ @Override public void initEvent() { - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", "", "", pageIndex); + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); calendarView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -98,7 +98,7 @@ endGroup = endGroupPosition;//结束月份位置 endChild = endChildPosition;//结束对应月份中日的位置 dateView.setText(startDate + "~" + endDate); - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", startDate, endDate, pageIndex); } }).builder(); @@ -110,7 +110,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); @@ -119,7 +119,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0d7053a..3662274 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -3,17 +3,17 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -27,7 +27,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAdjustFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -66,14 +65,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.optionEditView) @@ -207,19 +206,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -250,19 +247,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index bd491c3..19b9039 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAuthorizeFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -70,14 +69,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -264,19 +263,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -307,19 +304,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 91bf9f9..e3a2c99 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -11,7 +11,9 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -20,13 +22,11 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -104,8 +103,8 @@ JzvdStd videoPlayerView; @BindView(R.id.addImageView) ImageView addImageView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -125,7 +124,7 @@ private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; private UploadVideoPresenterImpl uploadVideoPresenter; private String audioUrl, videoUrl; @@ -164,10 +163,8 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @SuppressLint("ClickableViewAccessibility") @@ -534,7 +531,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); imageList.add(url); @@ -542,21 +539,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -618,7 +615,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index aa02a1c..b7b71f5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -62,8 +61,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -73,7 +72,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -97,10 +96,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -217,7 +214,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -273,7 +270,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -281,21 +278,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 964490e..f4f3501 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -29,7 +29,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -71,8 +70,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -90,7 +89,7 @@ private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; @Override @@ -115,10 +114,8 @@ .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -331,28 +328,28 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -401,7 +398,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b8f97ec..496edba 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -57,8 +56,8 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -121,19 +120,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index c3b3b66..5f6a3e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -39,7 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -87,16 +86,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseOpinionView) TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; - @BindView(R.id.caseVerifyRecyclerView) - RecyclerView caseVerifyRecyclerView; + @BindView(R.id.verifyGridView) + GridView verifyGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -139,7 +138,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private ImageRecycleViewAdapter verifyImageAdapter; + private ImageGridViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -168,10 +167,8 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); - verifyImageAdapter = new ImageRecycleViewAdapter(this); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(verifyImageAdapter); + verifyImageAdapter = new ImageGridViewAdapter(this); + verifyGridView.setAdapter(verifyImageAdapter); } @Override @@ -226,19 +223,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -386,7 +381,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -402,7 +397,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -533,7 +528,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = verifyImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -541,22 +536,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); //九宫格点击事件 - verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + verifyGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - verifyImageAdapter.setDeleteView(true); - verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + verifyImageAdapter.isDeleteVisible(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 3cedbfe..8b08041 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -57,8 +56,8 @@ EditText shopKeeperView; @BindView(R.id.phoneNumberView) EditText phoneNumberView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -67,7 +66,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopChangePresenterImpl shopChangePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; private ArrayList realPaths = new ArrayList<>();//真实图片路径 @@ -91,10 +90,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -153,7 +150,7 @@ ToastHelper.showToast("店主名还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -235,7 +232,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -243,21 +240,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 381b704..d371d17 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -80,7 +80,7 @@ @Override public void initEvent() { - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", "", "", pageIndex); + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); calendarView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -98,7 +98,7 @@ endGroup = endGroupPosition;//结束月份位置 endChild = endChildPosition;//结束对应月份中日的位置 dateView.setText(startDate + "~" + endDate); - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", startDate, endDate, pageIndex); } }).builder(); @@ -110,7 +110,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); @@ -119,7 +119,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0d7053a..3662274 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -3,17 +3,17 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -27,7 +27,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAdjustFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -66,14 +65,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.optionEditView) @@ -207,19 +206,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -250,19 +247,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index bd491c3..19b9039 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAuthorizeFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -70,14 +69,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -264,19 +263,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -307,19 +304,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java index f22a99d..797b130 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -32,7 +32,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -71,14 +70,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -157,19 +156,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -200,19 +197,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 91bf9f9..e3a2c99 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -11,7 +11,9 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -20,13 +22,11 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -104,8 +103,8 @@ JzvdStd videoPlayerView; @BindView(R.id.addImageView) ImageView addImageView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -125,7 +124,7 @@ private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; private UploadVideoPresenterImpl uploadVideoPresenter; private String audioUrl, videoUrl; @@ -164,10 +163,8 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @SuppressLint("ClickableViewAccessibility") @@ -534,7 +531,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); imageList.add(url); @@ -542,21 +539,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -618,7 +615,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index aa02a1c..b7b71f5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -62,8 +61,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -73,7 +72,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -97,10 +96,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -217,7 +214,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -273,7 +270,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -281,21 +278,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 964490e..f4f3501 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -29,7 +29,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -71,8 +70,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -90,7 +89,7 @@ private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; @Override @@ -115,10 +114,8 @@ .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -331,28 +328,28 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -401,7 +398,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b8f97ec..496edba 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -57,8 +56,8 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -121,19 +120,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index c3b3b66..5f6a3e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -39,7 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -87,16 +86,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseOpinionView) TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; - @BindView(R.id.caseVerifyRecyclerView) - RecyclerView caseVerifyRecyclerView; + @BindView(R.id.verifyGridView) + GridView verifyGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -139,7 +138,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private ImageRecycleViewAdapter verifyImageAdapter; + private ImageGridViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -168,10 +167,8 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); - verifyImageAdapter = new ImageRecycleViewAdapter(this); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(verifyImageAdapter); + verifyImageAdapter = new ImageGridViewAdapter(this); + verifyGridView.setAdapter(verifyImageAdapter); } @Override @@ -226,19 +223,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -386,7 +381,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -402,7 +397,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -533,7 +528,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = verifyImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -541,22 +536,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); //九宫格点击事件 - verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + verifyGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - verifyImageAdapter.setDeleteView(true); - verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + verifyImageAdapter.isDeleteVisible(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 3cedbfe..8b08041 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -57,8 +56,8 @@ EditText shopKeeperView; @BindView(R.id.phoneNumberView) EditText phoneNumberView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -67,7 +66,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopChangePresenterImpl shopChangePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; private ArrayList realPaths = new ArrayList<>();//真实图片路径 @@ -91,10 +90,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -153,7 +150,7 @@ ToastHelper.showToast("店主名还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -235,7 +232,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -243,21 +240,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 381b704..d371d17 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -80,7 +80,7 @@ @Override public void initEvent() { - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", "", "", pageIndex); + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); calendarView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -98,7 +98,7 @@ endGroup = endGroupPosition;//结束月份位置 endChild = endChildPosition;//结束对应月份中日的位置 dateView.setText(startDate + "~" + endDate); - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", startDate, endDate, pageIndex); } }).builder(); @@ -110,7 +110,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); @@ -119,7 +119,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0d7053a..3662274 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -3,17 +3,17 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -27,7 +27,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAdjustFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -66,14 +65,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.optionEditView) @@ -207,19 +206,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -250,19 +247,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index bd491c3..19b9039 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAuthorizeFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -70,14 +69,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -264,19 +263,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -307,19 +304,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java index f22a99d..797b130 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -32,7 +32,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -71,14 +70,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -157,19 +156,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -200,19 +197,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 1c1fcd0..e40d2cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -22,9 +22,11 @@ import com.casic.dcms.base.BaseApplication; import com.casic.dcms.base.DoubleClickExitActivity; import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.HomePageBean; import com.casic.dcms.bean.NoticeBean; import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.greendao.NoticeBeanDao; import com.casic.dcms.mvp.presenter.PushRegisterPresenterImpl; import com.casic.dcms.mvp.presenter.ToiletListPresenterImpl; @@ -44,6 +46,8 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StatusBarColorUtil; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.callback.IHttpRequestListener; import com.casic.dcms.widgets.NoScrollViewPager; import com.google.android.material.bottomnavigation.BottomNavigationView; @@ -59,7 +63,8 @@ import butterknife.BindView; import okhttp3.ResponseBody; -public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, IPushRegisterView, IToiletListView { +public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, + IPushRegisterView, IToiletListView { private static final String TAG = "MainActivity"; @BindView(R.id.pageTitleView) @@ -100,18 +105,17 @@ uploadPositionPresenter = new UploadPositionPresenterImpl(this); registerPresenter = new PushRegisterPresenterImpl(this); toiletListPresenter = new ToiletListPresenterImpl(this); - gson = new Gson(); + //获取配置项 + obtainProjectConfig(); + //配置页面 pageList = new ArrayList<>(); pageList.add(new HomePageFragment()); pageList.add(new PhonePageFragment()); pageList.add(new NoticePageFragment()); pageList.add(new MinePageFragment()); + imei = OtherUtils.obtainSimCardSerialNumber(this); - - //获取配置项 - obtainProjectConfig(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UploadLocationService.class)); } else { @@ -128,7 +132,7 @@ try { String resultStr = resultBean.string(); List bridges = gson.fromJson(resultStr, ProjectConfigBean.class).getBridges(); - SaveKeyValues.putValue(Constant.BRIDGE_LIST, gson.toJson(bridges)); + StringHelper.saveBridgeList(gson.toJson(bridges)); } catch (IOException e) { e.printStackTrace(); } @@ -310,7 +314,7 @@ @Override public void obtainToiletListData(ToiletListBean resultBean) { if (resultBean.isSuccess()) { - SaveKeyValues.putValue(Constant.TOILET_LIST, gson.toJson(resultBean.getData())); + StringHelper.saveToiletList(gson.toJson(resultBean.getData())); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 91bf9f9..e3a2c99 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -11,7 +11,9 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -20,13 +22,11 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -104,8 +103,8 @@ JzvdStd videoPlayerView; @BindView(R.id.addImageView) ImageView addImageView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -125,7 +124,7 @@ private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; private UploadVideoPresenterImpl uploadVideoPresenter; private String audioUrl, videoUrl; @@ -164,10 +163,8 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @SuppressLint("ClickableViewAccessibility") @@ -534,7 +531,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); imageList.add(url); @@ -542,21 +539,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -618,7 +615,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index aa02a1c..b7b71f5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -62,8 +61,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -73,7 +72,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -97,10 +96,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -217,7 +214,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -273,7 +270,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -281,21 +278,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 964490e..f4f3501 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -29,7 +29,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -71,8 +70,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -90,7 +89,7 @@ private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; @Override @@ -115,10 +114,8 @@ .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -331,28 +328,28 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -401,7 +398,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b8f97ec..496edba 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -57,8 +56,8 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -121,19 +120,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index c3b3b66..5f6a3e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -39,7 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -87,16 +86,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseOpinionView) TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; - @BindView(R.id.caseVerifyRecyclerView) - RecyclerView caseVerifyRecyclerView; + @BindView(R.id.verifyGridView) + GridView verifyGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -139,7 +138,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private ImageRecycleViewAdapter verifyImageAdapter; + private ImageGridViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -168,10 +167,8 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); - verifyImageAdapter = new ImageRecycleViewAdapter(this); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(verifyImageAdapter); + verifyImageAdapter = new ImageGridViewAdapter(this); + verifyGridView.setAdapter(verifyImageAdapter); } @Override @@ -226,19 +223,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -386,7 +381,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -402,7 +397,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -533,7 +528,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = verifyImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -541,22 +536,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); //九宫格点击事件 - verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + verifyGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - verifyImageAdapter.setDeleteView(true); - verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + verifyImageAdapter.isDeleteVisible(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 3cedbfe..8b08041 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -57,8 +56,8 @@ EditText shopKeeperView; @BindView(R.id.phoneNumberView) EditText phoneNumberView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -67,7 +66,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopChangePresenterImpl shopChangePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; private ArrayList realPaths = new ArrayList<>();//真实图片路径 @@ -91,10 +90,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -153,7 +150,7 @@ ToastHelper.showToast("店主名还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -235,7 +232,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -243,21 +240,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 381b704..d371d17 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -80,7 +80,7 @@ @Override public void initEvent() { - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", "", "", pageIndex); + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); calendarView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -98,7 +98,7 @@ endGroup = endGroupPosition;//结束月份位置 endChild = endChildPosition;//结束对应月份中日的位置 dateView.setText(startDate + "~" + endDate); - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", startDate, endDate, pageIndex); } }).builder(); @@ -110,7 +110,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); @@ -119,7 +119,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0d7053a..3662274 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -3,17 +3,17 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -27,7 +27,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAdjustFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -66,14 +65,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.optionEditView) @@ -207,19 +206,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -250,19 +247,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index bd491c3..19b9039 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAuthorizeFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -70,14 +69,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -264,19 +263,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -307,19 +304,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java index f22a99d..797b130 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -32,7 +32,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -71,14 +70,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -157,19 +156,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -200,19 +197,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 1c1fcd0..e40d2cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -22,9 +22,11 @@ import com.casic.dcms.base.BaseApplication; import com.casic.dcms.base.DoubleClickExitActivity; import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.HomePageBean; import com.casic.dcms.bean.NoticeBean; import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.greendao.NoticeBeanDao; import com.casic.dcms.mvp.presenter.PushRegisterPresenterImpl; import com.casic.dcms.mvp.presenter.ToiletListPresenterImpl; @@ -44,6 +46,8 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StatusBarColorUtil; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.callback.IHttpRequestListener; import com.casic.dcms.widgets.NoScrollViewPager; import com.google.android.material.bottomnavigation.BottomNavigationView; @@ -59,7 +63,8 @@ import butterknife.BindView; import okhttp3.ResponseBody; -public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, IPushRegisterView, IToiletListView { +public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, + IPushRegisterView, IToiletListView { private static final String TAG = "MainActivity"; @BindView(R.id.pageTitleView) @@ -100,18 +105,17 @@ uploadPositionPresenter = new UploadPositionPresenterImpl(this); registerPresenter = new PushRegisterPresenterImpl(this); toiletListPresenter = new ToiletListPresenterImpl(this); - gson = new Gson(); + //获取配置项 + obtainProjectConfig(); + //配置页面 pageList = new ArrayList<>(); pageList.add(new HomePageFragment()); pageList.add(new PhonePageFragment()); pageList.add(new NoticePageFragment()); pageList.add(new MinePageFragment()); + imei = OtherUtils.obtainSimCardSerialNumber(this); - - //获取配置项 - obtainProjectConfig(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UploadLocationService.class)); } else { @@ -128,7 +132,7 @@ try { String resultStr = resultBean.string(); List bridges = gson.fromJson(resultStr, ProjectConfigBean.class).getBridges(); - SaveKeyValues.putValue(Constant.BRIDGE_LIST, gson.toJson(bridges)); + StringHelper.saveBridgeList(gson.toJson(bridges)); } catch (IOException e) { e.printStackTrace(); } @@ -310,7 +314,7 @@ @Override public void obtainToiletListData(ToiletListBean resultBean) { if (resultBean.isSuccess()) { - SaveKeyValues.putValue(Constant.TOILET_LIST, gson.toJson(resultBean.getData())); + StringHelper.saveToiletList(gson.toJson(resultBean.getData())); } } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 441625b..fe48830 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -3,18 +3,16 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -44,16 +42,16 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.punishTypeView) TextView punishTypeView; @BindView(R.id.punishOpinionView) TextView punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.punishDateView) TextView punishDateView; @@ -106,19 +104,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -131,19 +127,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处罚记录 @@ -158,19 +152,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + punishGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } punishDateView.setText(data.getPunishTime()); } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 91bf9f9..e3a2c99 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -11,7 +11,9 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -20,13 +22,11 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -104,8 +103,8 @@ JzvdStd videoPlayerView; @BindView(R.id.addImageView) ImageView addImageView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -125,7 +124,7 @@ private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; private UploadVideoPresenterImpl uploadVideoPresenter; private String audioUrl, videoUrl; @@ -164,10 +163,8 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @SuppressLint("ClickableViewAccessibility") @@ -534,7 +531,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); imageList.add(url); @@ -542,21 +539,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -618,7 +615,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index aa02a1c..b7b71f5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -62,8 +61,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -73,7 +72,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -97,10 +96,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -217,7 +214,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -273,7 +270,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -281,21 +278,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 964490e..f4f3501 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -29,7 +29,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -71,8 +70,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -90,7 +89,7 @@ private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; @Override @@ -115,10 +114,8 @@ .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -331,28 +328,28 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -401,7 +398,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b8f97ec..496edba 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -57,8 +56,8 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -121,19 +120,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index c3b3b66..5f6a3e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -39,7 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -87,16 +86,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseOpinionView) TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; - @BindView(R.id.caseVerifyRecyclerView) - RecyclerView caseVerifyRecyclerView; + @BindView(R.id.verifyGridView) + GridView verifyGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -139,7 +138,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private ImageRecycleViewAdapter verifyImageAdapter; + private ImageGridViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -168,10 +167,8 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); - verifyImageAdapter = new ImageRecycleViewAdapter(this); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(verifyImageAdapter); + verifyImageAdapter = new ImageGridViewAdapter(this); + verifyGridView.setAdapter(verifyImageAdapter); } @Override @@ -226,19 +223,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -386,7 +381,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -402,7 +397,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -533,7 +528,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = verifyImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -541,22 +536,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); //九宫格点击事件 - verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + verifyGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - verifyImageAdapter.setDeleteView(true); - verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + verifyImageAdapter.isDeleteVisible(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 3cedbfe..8b08041 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -57,8 +56,8 @@ EditText shopKeeperView; @BindView(R.id.phoneNumberView) EditText phoneNumberView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -67,7 +66,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopChangePresenterImpl shopChangePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; private ArrayList realPaths = new ArrayList<>();//真实图片路径 @@ -91,10 +90,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -153,7 +150,7 @@ ToastHelper.showToast("店主名还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -235,7 +232,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -243,21 +240,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 381b704..d371d17 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -80,7 +80,7 @@ @Override public void initEvent() { - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", "", "", pageIndex); + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); calendarView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -98,7 +98,7 @@ endGroup = endGroupPosition;//结束月份位置 endChild = endChildPosition;//结束对应月份中日的位置 dateView.setText(startDate + "~" + endDate); - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", startDate, endDate, pageIndex); } }).builder(); @@ -110,7 +110,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); @@ -119,7 +119,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0d7053a..3662274 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -3,17 +3,17 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -27,7 +27,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAdjustFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -66,14 +65,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.optionEditView) @@ -207,19 +206,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -250,19 +247,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index bd491c3..19b9039 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAuthorizeFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -70,14 +69,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -264,19 +263,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -307,19 +304,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java index f22a99d..797b130 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -32,7 +32,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -71,14 +70,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -157,19 +156,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -200,19 +197,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 1c1fcd0..e40d2cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -22,9 +22,11 @@ import com.casic.dcms.base.BaseApplication; import com.casic.dcms.base.DoubleClickExitActivity; import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.HomePageBean; import com.casic.dcms.bean.NoticeBean; import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.greendao.NoticeBeanDao; import com.casic.dcms.mvp.presenter.PushRegisterPresenterImpl; import com.casic.dcms.mvp.presenter.ToiletListPresenterImpl; @@ -44,6 +46,8 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StatusBarColorUtil; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.callback.IHttpRequestListener; import com.casic.dcms.widgets.NoScrollViewPager; import com.google.android.material.bottomnavigation.BottomNavigationView; @@ -59,7 +63,8 @@ import butterknife.BindView; import okhttp3.ResponseBody; -public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, IPushRegisterView, IToiletListView { +public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, + IPushRegisterView, IToiletListView { private static final String TAG = "MainActivity"; @BindView(R.id.pageTitleView) @@ -100,18 +105,17 @@ uploadPositionPresenter = new UploadPositionPresenterImpl(this); registerPresenter = new PushRegisterPresenterImpl(this); toiletListPresenter = new ToiletListPresenterImpl(this); - gson = new Gson(); + //获取配置项 + obtainProjectConfig(); + //配置页面 pageList = new ArrayList<>(); pageList.add(new HomePageFragment()); pageList.add(new PhonePageFragment()); pageList.add(new NoticePageFragment()); pageList.add(new MinePageFragment()); + imei = OtherUtils.obtainSimCardSerialNumber(this); - - //获取配置项 - obtainProjectConfig(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UploadLocationService.class)); } else { @@ -128,7 +132,7 @@ try { String resultStr = resultBean.string(); List bridges = gson.fromJson(resultStr, ProjectConfigBean.class).getBridges(); - SaveKeyValues.putValue(Constant.BRIDGE_LIST, gson.toJson(bridges)); + StringHelper.saveBridgeList(gson.toJson(bridges)); } catch (IOException e) { e.printStackTrace(); } @@ -310,7 +314,7 @@ @Override public void obtainToiletListData(ToiletListBean resultBean) { if (resultBean.isSuccess()) { - SaveKeyValues.putValue(Constant.TOILET_LIST, gson.toJson(resultBean.getData())); + StringHelper.saveToiletList(gson.toJson(resultBean.getData())); } } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 441625b..fe48830 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -3,18 +3,16 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -44,16 +42,16 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.punishTypeView) TextView punishTypeView; @BindView(R.id.punishOpinionView) TextView punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.punishDateView) TextView punishDateView; @@ -106,19 +104,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -131,19 +127,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处罚记录 @@ -158,19 +152,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + punishGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } punishDateView.setText(data.getPunishTime()); } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index 1dec74b..6711568 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -5,7 +5,9 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; @@ -13,11 +15,9 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; @@ -78,8 +77,8 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.line1) @@ -90,8 +89,8 @@ View line2; @BindView(R.id.reasonLayout) RelativeLayout reasonLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.addHandleImageView) ImageView addHandleImageView; @BindView(R.id.caseReasonView) @@ -102,8 +101,8 @@ TextView punishTypeView; @BindView(R.id.punishOpinionView) EditText punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.addPunishImageView) ImageView addPunishImageView; @BindView(R.id.punishDateView) @@ -120,7 +119,8 @@ private ArrayList punishRealPaths = new ArrayList<>();//真实图片路径 private List handleImageList = new ArrayList<>();//上传到服务器的数据集 private List punishImageList = new ArrayList<>();//上传到服务器的数据集 - private ImageRecycleViewAdapter punishImageAdapter, handleImageAdapter; + private ImageGridViewAdapter handleImageAdapter; + private ImageGridViewAdapter punishImageAdapter; private CaseNextNodePresenterImpl caseNextNodePresenter; private String changeState; private String approvalResult; @@ -155,17 +155,13 @@ .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); //处罚adapter - punishImageAdapter = new ImageRecycleViewAdapter(this); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(punishImageAdapter); + punishImageAdapter = new ImageGridViewAdapter(this); + punishGridView.setAdapter(punishImageAdapter); //下级结点 caseNextNodePresenter = new CaseNextNodePresenterImpl(this); - //案卷处理adapter - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); caseHandlePresenter = new CaseHandlePresenterImpl(this); packageHandlePresenter = new PackageHandlePresenterImpl(this); @@ -206,19 +202,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -231,19 +225,16 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + handleImageAdapter.setImageList(urls); + handleGridView.setAdapter(handleImageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + handleImageAdapter.isDeleteVisible(true); } } } @@ -382,7 +373,7 @@ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg if (isAddHandleImage) { //处理图片 - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); handleImageList.add(url); @@ -390,22 +381,22 @@ if (handleRealPaths.size() == 2) { addHandleImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, handleRealPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { handleImageList.remove(position); handleRealPaths.remove(position); - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); if (handleRealPaths.size() != 2) { addHandleImageView.setVisibility(View.VISIBLE); } @@ -416,7 +407,7 @@ } } else { //处罚图片 - int sumItemCount = punishImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = punishImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); punishImageList.add(url); @@ -424,21 +415,21 @@ if (punishRealPaths.size() == 2) { addPunishImageView.setVisibility(View.GONE); } - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); //九宫格点击事件 - punishImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, punishRealPaths); } }); //删除按钮点击事件 - punishImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + punishImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { punishImageList.remove(position); punishRealPaths.remove(position); - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); if (punishRealPaths.size() != 2) { addPunishImageView.setVisibility(View.VISIBLE); } @@ -506,7 +497,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 91bf9f9..e3a2c99 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -11,7 +11,9 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -20,13 +22,11 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -104,8 +103,8 @@ JzvdStd videoPlayerView; @BindView(R.id.addImageView) ImageView addImageView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -125,7 +124,7 @@ private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; private UploadVideoPresenterImpl uploadVideoPresenter; private String audioUrl, videoUrl; @@ -164,10 +163,8 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @SuppressLint("ClickableViewAccessibility") @@ -534,7 +531,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); imageList.add(url); @@ -542,21 +539,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -618,7 +615,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index aa02a1c..b7b71f5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -62,8 +61,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -73,7 +72,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -97,10 +96,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -217,7 +214,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -273,7 +270,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -281,21 +278,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 964490e..f4f3501 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -29,7 +29,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -71,8 +70,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -90,7 +89,7 @@ private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; @Override @@ -115,10 +114,8 @@ .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -331,28 +328,28 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -401,7 +398,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b8f97ec..496edba 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -57,8 +56,8 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -121,19 +120,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index c3b3b66..5f6a3e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -39,7 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -87,16 +86,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseOpinionView) TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; - @BindView(R.id.caseVerifyRecyclerView) - RecyclerView caseVerifyRecyclerView; + @BindView(R.id.verifyGridView) + GridView verifyGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -139,7 +138,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private ImageRecycleViewAdapter verifyImageAdapter; + private ImageGridViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -168,10 +167,8 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); - verifyImageAdapter = new ImageRecycleViewAdapter(this); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(verifyImageAdapter); + verifyImageAdapter = new ImageGridViewAdapter(this); + verifyGridView.setAdapter(verifyImageAdapter); } @Override @@ -226,19 +223,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -386,7 +381,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -402,7 +397,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -533,7 +528,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = verifyImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -541,22 +536,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); //九宫格点击事件 - verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + verifyGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - verifyImageAdapter.setDeleteView(true); - verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + verifyImageAdapter.isDeleteVisible(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 3cedbfe..8b08041 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -57,8 +56,8 @@ EditText shopKeeperView; @BindView(R.id.phoneNumberView) EditText phoneNumberView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -67,7 +66,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopChangePresenterImpl shopChangePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; private ArrayList realPaths = new ArrayList<>();//真实图片路径 @@ -91,10 +90,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -153,7 +150,7 @@ ToastHelper.showToast("店主名还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -235,7 +232,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -243,21 +240,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 381b704..d371d17 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -80,7 +80,7 @@ @Override public void initEvent() { - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", "", "", pageIndex); + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); calendarView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -98,7 +98,7 @@ endGroup = endGroupPosition;//结束月份位置 endChild = endChildPosition;//结束对应月份中日的位置 dateView.setText(startDate + "~" + endDate); - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", startDate, endDate, pageIndex); } }).builder(); @@ -110,7 +110,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); @@ -119,7 +119,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0d7053a..3662274 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -3,17 +3,17 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -27,7 +27,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAdjustFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -66,14 +65,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.optionEditView) @@ -207,19 +206,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -250,19 +247,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index bd491c3..19b9039 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAuthorizeFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -70,14 +69,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -264,19 +263,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -307,19 +304,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java index f22a99d..797b130 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -32,7 +32,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -71,14 +70,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -157,19 +156,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -200,19 +197,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 1c1fcd0..e40d2cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -22,9 +22,11 @@ import com.casic.dcms.base.BaseApplication; import com.casic.dcms.base.DoubleClickExitActivity; import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.HomePageBean; import com.casic.dcms.bean.NoticeBean; import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.greendao.NoticeBeanDao; import com.casic.dcms.mvp.presenter.PushRegisterPresenterImpl; import com.casic.dcms.mvp.presenter.ToiletListPresenterImpl; @@ -44,6 +46,8 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StatusBarColorUtil; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.callback.IHttpRequestListener; import com.casic.dcms.widgets.NoScrollViewPager; import com.google.android.material.bottomnavigation.BottomNavigationView; @@ -59,7 +63,8 @@ import butterknife.BindView; import okhttp3.ResponseBody; -public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, IPushRegisterView, IToiletListView { +public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, + IPushRegisterView, IToiletListView { private static final String TAG = "MainActivity"; @BindView(R.id.pageTitleView) @@ -100,18 +105,17 @@ uploadPositionPresenter = new UploadPositionPresenterImpl(this); registerPresenter = new PushRegisterPresenterImpl(this); toiletListPresenter = new ToiletListPresenterImpl(this); - gson = new Gson(); + //获取配置项 + obtainProjectConfig(); + //配置页面 pageList = new ArrayList<>(); pageList.add(new HomePageFragment()); pageList.add(new PhonePageFragment()); pageList.add(new NoticePageFragment()); pageList.add(new MinePageFragment()); + imei = OtherUtils.obtainSimCardSerialNumber(this); - - //获取配置项 - obtainProjectConfig(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UploadLocationService.class)); } else { @@ -128,7 +132,7 @@ try { String resultStr = resultBean.string(); List bridges = gson.fromJson(resultStr, ProjectConfigBean.class).getBridges(); - SaveKeyValues.putValue(Constant.BRIDGE_LIST, gson.toJson(bridges)); + StringHelper.saveBridgeList(gson.toJson(bridges)); } catch (IOException e) { e.printStackTrace(); } @@ -310,7 +314,7 @@ @Override public void obtainToiletListData(ToiletListBean resultBean) { if (resultBean.isSuccess()) { - SaveKeyValues.putValue(Constant.TOILET_LIST, gson.toJson(resultBean.getData())); + StringHelper.saveToiletList(gson.toJson(resultBean.getData())); } } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 441625b..fe48830 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -3,18 +3,16 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -44,16 +42,16 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.punishTypeView) TextView punishTypeView; @BindView(R.id.punishOpinionView) TextView punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.punishDateView) TextView punishDateView; @@ -106,19 +104,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -131,19 +127,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处罚记录 @@ -158,19 +152,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + punishGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } punishDateView.setText(data.getPunishTime()); } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index 1dec74b..6711568 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -5,7 +5,9 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; @@ -13,11 +15,9 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; @@ -78,8 +77,8 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.line1) @@ -90,8 +89,8 @@ View line2; @BindView(R.id.reasonLayout) RelativeLayout reasonLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.addHandleImageView) ImageView addHandleImageView; @BindView(R.id.caseReasonView) @@ -102,8 +101,8 @@ TextView punishTypeView; @BindView(R.id.punishOpinionView) EditText punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.addPunishImageView) ImageView addPunishImageView; @BindView(R.id.punishDateView) @@ -120,7 +119,8 @@ private ArrayList punishRealPaths = new ArrayList<>();//真实图片路径 private List handleImageList = new ArrayList<>();//上传到服务器的数据集 private List punishImageList = new ArrayList<>();//上传到服务器的数据集 - private ImageRecycleViewAdapter punishImageAdapter, handleImageAdapter; + private ImageGridViewAdapter handleImageAdapter; + private ImageGridViewAdapter punishImageAdapter; private CaseNextNodePresenterImpl caseNextNodePresenter; private String changeState; private String approvalResult; @@ -155,17 +155,13 @@ .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); //处罚adapter - punishImageAdapter = new ImageRecycleViewAdapter(this); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(punishImageAdapter); + punishImageAdapter = new ImageGridViewAdapter(this); + punishGridView.setAdapter(punishImageAdapter); //下级结点 caseNextNodePresenter = new CaseNextNodePresenterImpl(this); - //案卷处理adapter - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); caseHandlePresenter = new CaseHandlePresenterImpl(this); packageHandlePresenter = new PackageHandlePresenterImpl(this); @@ -206,19 +202,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -231,19 +225,16 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + handleImageAdapter.setImageList(urls); + handleGridView.setAdapter(handleImageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + handleImageAdapter.isDeleteVisible(true); } } } @@ -382,7 +373,7 @@ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg if (isAddHandleImage) { //处理图片 - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); handleImageList.add(url); @@ -390,22 +381,22 @@ if (handleRealPaths.size() == 2) { addHandleImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, handleRealPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { handleImageList.remove(position); handleRealPaths.remove(position); - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); if (handleRealPaths.size() != 2) { addHandleImageView.setVisibility(View.VISIBLE); } @@ -416,7 +407,7 @@ } } else { //处罚图片 - int sumItemCount = punishImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = punishImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); punishImageList.add(url); @@ -424,21 +415,21 @@ if (punishRealPaths.size() == 2) { addPunishImageView.setVisibility(View.GONE); } - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); //九宫格点击事件 - punishImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, punishRealPaths); } }); //删除按钮点击事件 - punishImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + punishImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { punishImageList.remove(position); punishRealPaths.remove(position); - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); if (punishRealPaths.size() != 2) { addPunishImageView.setVisibility(View.VISIBLE); } @@ -506,7 +497,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index 7e3d47e..7c58e30 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -31,7 +31,6 @@ import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; @@ -50,8 +49,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; @@ -216,16 +213,14 @@ mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.obtainToiletIdLayout: - String toiletValue = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); - if (toiletValue.equals("")) { + List toiletBeanList = StringHelper.getToiletBeanList(); + if (toiletBeanList.size() == 0) { ToastHelper.showToast("获取公厕数据失败，请联系管理员", ToastHelper.ERROR); return; } - List dataBeans = new Gson().fromJson(toiletValue, new TypeToken>() { - }.getType()); QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("请选择您要打卡的公厕"); - for (ToiletListBean.DataBean it : dataBeans) { + for (ToiletListBean.DataBean it : toiletBeanList) { sheetBuilder.addItem(it.getName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -233,7 +228,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - toiletIdView.setText(dataBeans.get(position).getId()); + toiletIdView.setText(toiletBeanList.get(position).getId()); //TODO 是否需要将地图移到相应的公厕，待定 } }).build().show(); @@ -308,7 +303,7 @@ ToastHelper.showToast("保洁开始时间不能为空", ToastHelper.WARING); return; } - cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserId(), + cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, endTimeView.getText().toString(), imagePath, StringHelper.filterString(workContentView.getText().toString())); diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 91bf9f9..e3a2c99 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -11,7 +11,9 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -20,13 +22,11 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -104,8 +103,8 @@ JzvdStd videoPlayerView; @BindView(R.id.addImageView) ImageView addImageView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -125,7 +124,7 @@ private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; private UploadVideoPresenterImpl uploadVideoPresenter; private String audioUrl, videoUrl; @@ -164,10 +163,8 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @SuppressLint("ClickableViewAccessibility") @@ -534,7 +531,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); imageList.add(url); @@ -542,21 +539,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -618,7 +615,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index aa02a1c..b7b71f5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -62,8 +61,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -73,7 +72,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -97,10 +96,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -217,7 +214,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -273,7 +270,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -281,21 +278,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 964490e..f4f3501 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -29,7 +29,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -71,8 +70,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -90,7 +89,7 @@ private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; @Override @@ -115,10 +114,8 @@ .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -331,28 +328,28 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -401,7 +398,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b8f97ec..496edba 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -57,8 +56,8 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -121,19 +120,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index c3b3b66..5f6a3e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -39,7 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -87,16 +86,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseOpinionView) TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; - @BindView(R.id.caseVerifyRecyclerView) - RecyclerView caseVerifyRecyclerView; + @BindView(R.id.verifyGridView) + GridView verifyGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -139,7 +138,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private ImageRecycleViewAdapter verifyImageAdapter; + private ImageGridViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -168,10 +167,8 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); - verifyImageAdapter = new ImageRecycleViewAdapter(this); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(verifyImageAdapter); + verifyImageAdapter = new ImageGridViewAdapter(this); + verifyGridView.setAdapter(verifyImageAdapter); } @Override @@ -226,19 +223,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -386,7 +381,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -402,7 +397,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -533,7 +528,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = verifyImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -541,22 +536,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); //九宫格点击事件 - verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + verifyGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - verifyImageAdapter.setDeleteView(true); - verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + verifyImageAdapter.isDeleteVisible(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 3cedbfe..8b08041 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -57,8 +56,8 @@ EditText shopKeeperView; @BindView(R.id.phoneNumberView) EditText phoneNumberView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -67,7 +66,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopChangePresenterImpl shopChangePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; private ArrayList realPaths = new ArrayList<>();//真实图片路径 @@ -91,10 +90,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -153,7 +150,7 @@ ToastHelper.showToast("店主名还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -235,7 +232,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -243,21 +240,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 381b704..d371d17 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -80,7 +80,7 @@ @Override public void initEvent() { - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", "", "", pageIndex); + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); calendarView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -98,7 +98,7 @@ endGroup = endGroupPosition;//结束月份位置 endChild = endChildPosition;//结束对应月份中日的位置 dateView.setText(startDate + "~" + endDate); - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", startDate, endDate, pageIndex); } }).builder(); @@ -110,7 +110,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); @@ -119,7 +119,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0d7053a..3662274 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -3,17 +3,17 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -27,7 +27,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAdjustFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -66,14 +65,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.optionEditView) @@ -207,19 +206,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -250,19 +247,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index bd491c3..19b9039 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAuthorizeFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -70,14 +69,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -264,19 +263,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -307,19 +304,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java index f22a99d..797b130 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -32,7 +32,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -71,14 +70,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -157,19 +156,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -200,19 +197,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 1c1fcd0..e40d2cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -22,9 +22,11 @@ import com.casic.dcms.base.BaseApplication; import com.casic.dcms.base.DoubleClickExitActivity; import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.HomePageBean; import com.casic.dcms.bean.NoticeBean; import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.greendao.NoticeBeanDao; import com.casic.dcms.mvp.presenter.PushRegisterPresenterImpl; import com.casic.dcms.mvp.presenter.ToiletListPresenterImpl; @@ -44,6 +46,8 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StatusBarColorUtil; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.callback.IHttpRequestListener; import com.casic.dcms.widgets.NoScrollViewPager; import com.google.android.material.bottomnavigation.BottomNavigationView; @@ -59,7 +63,8 @@ import butterknife.BindView; import okhttp3.ResponseBody; -public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, IPushRegisterView, IToiletListView { +public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, + IPushRegisterView, IToiletListView { private static final String TAG = "MainActivity"; @BindView(R.id.pageTitleView) @@ -100,18 +105,17 @@ uploadPositionPresenter = new UploadPositionPresenterImpl(this); registerPresenter = new PushRegisterPresenterImpl(this); toiletListPresenter = new ToiletListPresenterImpl(this); - gson = new Gson(); + //获取配置项 + obtainProjectConfig(); + //配置页面 pageList = new ArrayList<>(); pageList.add(new HomePageFragment()); pageList.add(new PhonePageFragment()); pageList.add(new NoticePageFragment()); pageList.add(new MinePageFragment()); + imei = OtherUtils.obtainSimCardSerialNumber(this); - - //获取配置项 - obtainProjectConfig(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UploadLocationService.class)); } else { @@ -128,7 +132,7 @@ try { String resultStr = resultBean.string(); List bridges = gson.fromJson(resultStr, ProjectConfigBean.class).getBridges(); - SaveKeyValues.putValue(Constant.BRIDGE_LIST, gson.toJson(bridges)); + StringHelper.saveBridgeList(gson.toJson(bridges)); } catch (IOException e) { e.printStackTrace(); } @@ -310,7 +314,7 @@ @Override public void obtainToiletListData(ToiletListBean resultBean) { if (resultBean.isSuccess()) { - SaveKeyValues.putValue(Constant.TOILET_LIST, gson.toJson(resultBean.getData())); + StringHelper.saveToiletList(gson.toJson(resultBean.getData())); } } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 441625b..fe48830 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -3,18 +3,16 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -44,16 +42,16 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.punishTypeView) TextView punishTypeView; @BindView(R.id.punishOpinionView) TextView punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.punishDateView) TextView punishDateView; @@ -106,19 +104,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -131,19 +127,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处罚记录 @@ -158,19 +152,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + punishGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } punishDateView.setText(data.getPunishTime()); } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index 1dec74b..6711568 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -5,7 +5,9 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; @@ -13,11 +15,9 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; @@ -78,8 +77,8 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.line1) @@ -90,8 +89,8 @@ View line2; @BindView(R.id.reasonLayout) RelativeLayout reasonLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.addHandleImageView) ImageView addHandleImageView; @BindView(R.id.caseReasonView) @@ -102,8 +101,8 @@ TextView punishTypeView; @BindView(R.id.punishOpinionView) EditText punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.addPunishImageView) ImageView addPunishImageView; @BindView(R.id.punishDateView) @@ -120,7 +119,8 @@ private ArrayList punishRealPaths = new ArrayList<>();//真实图片路径 private List handleImageList = new ArrayList<>();//上传到服务器的数据集 private List punishImageList = new ArrayList<>();//上传到服务器的数据集 - private ImageRecycleViewAdapter punishImageAdapter, handleImageAdapter; + private ImageGridViewAdapter handleImageAdapter; + private ImageGridViewAdapter punishImageAdapter; private CaseNextNodePresenterImpl caseNextNodePresenter; private String changeState; private String approvalResult; @@ -155,17 +155,13 @@ .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); //处罚adapter - punishImageAdapter = new ImageRecycleViewAdapter(this); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(punishImageAdapter); + punishImageAdapter = new ImageGridViewAdapter(this); + punishGridView.setAdapter(punishImageAdapter); //下级结点 caseNextNodePresenter = new CaseNextNodePresenterImpl(this); - //案卷处理adapter - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); caseHandlePresenter = new CaseHandlePresenterImpl(this); packageHandlePresenter = new PackageHandlePresenterImpl(this); @@ -206,19 +202,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -231,19 +225,16 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + handleImageAdapter.setImageList(urls); + handleGridView.setAdapter(handleImageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + handleImageAdapter.isDeleteVisible(true); } } } @@ -382,7 +373,7 @@ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg if (isAddHandleImage) { //处理图片 - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); handleImageList.add(url); @@ -390,22 +381,22 @@ if (handleRealPaths.size() == 2) { addHandleImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, handleRealPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { handleImageList.remove(position); handleRealPaths.remove(position); - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); if (handleRealPaths.size() != 2) { addHandleImageView.setVisibility(View.VISIBLE); } @@ -416,7 +407,7 @@ } } else { //处罚图片 - int sumItemCount = punishImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = punishImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); punishImageList.add(url); @@ -424,21 +415,21 @@ if (punishRealPaths.size() == 2) { addPunishImageView.setVisibility(View.GONE); } - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); //九宫格点击事件 - punishImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, punishRealPaths); } }); //删除按钮点击事件 - punishImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + punishImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { punishImageList.remove(position); punishRealPaths.remove(position); - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); if (punishRealPaths.size() != 2) { addPunishImageView.setVisibility(View.VISIBLE); } @@ -506,7 +497,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index 7e3d47e..7c58e30 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -31,7 +31,6 @@ import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; @@ -50,8 +49,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; @@ -216,16 +213,14 @@ mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.obtainToiletIdLayout: - String toiletValue = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); - if (toiletValue.equals("")) { + List toiletBeanList = StringHelper.getToiletBeanList(); + if (toiletBeanList.size() == 0) { ToastHelper.showToast("获取公厕数据失败，请联系管理员", ToastHelper.ERROR); return; } - List dataBeans = new Gson().fromJson(toiletValue, new TypeToken>() { - }.getType()); QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("请选择您要打卡的公厕"); - for (ToiletListBean.DataBean it : dataBeans) { + for (ToiletListBean.DataBean it : toiletBeanList) { sheetBuilder.addItem(it.getName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -233,7 +228,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - toiletIdView.setText(dataBeans.get(position).getId()); + toiletIdView.setText(toiletBeanList.get(position).getId()); //TODO 是否需要将地图移到相应的公厕，待定 } }).build().show(); @@ -308,7 +303,7 @@ ToastHelper.showToast("保洁开始时间不能为空", ToastHelper.WARING); return; } - cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserId(), + cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, endTimeView.getText().toString(), imagePath, StringHelper.filterString(workContentView.getText().toString())); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 3a8ebc6..9f316a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -7,6 +7,7 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.utils.StringHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; @@ -47,9 +48,10 @@ @Override public void initData() { - userNameView.setText(StringHelper.getUserName()); - userPhoneView.setText(StringHelper.getUserPhone()); - userDeptView.setText(StringHelper.getUserDept()); + UserBean.DataBean userBean = StringHelper.getUserBean(); + userNameView.setText(userBean.getName()); + userPhoneView.setText(userBean.getPhone()); + userDeptView.setText(userBean.getDeptName()); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 91bf9f9..e3a2c99 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -11,7 +11,9 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -20,13 +22,11 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -104,8 +103,8 @@ JzvdStd videoPlayerView; @BindView(R.id.addImageView) ImageView addImageView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -125,7 +124,7 @@ private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; private UploadVideoPresenterImpl uploadVideoPresenter; private String audioUrl, videoUrl; @@ -164,10 +163,8 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @SuppressLint("ClickableViewAccessibility") @@ -534,7 +531,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); imageList.add(url); @@ -542,21 +539,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -618,7 +615,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index aa02a1c..b7b71f5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -62,8 +61,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -73,7 +72,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -97,10 +96,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -217,7 +214,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -273,7 +270,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -281,21 +278,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 964490e..f4f3501 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -29,7 +29,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -71,8 +70,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -90,7 +89,7 @@ private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; @Override @@ -115,10 +114,8 @@ .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -331,28 +328,28 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -401,7 +398,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b8f97ec..496edba 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -57,8 +56,8 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -121,19 +120,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index c3b3b66..5f6a3e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -39,7 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -87,16 +86,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseOpinionView) TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; - @BindView(R.id.caseVerifyRecyclerView) - RecyclerView caseVerifyRecyclerView; + @BindView(R.id.verifyGridView) + GridView verifyGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -139,7 +138,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private ImageRecycleViewAdapter verifyImageAdapter; + private ImageGridViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -168,10 +167,8 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); - verifyImageAdapter = new ImageRecycleViewAdapter(this); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(verifyImageAdapter); + verifyImageAdapter = new ImageGridViewAdapter(this); + verifyGridView.setAdapter(verifyImageAdapter); } @Override @@ -226,19 +223,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -386,7 +381,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -402,7 +397,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -533,7 +528,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = verifyImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -541,22 +536,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); //九宫格点击事件 - verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + verifyGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - verifyImageAdapter.setDeleteView(true); - verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + verifyImageAdapter.isDeleteVisible(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 3cedbfe..8b08041 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -57,8 +56,8 @@ EditText shopKeeperView; @BindView(R.id.phoneNumberView) EditText phoneNumberView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -67,7 +66,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopChangePresenterImpl shopChangePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; private ArrayList realPaths = new ArrayList<>();//真实图片路径 @@ -91,10 +90,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -153,7 +150,7 @@ ToastHelper.showToast("店主名还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -235,7 +232,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -243,21 +240,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 381b704..d371d17 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -80,7 +80,7 @@ @Override public void initEvent() { - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", "", "", pageIndex); + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); calendarView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -98,7 +98,7 @@ endGroup = endGroupPosition;//结束月份位置 endChild = endChildPosition;//结束对应月份中日的位置 dateView.setText(startDate + "~" + endDate); - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", startDate, endDate, pageIndex); } }).builder(); @@ -110,7 +110,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); @@ -119,7 +119,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0d7053a..3662274 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -3,17 +3,17 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -27,7 +27,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAdjustFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -66,14 +65,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.optionEditView) @@ -207,19 +206,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -250,19 +247,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index bd491c3..19b9039 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAuthorizeFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -70,14 +69,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -264,19 +263,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -307,19 +304,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java index f22a99d..797b130 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -32,7 +32,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -71,14 +70,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -157,19 +156,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -200,19 +197,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 1c1fcd0..e40d2cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -22,9 +22,11 @@ import com.casic.dcms.base.BaseApplication; import com.casic.dcms.base.DoubleClickExitActivity; import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.HomePageBean; import com.casic.dcms.bean.NoticeBean; import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.greendao.NoticeBeanDao; import com.casic.dcms.mvp.presenter.PushRegisterPresenterImpl; import com.casic.dcms.mvp.presenter.ToiletListPresenterImpl; @@ -44,6 +46,8 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StatusBarColorUtil; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.callback.IHttpRequestListener; import com.casic.dcms.widgets.NoScrollViewPager; import com.google.android.material.bottomnavigation.BottomNavigationView; @@ -59,7 +63,8 @@ import butterknife.BindView; import okhttp3.ResponseBody; -public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, IPushRegisterView, IToiletListView { +public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, + IPushRegisterView, IToiletListView { private static final String TAG = "MainActivity"; @BindView(R.id.pageTitleView) @@ -100,18 +105,17 @@ uploadPositionPresenter = new UploadPositionPresenterImpl(this); registerPresenter = new PushRegisterPresenterImpl(this); toiletListPresenter = new ToiletListPresenterImpl(this); - gson = new Gson(); + //获取配置项 + obtainProjectConfig(); + //配置页面 pageList = new ArrayList<>(); pageList.add(new HomePageFragment()); pageList.add(new PhonePageFragment()); pageList.add(new NoticePageFragment()); pageList.add(new MinePageFragment()); + imei = OtherUtils.obtainSimCardSerialNumber(this); - - //获取配置项 - obtainProjectConfig(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UploadLocationService.class)); } else { @@ -128,7 +132,7 @@ try { String resultStr = resultBean.string(); List bridges = gson.fromJson(resultStr, ProjectConfigBean.class).getBridges(); - SaveKeyValues.putValue(Constant.BRIDGE_LIST, gson.toJson(bridges)); + StringHelper.saveBridgeList(gson.toJson(bridges)); } catch (IOException e) { e.printStackTrace(); } @@ -310,7 +314,7 @@ @Override public void obtainToiletListData(ToiletListBean resultBean) { if (resultBean.isSuccess()) { - SaveKeyValues.putValue(Constant.TOILET_LIST, gson.toJson(resultBean.getData())); + StringHelper.saveToiletList(gson.toJson(resultBean.getData())); } } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 441625b..fe48830 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -3,18 +3,16 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -44,16 +42,16 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.punishTypeView) TextView punishTypeView; @BindView(R.id.punishOpinionView) TextView punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.punishDateView) TextView punishDateView; @@ -106,19 +104,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -131,19 +127,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处罚记录 @@ -158,19 +152,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + punishGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } punishDateView.setText(data.getPunishTime()); } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index 1dec74b..6711568 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -5,7 +5,9 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; @@ -13,11 +15,9 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; @@ -78,8 +77,8 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.line1) @@ -90,8 +89,8 @@ View line2; @BindView(R.id.reasonLayout) RelativeLayout reasonLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.addHandleImageView) ImageView addHandleImageView; @BindView(R.id.caseReasonView) @@ -102,8 +101,8 @@ TextView punishTypeView; @BindView(R.id.punishOpinionView) EditText punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.addPunishImageView) ImageView addPunishImageView; @BindView(R.id.punishDateView) @@ -120,7 +119,8 @@ private ArrayList punishRealPaths = new ArrayList<>();//真实图片路径 private List handleImageList = new ArrayList<>();//上传到服务器的数据集 private List punishImageList = new ArrayList<>();//上传到服务器的数据集 - private ImageRecycleViewAdapter punishImageAdapter, handleImageAdapter; + private ImageGridViewAdapter handleImageAdapter; + private ImageGridViewAdapter punishImageAdapter; private CaseNextNodePresenterImpl caseNextNodePresenter; private String changeState; private String approvalResult; @@ -155,17 +155,13 @@ .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); //处罚adapter - punishImageAdapter = new ImageRecycleViewAdapter(this); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(punishImageAdapter); + punishImageAdapter = new ImageGridViewAdapter(this); + punishGridView.setAdapter(punishImageAdapter); //下级结点 caseNextNodePresenter = new CaseNextNodePresenterImpl(this); - //案卷处理adapter - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); caseHandlePresenter = new CaseHandlePresenterImpl(this); packageHandlePresenter = new PackageHandlePresenterImpl(this); @@ -206,19 +202,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -231,19 +225,16 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + handleImageAdapter.setImageList(urls); + handleGridView.setAdapter(handleImageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + handleImageAdapter.isDeleteVisible(true); } } } @@ -382,7 +373,7 @@ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg if (isAddHandleImage) { //处理图片 - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); handleImageList.add(url); @@ -390,22 +381,22 @@ if (handleRealPaths.size() == 2) { addHandleImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, handleRealPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { handleImageList.remove(position); handleRealPaths.remove(position); - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); if (handleRealPaths.size() != 2) { addHandleImageView.setVisibility(View.VISIBLE); } @@ -416,7 +407,7 @@ } } else { //处罚图片 - int sumItemCount = punishImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = punishImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); punishImageList.add(url); @@ -424,21 +415,21 @@ if (punishRealPaths.size() == 2) { addPunishImageView.setVisibility(View.GONE); } - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); //九宫格点击事件 - punishImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, punishRealPaths); } }); //删除按钮点击事件 - punishImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + punishImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { punishImageList.remove(position); punishRealPaths.remove(position); - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); if (punishRealPaths.size() != 2) { addPunishImageView.setVisibility(View.VISIBLE); } @@ -506,7 +497,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index 7e3d47e..7c58e30 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -31,7 +31,6 @@ import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; @@ -50,8 +49,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; @@ -216,16 +213,14 @@ mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.obtainToiletIdLayout: - String toiletValue = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); - if (toiletValue.equals("")) { + List toiletBeanList = StringHelper.getToiletBeanList(); + if (toiletBeanList.size() == 0) { ToastHelper.showToast("获取公厕数据失败，请联系管理员", ToastHelper.ERROR); return; } - List dataBeans = new Gson().fromJson(toiletValue, new TypeToken>() { - }.getType()); QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("请选择您要打卡的公厕"); - for (ToiletListBean.DataBean it : dataBeans) { + for (ToiletListBean.DataBean it : toiletBeanList) { sheetBuilder.addItem(it.getName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -233,7 +228,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - toiletIdView.setText(dataBeans.get(position).getId()); + toiletIdView.setText(toiletBeanList.get(position).getId()); //TODO 是否需要将地图移到相应的公厕，待定 } }).build().show(); @@ -308,7 +303,7 @@ ToastHelper.showToast("保洁开始时间不能为空", ToastHelper.WARING); return; } - cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserId(), + cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, endTimeView.getText().toString(), imagePath, StringHelper.filterString(workContentView.getText().toString())); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 3a8ebc6..9f316a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -7,6 +7,7 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.utils.StringHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; @@ -47,9 +48,10 @@ @Override public void initData() { - userNameView.setText(StringHelper.getUserName()); - userPhoneView.setText(StringHelper.getUserPhone()); - userDeptView.setText(StringHelper.getUserDept()); + UserBean.DataBean userBean = StringHelper.getUserBean(); + userNameView.setText(userBean.getName()); + userPhoneView.setText(userBean.getPhone()); + userDeptView.setText(userBean.getDeptName()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index d9656aa..16bd2e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -39,6 +39,7 @@ import com.casic.dcms.ui.UrgentCaseActivity; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import butterknife.BindView; @@ -74,36 +75,38 @@ @Override protected void initData() { - userDataPresenter = new UserDataPresenterImpl(this); homePagePresenter = new HomePagePresenterImpl(this); + userDataPresenter = new UserDataPresenterImpl(this); + + //用户信息 + userDataPresenter.onReadyRetrofitRequest(); + //首页相关功能项 + homePagePresenter.onReadyRetrofitRequest("05"); } @Override protected void initEvent() { - userDataPresenter.onReadyRetrofitRequest(); - homePagePresenter.onReadyRetrofitRequest("05"); + //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 +// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); + Glide.with(this).load(R.mipmap.app_logo).into(userIconView); } @SuppressLint("SetTextI18n") @Override public void obtainUserData(UserBean userBean) { if (userBean.isSuccess()) { - //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 -// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); - Glide.with(this).load(R.mipmap.app_logo).into(userIconView); + UserBean.DataBean dataBean = userBean.getData(); + StringHelper.saveUserBean(new Gson().toJson(dataBean)); - UserBean.DataBean data = userBean.getData(); - userNameView.setText(data.getName()); - userDeptView.setText(data.getDeptName() + data.getRoleNames()); - - StringHelper.saveUserName(data.getName()); - StringHelper.saveUserPhone(data.getPhone()); - StringHelper.saveUserDept(data.getDeptName()); - StringHelper.saveUserDeptId(data.getDeptId()); - StringHelper.saveUserId(data.getId()); + userNameView.setText(dataBean.getName()); + userDeptView.setText(dataBean.getDeptName() + dataBean.getRoleNames()); } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); + } @Override public void obtainHomePageResult(HomePageBean resultBean) { @@ -183,11 +186,6 @@ } @Override - public void obtainDataFail() { - ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); - } - - @Override public void onDestroyView() { super.onDestroyView(); if (userDataPresenter != null) { @@ -197,4 +195,4 @@ homePagePresenter.disposeRetrofitRequest(); } } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 91bf9f9..e3a2c99 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -11,7 +11,9 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -20,13 +22,11 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -104,8 +103,8 @@ JzvdStd videoPlayerView; @BindView(R.id.addImageView) ImageView addImageView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -125,7 +124,7 @@ private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; private UploadVideoPresenterImpl uploadVideoPresenter; private String audioUrl, videoUrl; @@ -164,10 +163,8 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @SuppressLint("ClickableViewAccessibility") @@ -534,7 +531,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); imageList.add(url); @@ -542,21 +539,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -618,7 +615,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index aa02a1c..b7b71f5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -62,8 +61,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -73,7 +72,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -97,10 +96,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -217,7 +214,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -273,7 +270,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -281,21 +278,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 964490e..f4f3501 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -29,7 +29,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -71,8 +70,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -90,7 +89,7 @@ private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; @Override @@ -115,10 +114,8 @@ .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -331,28 +328,28 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -401,7 +398,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b8f97ec..496edba 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -57,8 +56,8 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -121,19 +120,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index c3b3b66..5f6a3e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -39,7 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -87,16 +86,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseOpinionView) TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; - @BindView(R.id.caseVerifyRecyclerView) - RecyclerView caseVerifyRecyclerView; + @BindView(R.id.verifyGridView) + GridView verifyGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -139,7 +138,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private ImageRecycleViewAdapter verifyImageAdapter; + private ImageGridViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -168,10 +167,8 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); - verifyImageAdapter = new ImageRecycleViewAdapter(this); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(verifyImageAdapter); + verifyImageAdapter = new ImageGridViewAdapter(this); + verifyGridView.setAdapter(verifyImageAdapter); } @Override @@ -226,19 +223,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -386,7 +381,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -402,7 +397,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -533,7 +528,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = verifyImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -541,22 +536,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); //九宫格点击事件 - verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + verifyGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - verifyImageAdapter.setDeleteView(true); - verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + verifyImageAdapter.isDeleteVisible(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 3cedbfe..8b08041 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -57,8 +56,8 @@ EditText shopKeeperView; @BindView(R.id.phoneNumberView) EditText phoneNumberView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -67,7 +66,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopChangePresenterImpl shopChangePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; private ArrayList realPaths = new ArrayList<>();//真实图片路径 @@ -91,10 +90,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -153,7 +150,7 @@ ToastHelper.showToast("店主名还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -235,7 +232,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -243,21 +240,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 381b704..d371d17 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -80,7 +80,7 @@ @Override public void initEvent() { - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", "", "", pageIndex); + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); calendarView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -98,7 +98,7 @@ endGroup = endGroupPosition;//结束月份位置 endChild = endChildPosition;//结束对应月份中日的位置 dateView.setText(startDate + "~" + endDate); - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", startDate, endDate, pageIndex); } }).builder(); @@ -110,7 +110,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); @@ -119,7 +119,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0d7053a..3662274 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -3,17 +3,17 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -27,7 +27,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAdjustFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -66,14 +65,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.optionEditView) @@ -207,19 +206,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -250,19 +247,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index bd491c3..19b9039 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAuthorizeFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -70,14 +69,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -264,19 +263,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -307,19 +304,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java index f22a99d..797b130 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -32,7 +32,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -71,14 +70,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -157,19 +156,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -200,19 +197,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 1c1fcd0..e40d2cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -22,9 +22,11 @@ import com.casic.dcms.base.BaseApplication; import com.casic.dcms.base.DoubleClickExitActivity; import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.HomePageBean; import com.casic.dcms.bean.NoticeBean; import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.greendao.NoticeBeanDao; import com.casic.dcms.mvp.presenter.PushRegisterPresenterImpl; import com.casic.dcms.mvp.presenter.ToiletListPresenterImpl; @@ -44,6 +46,8 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StatusBarColorUtil; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.callback.IHttpRequestListener; import com.casic.dcms.widgets.NoScrollViewPager; import com.google.android.material.bottomnavigation.BottomNavigationView; @@ -59,7 +63,8 @@ import butterknife.BindView; import okhttp3.ResponseBody; -public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, IPushRegisterView, IToiletListView { +public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, + IPushRegisterView, IToiletListView { private static final String TAG = "MainActivity"; @BindView(R.id.pageTitleView) @@ -100,18 +105,17 @@ uploadPositionPresenter = new UploadPositionPresenterImpl(this); registerPresenter = new PushRegisterPresenterImpl(this); toiletListPresenter = new ToiletListPresenterImpl(this); - gson = new Gson(); + //获取配置项 + obtainProjectConfig(); + //配置页面 pageList = new ArrayList<>(); pageList.add(new HomePageFragment()); pageList.add(new PhonePageFragment()); pageList.add(new NoticePageFragment()); pageList.add(new MinePageFragment()); + imei = OtherUtils.obtainSimCardSerialNumber(this); - - //获取配置项 - obtainProjectConfig(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UploadLocationService.class)); } else { @@ -128,7 +132,7 @@ try { String resultStr = resultBean.string(); List bridges = gson.fromJson(resultStr, ProjectConfigBean.class).getBridges(); - SaveKeyValues.putValue(Constant.BRIDGE_LIST, gson.toJson(bridges)); + StringHelper.saveBridgeList(gson.toJson(bridges)); } catch (IOException e) { e.printStackTrace(); } @@ -310,7 +314,7 @@ @Override public void obtainToiletListData(ToiletListBean resultBean) { if (resultBean.isSuccess()) { - SaveKeyValues.putValue(Constant.TOILET_LIST, gson.toJson(resultBean.getData())); + StringHelper.saveToiletList(gson.toJson(resultBean.getData())); } } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 441625b..fe48830 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -3,18 +3,16 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -44,16 +42,16 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.punishTypeView) TextView punishTypeView; @BindView(R.id.punishOpinionView) TextView punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.punishDateView) TextView punishDateView; @@ -106,19 +104,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -131,19 +127,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处罚记录 @@ -158,19 +152,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + punishGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } punishDateView.setText(data.getPunishTime()); } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index 1dec74b..6711568 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -5,7 +5,9 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; @@ -13,11 +15,9 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; @@ -78,8 +77,8 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.line1) @@ -90,8 +89,8 @@ View line2; @BindView(R.id.reasonLayout) RelativeLayout reasonLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.addHandleImageView) ImageView addHandleImageView; @BindView(R.id.caseReasonView) @@ -102,8 +101,8 @@ TextView punishTypeView; @BindView(R.id.punishOpinionView) EditText punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.addPunishImageView) ImageView addPunishImageView; @BindView(R.id.punishDateView) @@ -120,7 +119,8 @@ private ArrayList punishRealPaths = new ArrayList<>();//真实图片路径 private List handleImageList = new ArrayList<>();//上传到服务器的数据集 private List punishImageList = new ArrayList<>();//上传到服务器的数据集 - private ImageRecycleViewAdapter punishImageAdapter, handleImageAdapter; + private ImageGridViewAdapter handleImageAdapter; + private ImageGridViewAdapter punishImageAdapter; private CaseNextNodePresenterImpl caseNextNodePresenter; private String changeState; private String approvalResult; @@ -155,17 +155,13 @@ .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); //处罚adapter - punishImageAdapter = new ImageRecycleViewAdapter(this); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(punishImageAdapter); + punishImageAdapter = new ImageGridViewAdapter(this); + punishGridView.setAdapter(punishImageAdapter); //下级结点 caseNextNodePresenter = new CaseNextNodePresenterImpl(this); - //案卷处理adapter - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); caseHandlePresenter = new CaseHandlePresenterImpl(this); packageHandlePresenter = new PackageHandlePresenterImpl(this); @@ -206,19 +202,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -231,19 +225,16 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + handleImageAdapter.setImageList(urls); + handleGridView.setAdapter(handleImageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + handleImageAdapter.isDeleteVisible(true); } } } @@ -382,7 +373,7 @@ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg if (isAddHandleImage) { //处理图片 - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); handleImageList.add(url); @@ -390,22 +381,22 @@ if (handleRealPaths.size() == 2) { addHandleImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, handleRealPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { handleImageList.remove(position); handleRealPaths.remove(position); - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); if (handleRealPaths.size() != 2) { addHandleImageView.setVisibility(View.VISIBLE); } @@ -416,7 +407,7 @@ } } else { //处罚图片 - int sumItemCount = punishImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = punishImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); punishImageList.add(url); @@ -424,21 +415,21 @@ if (punishRealPaths.size() == 2) { addPunishImageView.setVisibility(View.GONE); } - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); //九宫格点击事件 - punishImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, punishRealPaths); } }); //删除按钮点击事件 - punishImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + punishImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { punishImageList.remove(position); punishRealPaths.remove(position); - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); if (punishRealPaths.size() != 2) { addPunishImageView.setVisibility(View.VISIBLE); } @@ -506,7 +497,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index 7e3d47e..7c58e30 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -31,7 +31,6 @@ import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; @@ -50,8 +49,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; @@ -216,16 +213,14 @@ mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.obtainToiletIdLayout: - String toiletValue = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); - if (toiletValue.equals("")) { + List toiletBeanList = StringHelper.getToiletBeanList(); + if (toiletBeanList.size() == 0) { ToastHelper.showToast("获取公厕数据失败，请联系管理员", ToastHelper.ERROR); return; } - List dataBeans = new Gson().fromJson(toiletValue, new TypeToken>() { - }.getType()); QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("请选择您要打卡的公厕"); - for (ToiletListBean.DataBean it : dataBeans) { + for (ToiletListBean.DataBean it : toiletBeanList) { sheetBuilder.addItem(it.getName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -233,7 +228,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - toiletIdView.setText(dataBeans.get(position).getId()); + toiletIdView.setText(toiletBeanList.get(position).getId()); //TODO 是否需要将地图移到相应的公厕，待定 } }).build().show(); @@ -308,7 +303,7 @@ ToastHelper.showToast("保洁开始时间不能为空", ToastHelper.WARING); return; } - cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserId(), + cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, endTimeView.getText().toString(), imagePath, StringHelper.filterString(workContentView.getText().toString())); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 3a8ebc6..9f316a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -7,6 +7,7 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.utils.StringHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; @@ -47,9 +48,10 @@ @Override public void initData() { - userNameView.setText(StringHelper.getUserName()); - userPhoneView.setText(StringHelper.getUserPhone()); - userDeptView.setText(StringHelper.getUserDept()); + UserBean.DataBean userBean = StringHelper.getUserBean(); + userNameView.setText(userBean.getName()); + userPhoneView.setText(userBean.getPhone()); + userDeptView.setText(userBean.getDeptName()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index d9656aa..16bd2e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -39,6 +39,7 @@ import com.casic.dcms.ui.UrgentCaseActivity; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import butterknife.BindView; @@ -74,36 +75,38 @@ @Override protected void initData() { - userDataPresenter = new UserDataPresenterImpl(this); homePagePresenter = new HomePagePresenterImpl(this); + userDataPresenter = new UserDataPresenterImpl(this); + + //用户信息 + userDataPresenter.onReadyRetrofitRequest(); + //首页相关功能项 + homePagePresenter.onReadyRetrofitRequest("05"); } @Override protected void initEvent() { - userDataPresenter.onReadyRetrofitRequest(); - homePagePresenter.onReadyRetrofitRequest("05"); + //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 +// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); + Glide.with(this).load(R.mipmap.app_logo).into(userIconView); } @SuppressLint("SetTextI18n") @Override public void obtainUserData(UserBean userBean) { if (userBean.isSuccess()) { - //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 -// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); - Glide.with(this).load(R.mipmap.app_logo).into(userIconView); + UserBean.DataBean dataBean = userBean.getData(); + StringHelper.saveUserBean(new Gson().toJson(dataBean)); - UserBean.DataBean data = userBean.getData(); - userNameView.setText(data.getName()); - userDeptView.setText(data.getDeptName() + data.getRoleNames()); - - StringHelper.saveUserName(data.getName()); - StringHelper.saveUserPhone(data.getPhone()); - StringHelper.saveUserDept(data.getDeptName()); - StringHelper.saveUserDeptId(data.getDeptId()); - StringHelper.saveUserId(data.getId()); + userNameView.setText(dataBean.getName()); + userDeptView.setText(dataBean.getDeptName() + dataBean.getRoleNames()); } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); + } @Override public void obtainHomePageResult(HomePageBean resultBean) { @@ -183,11 +186,6 @@ } @Override - public void obtainDataFail() { - ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); - } - - @Override public void onDestroyView() { super.onDestroyView(); if (userDataPresenter != null) { @@ -197,4 +195,4 @@ homePagePresenter.disposeRetrofitRequest(); } } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 1657341..13aa09b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -76,7 +76,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserDeptId()); + phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 91bf9f9..e3a2c99 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -11,7 +11,9 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -20,13 +22,11 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -104,8 +103,8 @@ JzvdStd videoPlayerView; @BindView(R.id.addImageView) ImageView addImageView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -125,7 +124,7 @@ private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; private UploadVideoPresenterImpl uploadVideoPresenter; private String audioUrl, videoUrl; @@ -164,10 +163,8 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @SuppressLint("ClickableViewAccessibility") @@ -534,7 +531,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); imageList.add(url); @@ -542,21 +539,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -618,7 +615,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index aa02a1c..b7b71f5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -62,8 +61,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -73,7 +72,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -97,10 +96,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -217,7 +214,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -273,7 +270,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -281,21 +278,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 964490e..f4f3501 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -29,7 +29,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -71,8 +70,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -90,7 +89,7 @@ private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; @Override @@ -115,10 +114,8 @@ .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -331,28 +328,28 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -401,7 +398,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b8f97ec..496edba 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -57,8 +56,8 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -121,19 +120,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index c3b3b66..5f6a3e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -39,7 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -87,16 +86,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseOpinionView) TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; - @BindView(R.id.caseVerifyRecyclerView) - RecyclerView caseVerifyRecyclerView; + @BindView(R.id.verifyGridView) + GridView verifyGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -139,7 +138,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private ImageRecycleViewAdapter verifyImageAdapter; + private ImageGridViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -168,10 +167,8 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); - verifyImageAdapter = new ImageRecycleViewAdapter(this); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(verifyImageAdapter); + verifyImageAdapter = new ImageGridViewAdapter(this); + verifyGridView.setAdapter(verifyImageAdapter); } @Override @@ -226,19 +223,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -386,7 +381,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -402,7 +397,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -533,7 +528,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = verifyImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -541,22 +536,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); //九宫格点击事件 - verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + verifyGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - verifyImageAdapter.setDeleteView(true); - verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + verifyImageAdapter.isDeleteVisible(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 3cedbfe..8b08041 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -57,8 +56,8 @@ EditText shopKeeperView; @BindView(R.id.phoneNumberView) EditText phoneNumberView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -67,7 +66,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopChangePresenterImpl shopChangePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; private ArrayList realPaths = new ArrayList<>();//真实图片路径 @@ -91,10 +90,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -153,7 +150,7 @@ ToastHelper.showToast("店主名还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -235,7 +232,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -243,21 +240,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 381b704..d371d17 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -80,7 +80,7 @@ @Override public void initEvent() { - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", "", "", pageIndex); + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); calendarView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -98,7 +98,7 @@ endGroup = endGroupPosition;//结束月份位置 endChild = endChildPosition;//结束对应月份中日的位置 dateView.setText(startDate + "~" + endDate); - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", startDate, endDate, pageIndex); } }).builder(); @@ -110,7 +110,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); @@ -119,7 +119,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0d7053a..3662274 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -3,17 +3,17 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -27,7 +27,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAdjustFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -66,14 +65,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.optionEditView) @@ -207,19 +206,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -250,19 +247,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index bd491c3..19b9039 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAuthorizeFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -70,14 +69,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -264,19 +263,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -307,19 +304,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java index f22a99d..797b130 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -32,7 +32,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -71,14 +70,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -157,19 +156,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -200,19 +197,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 1c1fcd0..e40d2cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -22,9 +22,11 @@ import com.casic.dcms.base.BaseApplication; import com.casic.dcms.base.DoubleClickExitActivity; import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.HomePageBean; import com.casic.dcms.bean.NoticeBean; import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.greendao.NoticeBeanDao; import com.casic.dcms.mvp.presenter.PushRegisterPresenterImpl; import com.casic.dcms.mvp.presenter.ToiletListPresenterImpl; @@ -44,6 +46,8 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StatusBarColorUtil; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.callback.IHttpRequestListener; import com.casic.dcms.widgets.NoScrollViewPager; import com.google.android.material.bottomnavigation.BottomNavigationView; @@ -59,7 +63,8 @@ import butterknife.BindView; import okhttp3.ResponseBody; -public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, IPushRegisterView, IToiletListView { +public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, + IPushRegisterView, IToiletListView { private static final String TAG = "MainActivity"; @BindView(R.id.pageTitleView) @@ -100,18 +105,17 @@ uploadPositionPresenter = new UploadPositionPresenterImpl(this); registerPresenter = new PushRegisterPresenterImpl(this); toiletListPresenter = new ToiletListPresenterImpl(this); - gson = new Gson(); + //获取配置项 + obtainProjectConfig(); + //配置页面 pageList = new ArrayList<>(); pageList.add(new HomePageFragment()); pageList.add(new PhonePageFragment()); pageList.add(new NoticePageFragment()); pageList.add(new MinePageFragment()); + imei = OtherUtils.obtainSimCardSerialNumber(this); - - //获取配置项 - obtainProjectConfig(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UploadLocationService.class)); } else { @@ -128,7 +132,7 @@ try { String resultStr = resultBean.string(); List bridges = gson.fromJson(resultStr, ProjectConfigBean.class).getBridges(); - SaveKeyValues.putValue(Constant.BRIDGE_LIST, gson.toJson(bridges)); + StringHelper.saveBridgeList(gson.toJson(bridges)); } catch (IOException e) { e.printStackTrace(); } @@ -310,7 +314,7 @@ @Override public void obtainToiletListData(ToiletListBean resultBean) { if (resultBean.isSuccess()) { - SaveKeyValues.putValue(Constant.TOILET_LIST, gson.toJson(resultBean.getData())); + StringHelper.saveToiletList(gson.toJson(resultBean.getData())); } } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 441625b..fe48830 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -3,18 +3,16 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -44,16 +42,16 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.punishTypeView) TextView punishTypeView; @BindView(R.id.punishOpinionView) TextView punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.punishDateView) TextView punishDateView; @@ -106,19 +104,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -131,19 +127,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处罚记录 @@ -158,19 +152,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + punishGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } punishDateView.setText(data.getPunishTime()); } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index 1dec74b..6711568 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -5,7 +5,9 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; @@ -13,11 +15,9 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; @@ -78,8 +77,8 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.line1) @@ -90,8 +89,8 @@ View line2; @BindView(R.id.reasonLayout) RelativeLayout reasonLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.addHandleImageView) ImageView addHandleImageView; @BindView(R.id.caseReasonView) @@ -102,8 +101,8 @@ TextView punishTypeView; @BindView(R.id.punishOpinionView) EditText punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.addPunishImageView) ImageView addPunishImageView; @BindView(R.id.punishDateView) @@ -120,7 +119,8 @@ private ArrayList punishRealPaths = new ArrayList<>();//真实图片路径 private List handleImageList = new ArrayList<>();//上传到服务器的数据集 private List punishImageList = new ArrayList<>();//上传到服务器的数据集 - private ImageRecycleViewAdapter punishImageAdapter, handleImageAdapter; + private ImageGridViewAdapter handleImageAdapter; + private ImageGridViewAdapter punishImageAdapter; private CaseNextNodePresenterImpl caseNextNodePresenter; private String changeState; private String approvalResult; @@ -155,17 +155,13 @@ .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); //处罚adapter - punishImageAdapter = new ImageRecycleViewAdapter(this); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(punishImageAdapter); + punishImageAdapter = new ImageGridViewAdapter(this); + punishGridView.setAdapter(punishImageAdapter); //下级结点 caseNextNodePresenter = new CaseNextNodePresenterImpl(this); - //案卷处理adapter - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); caseHandlePresenter = new CaseHandlePresenterImpl(this); packageHandlePresenter = new PackageHandlePresenterImpl(this); @@ -206,19 +202,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -231,19 +225,16 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + handleImageAdapter.setImageList(urls); + handleGridView.setAdapter(handleImageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + handleImageAdapter.isDeleteVisible(true); } } } @@ -382,7 +373,7 @@ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg if (isAddHandleImage) { //处理图片 - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); handleImageList.add(url); @@ -390,22 +381,22 @@ if (handleRealPaths.size() == 2) { addHandleImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, handleRealPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { handleImageList.remove(position); handleRealPaths.remove(position); - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); if (handleRealPaths.size() != 2) { addHandleImageView.setVisibility(View.VISIBLE); } @@ -416,7 +407,7 @@ } } else { //处罚图片 - int sumItemCount = punishImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = punishImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); punishImageList.add(url); @@ -424,21 +415,21 @@ if (punishRealPaths.size() == 2) { addPunishImageView.setVisibility(View.GONE); } - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); //九宫格点击事件 - punishImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, punishRealPaths); } }); //删除按钮点击事件 - punishImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + punishImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { punishImageList.remove(position); punishRealPaths.remove(position); - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); if (punishRealPaths.size() != 2) { addPunishImageView.setVisibility(View.VISIBLE); } @@ -506,7 +497,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index 7e3d47e..7c58e30 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -31,7 +31,6 @@ import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; @@ -50,8 +49,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; @@ -216,16 +213,14 @@ mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.obtainToiletIdLayout: - String toiletValue = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); - if (toiletValue.equals("")) { + List toiletBeanList = StringHelper.getToiletBeanList(); + if (toiletBeanList.size() == 0) { ToastHelper.showToast("获取公厕数据失败，请联系管理员", ToastHelper.ERROR); return; } - List dataBeans = new Gson().fromJson(toiletValue, new TypeToken>() { - }.getType()); QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("请选择您要打卡的公厕"); - for (ToiletListBean.DataBean it : dataBeans) { + for (ToiletListBean.DataBean it : toiletBeanList) { sheetBuilder.addItem(it.getName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -233,7 +228,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - toiletIdView.setText(dataBeans.get(position).getId()); + toiletIdView.setText(toiletBeanList.get(position).getId()); //TODO 是否需要将地图移到相应的公厕，待定 } }).build().show(); @@ -308,7 +303,7 @@ ToastHelper.showToast("保洁开始时间不能为空", ToastHelper.WARING); return; } - cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserId(), + cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, endTimeView.getText().toString(), imagePath, StringHelper.filterString(workContentView.getText().toString())); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 3a8ebc6..9f316a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -7,6 +7,7 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.utils.StringHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; @@ -47,9 +48,10 @@ @Override public void initData() { - userNameView.setText(StringHelper.getUserName()); - userPhoneView.setText(StringHelper.getUserPhone()); - userDeptView.setText(StringHelper.getUserDept()); + UserBean.DataBean userBean = StringHelper.getUserBean(); + userNameView.setText(userBean.getName()); + userPhoneView.setText(userBean.getPhone()); + userDeptView.setText(userBean.getDeptName()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index d9656aa..16bd2e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -39,6 +39,7 @@ import com.casic.dcms.ui.UrgentCaseActivity; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import butterknife.BindView; @@ -74,36 +75,38 @@ @Override protected void initData() { - userDataPresenter = new UserDataPresenterImpl(this); homePagePresenter = new HomePagePresenterImpl(this); + userDataPresenter = new UserDataPresenterImpl(this); + + //用户信息 + userDataPresenter.onReadyRetrofitRequest(); + //首页相关功能项 + homePagePresenter.onReadyRetrofitRequest("05"); } @Override protected void initEvent() { - userDataPresenter.onReadyRetrofitRequest(); - homePagePresenter.onReadyRetrofitRequest("05"); + //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 +// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); + Glide.with(this).load(R.mipmap.app_logo).into(userIconView); } @SuppressLint("SetTextI18n") @Override public void obtainUserData(UserBean userBean) { if (userBean.isSuccess()) { - //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 -// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); - Glide.with(this).load(R.mipmap.app_logo).into(userIconView); + UserBean.DataBean dataBean = userBean.getData(); + StringHelper.saveUserBean(new Gson().toJson(dataBean)); - UserBean.DataBean data = userBean.getData(); - userNameView.setText(data.getName()); - userDeptView.setText(data.getDeptName() + data.getRoleNames()); - - StringHelper.saveUserName(data.getName()); - StringHelper.saveUserPhone(data.getPhone()); - StringHelper.saveUserDept(data.getDeptName()); - StringHelper.saveUserDeptId(data.getDeptId()); - StringHelper.saveUserId(data.getId()); + userNameView.setText(dataBean.getName()); + userDeptView.setText(dataBean.getDeptName() + dataBean.getRoleNames()); } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); + } @Override public void obtainHomePageResult(HomePageBean resultBean) { @@ -183,11 +186,6 @@ } @Override - public void obtainDataFail() { - ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); - } - - @Override public void onDestroyView() { super.onDestroyView(); if (userDataPresenter != null) { @@ -197,4 +195,4 @@ homePagePresenter.disposeRetrofitRequest(); } } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 1657341..13aa09b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -76,7 +76,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserDeptId()); + phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 9e3437c..859d2ac 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -37,8 +37,9 @@ Color.rgb(120, 104, 230)}; public static final String IP_KEY = "ip"; - public static final String BRIDGE_LIST = "projectBridges"; - public static final String TOILET_LIST = "toilets"; + static final String USER_BEAN = "userBean"; + static final String BRIDGE_LIST = "projectBridges"; + static final String TOILET_LIST = "toilets"; public static final long HALF_YEAR = 180 * 60 * 60 * 24 * 1000L; public static final long ONE_YEAR = 365 * 60 * 60 * 24 * 1000L; diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 91bf9f9..e3a2c99 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -11,7 +11,9 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -20,13 +22,11 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -104,8 +103,8 @@ JzvdStd videoPlayerView; @BindView(R.id.addImageView) ImageView addImageView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -125,7 +124,7 @@ private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; private UploadVideoPresenterImpl uploadVideoPresenter; private String audioUrl, videoUrl; @@ -164,10 +163,8 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @SuppressLint("ClickableViewAccessibility") @@ -534,7 +531,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); imageList.add(url); @@ -542,21 +539,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -618,7 +615,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index aa02a1c..b7b71f5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -62,8 +61,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -73,7 +72,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -97,10 +96,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -217,7 +214,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -273,7 +270,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -281,21 +278,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 964490e..f4f3501 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -29,7 +29,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -71,8 +70,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -90,7 +89,7 @@ private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; @Override @@ -115,10 +114,8 @@ .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -331,28 +328,28 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -401,7 +398,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b8f97ec..496edba 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -57,8 +56,8 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -121,19 +120,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index c3b3b66..5f6a3e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -39,7 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -87,16 +86,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseOpinionView) TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; - @BindView(R.id.caseVerifyRecyclerView) - RecyclerView caseVerifyRecyclerView; + @BindView(R.id.verifyGridView) + GridView verifyGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -139,7 +138,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private ImageRecycleViewAdapter verifyImageAdapter; + private ImageGridViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -168,10 +167,8 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); - verifyImageAdapter = new ImageRecycleViewAdapter(this); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(verifyImageAdapter); + verifyImageAdapter = new ImageGridViewAdapter(this); + verifyGridView.setAdapter(verifyImageAdapter); } @Override @@ -226,19 +223,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -386,7 +381,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -402,7 +397,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -533,7 +528,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = verifyImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -541,22 +536,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); //九宫格点击事件 - verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + verifyGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - verifyImageAdapter.setDeleteView(true); - verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + verifyImageAdapter.isDeleteVisible(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 3cedbfe..8b08041 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -57,8 +56,8 @@ EditText shopKeeperView; @BindView(R.id.phoneNumberView) EditText phoneNumberView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -67,7 +66,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopChangePresenterImpl shopChangePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; private ArrayList realPaths = new ArrayList<>();//真实图片路径 @@ -91,10 +90,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -153,7 +150,7 @@ ToastHelper.showToast("店主名还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -235,7 +232,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -243,21 +240,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 381b704..d371d17 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -80,7 +80,7 @@ @Override public void initEvent() { - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", "", "", pageIndex); + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); calendarView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -98,7 +98,7 @@ endGroup = endGroupPosition;//结束月份位置 endChild = endChildPosition;//结束对应月份中日的位置 dateView.setText(startDate + "~" + endDate); - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", startDate, endDate, pageIndex); } }).builder(); @@ -110,7 +110,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); @@ -119,7 +119,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0d7053a..3662274 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -3,17 +3,17 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -27,7 +27,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAdjustFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -66,14 +65,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.optionEditView) @@ -207,19 +206,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -250,19 +247,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index bd491c3..19b9039 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAuthorizeFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -70,14 +69,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -264,19 +263,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -307,19 +304,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java index f22a99d..797b130 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -32,7 +32,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -71,14 +70,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -157,19 +156,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -200,19 +197,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 1c1fcd0..e40d2cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -22,9 +22,11 @@ import com.casic.dcms.base.BaseApplication; import com.casic.dcms.base.DoubleClickExitActivity; import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.HomePageBean; import com.casic.dcms.bean.NoticeBean; import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.greendao.NoticeBeanDao; import com.casic.dcms.mvp.presenter.PushRegisterPresenterImpl; import com.casic.dcms.mvp.presenter.ToiletListPresenterImpl; @@ -44,6 +46,8 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StatusBarColorUtil; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.callback.IHttpRequestListener; import com.casic.dcms.widgets.NoScrollViewPager; import com.google.android.material.bottomnavigation.BottomNavigationView; @@ -59,7 +63,8 @@ import butterknife.BindView; import okhttp3.ResponseBody; -public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, IPushRegisterView, IToiletListView { +public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, + IPushRegisterView, IToiletListView { private static final String TAG = "MainActivity"; @BindView(R.id.pageTitleView) @@ -100,18 +105,17 @@ uploadPositionPresenter = new UploadPositionPresenterImpl(this); registerPresenter = new PushRegisterPresenterImpl(this); toiletListPresenter = new ToiletListPresenterImpl(this); - gson = new Gson(); + //获取配置项 + obtainProjectConfig(); + //配置页面 pageList = new ArrayList<>(); pageList.add(new HomePageFragment()); pageList.add(new PhonePageFragment()); pageList.add(new NoticePageFragment()); pageList.add(new MinePageFragment()); + imei = OtherUtils.obtainSimCardSerialNumber(this); - - //获取配置项 - obtainProjectConfig(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UploadLocationService.class)); } else { @@ -128,7 +132,7 @@ try { String resultStr = resultBean.string(); List bridges = gson.fromJson(resultStr, ProjectConfigBean.class).getBridges(); - SaveKeyValues.putValue(Constant.BRIDGE_LIST, gson.toJson(bridges)); + StringHelper.saveBridgeList(gson.toJson(bridges)); } catch (IOException e) { e.printStackTrace(); } @@ -310,7 +314,7 @@ @Override public void obtainToiletListData(ToiletListBean resultBean) { if (resultBean.isSuccess()) { - SaveKeyValues.putValue(Constant.TOILET_LIST, gson.toJson(resultBean.getData())); + StringHelper.saveToiletList(gson.toJson(resultBean.getData())); } } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 441625b..fe48830 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -3,18 +3,16 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -44,16 +42,16 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.punishTypeView) TextView punishTypeView; @BindView(R.id.punishOpinionView) TextView punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.punishDateView) TextView punishDateView; @@ -106,19 +104,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -131,19 +127,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处罚记录 @@ -158,19 +152,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + punishGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } punishDateView.setText(data.getPunishTime()); } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index 1dec74b..6711568 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -5,7 +5,9 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; @@ -13,11 +15,9 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; @@ -78,8 +77,8 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.line1) @@ -90,8 +89,8 @@ View line2; @BindView(R.id.reasonLayout) RelativeLayout reasonLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.addHandleImageView) ImageView addHandleImageView; @BindView(R.id.caseReasonView) @@ -102,8 +101,8 @@ TextView punishTypeView; @BindView(R.id.punishOpinionView) EditText punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.addPunishImageView) ImageView addPunishImageView; @BindView(R.id.punishDateView) @@ -120,7 +119,8 @@ private ArrayList punishRealPaths = new ArrayList<>();//真实图片路径 private List handleImageList = new ArrayList<>();//上传到服务器的数据集 private List punishImageList = new ArrayList<>();//上传到服务器的数据集 - private ImageRecycleViewAdapter punishImageAdapter, handleImageAdapter; + private ImageGridViewAdapter handleImageAdapter; + private ImageGridViewAdapter punishImageAdapter; private CaseNextNodePresenterImpl caseNextNodePresenter; private String changeState; private String approvalResult; @@ -155,17 +155,13 @@ .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); //处罚adapter - punishImageAdapter = new ImageRecycleViewAdapter(this); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(punishImageAdapter); + punishImageAdapter = new ImageGridViewAdapter(this); + punishGridView.setAdapter(punishImageAdapter); //下级结点 caseNextNodePresenter = new CaseNextNodePresenterImpl(this); - //案卷处理adapter - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); caseHandlePresenter = new CaseHandlePresenterImpl(this); packageHandlePresenter = new PackageHandlePresenterImpl(this); @@ -206,19 +202,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -231,19 +225,16 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + handleImageAdapter.setImageList(urls); + handleGridView.setAdapter(handleImageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + handleImageAdapter.isDeleteVisible(true); } } } @@ -382,7 +373,7 @@ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg if (isAddHandleImage) { //处理图片 - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); handleImageList.add(url); @@ -390,22 +381,22 @@ if (handleRealPaths.size() == 2) { addHandleImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, handleRealPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { handleImageList.remove(position); handleRealPaths.remove(position); - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); if (handleRealPaths.size() != 2) { addHandleImageView.setVisibility(View.VISIBLE); } @@ -416,7 +407,7 @@ } } else { //处罚图片 - int sumItemCount = punishImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = punishImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); punishImageList.add(url); @@ -424,21 +415,21 @@ if (punishRealPaths.size() == 2) { addPunishImageView.setVisibility(View.GONE); } - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); //九宫格点击事件 - punishImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, punishRealPaths); } }); //删除按钮点击事件 - punishImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + punishImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { punishImageList.remove(position); punishRealPaths.remove(position); - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); if (punishRealPaths.size() != 2) { addPunishImageView.setVisibility(View.VISIBLE); } @@ -506,7 +497,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index 7e3d47e..7c58e30 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -31,7 +31,6 @@ import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; @@ -50,8 +49,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; @@ -216,16 +213,14 @@ mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.obtainToiletIdLayout: - String toiletValue = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); - if (toiletValue.equals("")) { + List toiletBeanList = StringHelper.getToiletBeanList(); + if (toiletBeanList.size() == 0) { ToastHelper.showToast("获取公厕数据失败，请联系管理员", ToastHelper.ERROR); return; } - List dataBeans = new Gson().fromJson(toiletValue, new TypeToken>() { - }.getType()); QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("请选择您要打卡的公厕"); - for (ToiletListBean.DataBean it : dataBeans) { + for (ToiletListBean.DataBean it : toiletBeanList) { sheetBuilder.addItem(it.getName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -233,7 +228,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - toiletIdView.setText(dataBeans.get(position).getId()); + toiletIdView.setText(toiletBeanList.get(position).getId()); //TODO 是否需要将地图移到相应的公厕，待定 } }).build().show(); @@ -308,7 +303,7 @@ ToastHelper.showToast("保洁开始时间不能为空", ToastHelper.WARING); return; } - cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserId(), + cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, endTimeView.getText().toString(), imagePath, StringHelper.filterString(workContentView.getText().toString())); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 3a8ebc6..9f316a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -7,6 +7,7 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.utils.StringHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; @@ -47,9 +48,10 @@ @Override public void initData() { - userNameView.setText(StringHelper.getUserName()); - userPhoneView.setText(StringHelper.getUserPhone()); - userDeptView.setText(StringHelper.getUserDept()); + UserBean.DataBean userBean = StringHelper.getUserBean(); + userNameView.setText(userBean.getName()); + userPhoneView.setText(userBean.getPhone()); + userDeptView.setText(userBean.getDeptName()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index d9656aa..16bd2e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -39,6 +39,7 @@ import com.casic.dcms.ui.UrgentCaseActivity; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import butterknife.BindView; @@ -74,36 +75,38 @@ @Override protected void initData() { - userDataPresenter = new UserDataPresenterImpl(this); homePagePresenter = new HomePagePresenterImpl(this); + userDataPresenter = new UserDataPresenterImpl(this); + + //用户信息 + userDataPresenter.onReadyRetrofitRequest(); + //首页相关功能项 + homePagePresenter.onReadyRetrofitRequest("05"); } @Override protected void initEvent() { - userDataPresenter.onReadyRetrofitRequest(); - homePagePresenter.onReadyRetrofitRequest("05"); + //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 +// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); + Glide.with(this).load(R.mipmap.app_logo).into(userIconView); } @SuppressLint("SetTextI18n") @Override public void obtainUserData(UserBean userBean) { if (userBean.isSuccess()) { - //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 -// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); - Glide.with(this).load(R.mipmap.app_logo).into(userIconView); + UserBean.DataBean dataBean = userBean.getData(); + StringHelper.saveUserBean(new Gson().toJson(dataBean)); - UserBean.DataBean data = userBean.getData(); - userNameView.setText(data.getName()); - userDeptView.setText(data.getDeptName() + data.getRoleNames()); - - StringHelper.saveUserName(data.getName()); - StringHelper.saveUserPhone(data.getPhone()); - StringHelper.saveUserDept(data.getDeptName()); - StringHelper.saveUserDeptId(data.getDeptId()); - StringHelper.saveUserId(data.getId()); + userNameView.setText(dataBean.getName()); + userDeptView.setText(dataBean.getDeptName() + dataBean.getRoleNames()); } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); + } @Override public void obtainHomePageResult(HomePageBean resultBean) { @@ -183,11 +186,6 @@ } @Override - public void obtainDataFail() { - ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); - } - - @Override public void onDestroyView() { super.onDestroyView(); if (userDataPresenter != null) { @@ -197,4 +195,4 @@ homePagePresenter.disposeRetrofitRequest(); } } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 1657341..13aa09b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -76,7 +76,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserDeptId()); + phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 9e3437c..859d2ac 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -37,8 +37,9 @@ Color.rgb(120, 104, 230)}; public static final String IP_KEY = "ip"; - public static final String BRIDGE_LIST = "projectBridges"; - public static final String TOILET_LIST = "toilets"; + static final String USER_BEAN = "userBean"; + static final String BRIDGE_LIST = "projectBridges"; + static final String TOILET_LIST = "toilets"; public static final long HALF_YEAR = 180 * 60 * 60 * 24 * 1000L; public static final long ONE_YEAR = 365 * 60 * 60 * 24 * 1000L; diff --git a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java b/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java deleted file mode 100644 index 0286bb6..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.dcms.utils; - -import android.graphics.Rect; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -public class ItemDecorationSpace extends RecyclerView.ItemDecoration { - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (parent.getChildAdapterPosition(view) % 2 == 0) { - outRect.left = 0; - outRect.right = 5; - } else if (parent.getChildAdapterPosition(view) % 2 == 1) { - outRect.left = 5; - outRect.right = 0; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 91bf9f9..e3a2c99 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -11,7 +11,9 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -20,13 +22,11 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -104,8 +103,8 @@ JzvdStd videoPlayerView; @BindView(R.id.addImageView) ImageView addImageView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -125,7 +124,7 @@ private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; private UploadVideoPresenterImpl uploadVideoPresenter; private String audioUrl, videoUrl; @@ -164,10 +163,8 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @SuppressLint("ClickableViewAccessibility") @@ -534,7 +531,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); imageList.add(url); @@ -542,21 +539,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -618,7 +615,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index aa02a1c..b7b71f5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -62,8 +61,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -73,7 +72,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -97,10 +96,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -217,7 +214,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -273,7 +270,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -281,21 +278,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 964490e..f4f3501 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -29,7 +29,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -71,8 +70,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -90,7 +89,7 @@ private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; @Override @@ -115,10 +114,8 @@ .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -331,28 +328,28 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -401,7 +398,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b8f97ec..496edba 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -57,8 +56,8 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -121,19 +120,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index c3b3b66..5f6a3e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -39,7 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -87,16 +86,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseOpinionView) TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; - @BindView(R.id.caseVerifyRecyclerView) - RecyclerView caseVerifyRecyclerView; + @BindView(R.id.verifyGridView) + GridView verifyGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -139,7 +138,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private ImageRecycleViewAdapter verifyImageAdapter; + private ImageGridViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -168,10 +167,8 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); - verifyImageAdapter = new ImageRecycleViewAdapter(this); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(verifyImageAdapter); + verifyImageAdapter = new ImageGridViewAdapter(this); + verifyGridView.setAdapter(verifyImageAdapter); } @Override @@ -226,19 +223,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -386,7 +381,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -402,7 +397,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -533,7 +528,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = verifyImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -541,22 +536,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); //九宫格点击事件 - verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + verifyGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - verifyImageAdapter.setDeleteView(true); - verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + verifyImageAdapter.isDeleteVisible(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 3cedbfe..8b08041 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -57,8 +56,8 @@ EditText shopKeeperView; @BindView(R.id.phoneNumberView) EditText phoneNumberView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -67,7 +66,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopChangePresenterImpl shopChangePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; private ArrayList realPaths = new ArrayList<>();//真实图片路径 @@ -91,10 +90,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -153,7 +150,7 @@ ToastHelper.showToast("店主名还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -235,7 +232,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -243,21 +240,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 381b704..d371d17 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -80,7 +80,7 @@ @Override public void initEvent() { - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", "", "", pageIndex); + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); calendarView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -98,7 +98,7 @@ endGroup = endGroupPosition;//结束月份位置 endChild = endChildPosition;//结束对应月份中日的位置 dateView.setText(startDate + "~" + endDate); - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", startDate, endDate, pageIndex); } }).builder(); @@ -110,7 +110,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); @@ -119,7 +119,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0d7053a..3662274 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -3,17 +3,17 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -27,7 +27,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAdjustFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -66,14 +65,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.optionEditView) @@ -207,19 +206,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -250,19 +247,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index bd491c3..19b9039 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAuthorizeFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -70,14 +69,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -264,19 +263,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -307,19 +304,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java index f22a99d..797b130 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -32,7 +32,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -71,14 +70,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -157,19 +156,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -200,19 +197,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 1c1fcd0..e40d2cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -22,9 +22,11 @@ import com.casic.dcms.base.BaseApplication; import com.casic.dcms.base.DoubleClickExitActivity; import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.HomePageBean; import com.casic.dcms.bean.NoticeBean; import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.greendao.NoticeBeanDao; import com.casic.dcms.mvp.presenter.PushRegisterPresenterImpl; import com.casic.dcms.mvp.presenter.ToiletListPresenterImpl; @@ -44,6 +46,8 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StatusBarColorUtil; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.callback.IHttpRequestListener; import com.casic.dcms.widgets.NoScrollViewPager; import com.google.android.material.bottomnavigation.BottomNavigationView; @@ -59,7 +63,8 @@ import butterknife.BindView; import okhttp3.ResponseBody; -public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, IPushRegisterView, IToiletListView { +public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, + IPushRegisterView, IToiletListView { private static final String TAG = "MainActivity"; @BindView(R.id.pageTitleView) @@ -100,18 +105,17 @@ uploadPositionPresenter = new UploadPositionPresenterImpl(this); registerPresenter = new PushRegisterPresenterImpl(this); toiletListPresenter = new ToiletListPresenterImpl(this); - gson = new Gson(); + //获取配置项 + obtainProjectConfig(); + //配置页面 pageList = new ArrayList<>(); pageList.add(new HomePageFragment()); pageList.add(new PhonePageFragment()); pageList.add(new NoticePageFragment()); pageList.add(new MinePageFragment()); + imei = OtherUtils.obtainSimCardSerialNumber(this); - - //获取配置项 - obtainProjectConfig(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UploadLocationService.class)); } else { @@ -128,7 +132,7 @@ try { String resultStr = resultBean.string(); List bridges = gson.fromJson(resultStr, ProjectConfigBean.class).getBridges(); - SaveKeyValues.putValue(Constant.BRIDGE_LIST, gson.toJson(bridges)); + StringHelper.saveBridgeList(gson.toJson(bridges)); } catch (IOException e) { e.printStackTrace(); } @@ -310,7 +314,7 @@ @Override public void obtainToiletListData(ToiletListBean resultBean) { if (resultBean.isSuccess()) { - SaveKeyValues.putValue(Constant.TOILET_LIST, gson.toJson(resultBean.getData())); + StringHelper.saveToiletList(gson.toJson(resultBean.getData())); } } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 441625b..fe48830 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -3,18 +3,16 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -44,16 +42,16 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.punishTypeView) TextView punishTypeView; @BindView(R.id.punishOpinionView) TextView punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.punishDateView) TextView punishDateView; @@ -106,19 +104,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -131,19 +127,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处罚记录 @@ -158,19 +152,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + punishGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } punishDateView.setText(data.getPunishTime()); } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index 1dec74b..6711568 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -5,7 +5,9 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; @@ -13,11 +15,9 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; @@ -78,8 +77,8 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.line1) @@ -90,8 +89,8 @@ View line2; @BindView(R.id.reasonLayout) RelativeLayout reasonLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.addHandleImageView) ImageView addHandleImageView; @BindView(R.id.caseReasonView) @@ -102,8 +101,8 @@ TextView punishTypeView; @BindView(R.id.punishOpinionView) EditText punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.addPunishImageView) ImageView addPunishImageView; @BindView(R.id.punishDateView) @@ -120,7 +119,8 @@ private ArrayList punishRealPaths = new ArrayList<>();//真实图片路径 private List handleImageList = new ArrayList<>();//上传到服务器的数据集 private List punishImageList = new ArrayList<>();//上传到服务器的数据集 - private ImageRecycleViewAdapter punishImageAdapter, handleImageAdapter; + private ImageGridViewAdapter handleImageAdapter; + private ImageGridViewAdapter punishImageAdapter; private CaseNextNodePresenterImpl caseNextNodePresenter; private String changeState; private String approvalResult; @@ -155,17 +155,13 @@ .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); //处罚adapter - punishImageAdapter = new ImageRecycleViewAdapter(this); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(punishImageAdapter); + punishImageAdapter = new ImageGridViewAdapter(this); + punishGridView.setAdapter(punishImageAdapter); //下级结点 caseNextNodePresenter = new CaseNextNodePresenterImpl(this); - //案卷处理adapter - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); caseHandlePresenter = new CaseHandlePresenterImpl(this); packageHandlePresenter = new PackageHandlePresenterImpl(this); @@ -206,19 +202,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -231,19 +225,16 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + handleImageAdapter.setImageList(urls); + handleGridView.setAdapter(handleImageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + handleImageAdapter.isDeleteVisible(true); } } } @@ -382,7 +373,7 @@ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg if (isAddHandleImage) { //处理图片 - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); handleImageList.add(url); @@ -390,22 +381,22 @@ if (handleRealPaths.size() == 2) { addHandleImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, handleRealPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { handleImageList.remove(position); handleRealPaths.remove(position); - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); if (handleRealPaths.size() != 2) { addHandleImageView.setVisibility(View.VISIBLE); } @@ -416,7 +407,7 @@ } } else { //处罚图片 - int sumItemCount = punishImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = punishImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); punishImageList.add(url); @@ -424,21 +415,21 @@ if (punishRealPaths.size() == 2) { addPunishImageView.setVisibility(View.GONE); } - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); //九宫格点击事件 - punishImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, punishRealPaths); } }); //删除按钮点击事件 - punishImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + punishImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { punishImageList.remove(position); punishRealPaths.remove(position); - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); if (punishRealPaths.size() != 2) { addPunishImageView.setVisibility(View.VISIBLE); } @@ -506,7 +497,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index 7e3d47e..7c58e30 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -31,7 +31,6 @@ import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; @@ -50,8 +49,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; @@ -216,16 +213,14 @@ mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.obtainToiletIdLayout: - String toiletValue = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); - if (toiletValue.equals("")) { + List toiletBeanList = StringHelper.getToiletBeanList(); + if (toiletBeanList.size() == 0) { ToastHelper.showToast("获取公厕数据失败，请联系管理员", ToastHelper.ERROR); return; } - List dataBeans = new Gson().fromJson(toiletValue, new TypeToken>() { - }.getType()); QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("请选择您要打卡的公厕"); - for (ToiletListBean.DataBean it : dataBeans) { + for (ToiletListBean.DataBean it : toiletBeanList) { sheetBuilder.addItem(it.getName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -233,7 +228,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - toiletIdView.setText(dataBeans.get(position).getId()); + toiletIdView.setText(toiletBeanList.get(position).getId()); //TODO 是否需要将地图移到相应的公厕，待定 } }).build().show(); @@ -308,7 +303,7 @@ ToastHelper.showToast("保洁开始时间不能为空", ToastHelper.WARING); return; } - cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserId(), + cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, endTimeView.getText().toString(), imagePath, StringHelper.filterString(workContentView.getText().toString())); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 3a8ebc6..9f316a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -7,6 +7,7 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.utils.StringHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; @@ -47,9 +48,10 @@ @Override public void initData() { - userNameView.setText(StringHelper.getUserName()); - userPhoneView.setText(StringHelper.getUserPhone()); - userDeptView.setText(StringHelper.getUserDept()); + UserBean.DataBean userBean = StringHelper.getUserBean(); + userNameView.setText(userBean.getName()); + userPhoneView.setText(userBean.getPhone()); + userDeptView.setText(userBean.getDeptName()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index d9656aa..16bd2e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -39,6 +39,7 @@ import com.casic.dcms.ui.UrgentCaseActivity; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import butterknife.BindView; @@ -74,36 +75,38 @@ @Override protected void initData() { - userDataPresenter = new UserDataPresenterImpl(this); homePagePresenter = new HomePagePresenterImpl(this); + userDataPresenter = new UserDataPresenterImpl(this); + + //用户信息 + userDataPresenter.onReadyRetrofitRequest(); + //首页相关功能项 + homePagePresenter.onReadyRetrofitRequest("05"); } @Override protected void initEvent() { - userDataPresenter.onReadyRetrofitRequest(); - homePagePresenter.onReadyRetrofitRequest("05"); + //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 +// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); + Glide.with(this).load(R.mipmap.app_logo).into(userIconView); } @SuppressLint("SetTextI18n") @Override public void obtainUserData(UserBean userBean) { if (userBean.isSuccess()) { - //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 -// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); - Glide.with(this).load(R.mipmap.app_logo).into(userIconView); + UserBean.DataBean dataBean = userBean.getData(); + StringHelper.saveUserBean(new Gson().toJson(dataBean)); - UserBean.DataBean data = userBean.getData(); - userNameView.setText(data.getName()); - userDeptView.setText(data.getDeptName() + data.getRoleNames()); - - StringHelper.saveUserName(data.getName()); - StringHelper.saveUserPhone(data.getPhone()); - StringHelper.saveUserDept(data.getDeptName()); - StringHelper.saveUserDeptId(data.getDeptId()); - StringHelper.saveUserId(data.getId()); + userNameView.setText(dataBean.getName()); + userDeptView.setText(dataBean.getDeptName() + dataBean.getRoleNames()); } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); + } @Override public void obtainHomePageResult(HomePageBean resultBean) { @@ -183,11 +186,6 @@ } @Override - public void obtainDataFail() { - ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); - } - - @Override public void onDestroyView() { super.onDestroyView(); if (userDataPresenter != null) { @@ -197,4 +195,4 @@ homePagePresenter.disposeRetrofitRequest(); } } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 1657341..13aa09b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -76,7 +76,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserDeptId()); + phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 9e3437c..859d2ac 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -37,8 +37,9 @@ Color.rgb(120, 104, 230)}; public static final String IP_KEY = "ip"; - public static final String BRIDGE_LIST = "projectBridges"; - public static final String TOILET_LIST = "toilets"; + static final String USER_BEAN = "userBean"; + static final String BRIDGE_LIST = "projectBridges"; + static final String TOILET_LIST = "toilets"; public static final long HALF_YEAR = 180 * 60 * 60 * 24 * 1000L; public static final long ONE_YEAR = 365 * 60 * 60 * 24 * 1000L; diff --git a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java b/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java deleted file mode 100644 index 0286bb6..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.dcms.utils; - -import android.graphics.Rect; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -public class ItemDecorationSpace extends RecyclerView.ItemDecoration { - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (parent.getChildAdapterPosition(view) % 2 == 0) { - outRect.left = 0; - outRect.right = 5; - } else if (parent.getChildAdapterPosition(view) % 2 == 1) { - outRect.left = 5; - outRect.right = 0; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 4dd4dbd..cac58c5 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,7 +4,14 @@ import android.util.Log; import com.casic.dcms.R; +import com.casic.dcms.bean.HomePageBean; +import com.casic.dcms.bean.ProjectConfigBean; +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -21,44 +28,45 @@ return (String) SaveKeyValues.getValue("userAccount", ""); } - public static void saveUserId(String userId) { - SaveKeyValues.putValue("userId", userId); + public static void saveUserBean(String userBeanJson) { + SaveKeyValues.putValue(Constant.USER_BEAN, userBeanJson); } - public static String getUserId() { - return (String) SaveKeyValues.getValue("userId", ""); + public static UserBean.DataBean getUserBean() { + String userBeanJson = (String) SaveKeyValues.getValue(Constant.USER_BEAN, ""); + UserBean.DataBean dataBean = new UserBean.DataBean(); + if (userBeanJson.equals("")) { + return dataBean; + } + return new Gson().fromJson(userBeanJson, UserBean.DataBean.class); } - public static void saveUserName(String name) { - SaveKeyValues.putValue("userName", name); + public static void saveBridgeList(String bridgesJson) { + SaveKeyValues.putValue(Constant.BRIDGE_LIST, bridgesJson); } - public static String getUserName() { - return (String) SaveKeyValues.getValue("userName", ""); + public static List getBridgeBeanList() { + String bridgesJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); + List bridges = new ArrayList<>(); + if (bridgesJson.equals("")) { + return bridges; + } + return new Gson().fromJson(bridgesJson, new TypeToken>() { + }.getType()); } - public static void saveUserPhone(String phone) { - SaveKeyValues.putValue("userPhone", phone); + public static void saveToiletList(String toiletsJson) { + SaveKeyValues.putValue(Constant.TOILET_LIST, toiletsJson); } - public static String getUserPhone() { - return (String) SaveKeyValues.getValue("userPhone", ""); - } - - public static void saveUserDept(String dept) { - SaveKeyValues.putValue("userDept", dept); - } - - public static String getUserDept() { - return (String) SaveKeyValues.getValue("userDept", ""); - } - - public static void saveUserDeptId(String deptid) { - SaveKeyValues.putValue("userDeptId", deptid); - } - - public static String getUserDeptId() { - return (String) SaveKeyValues.getValue("userDeptId", ""); + public static List getToiletBeanList() { + String toiletsJson = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); + List toilets = new ArrayList<>(); + if (toiletsJson.equals("")) { + return toilets; + } + return new Gson().fromJson(toiletsJson, new TypeToken>() { + }.getType()); } public static boolean isLetterAndDigit(String str) { diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 91bf9f9..e3a2c99 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -11,7 +11,9 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -20,13 +22,11 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -104,8 +103,8 @@ JzvdStd videoPlayerView; @BindView(R.id.addImageView) ImageView addImageView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -125,7 +124,7 @@ private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; private UploadVideoPresenterImpl uploadVideoPresenter; private String audioUrl, videoUrl; @@ -164,10 +163,8 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @SuppressLint("ClickableViewAccessibility") @@ -534,7 +531,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); imageList.add(url); @@ -542,21 +539,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -618,7 +615,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index aa02a1c..b7b71f5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -62,8 +61,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -73,7 +72,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -97,10 +96,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -217,7 +214,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -273,7 +270,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -281,21 +278,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 964490e..f4f3501 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -29,7 +29,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -71,8 +70,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -90,7 +89,7 @@ private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; @Override @@ -115,10 +114,8 @@ .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -331,28 +328,28 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -401,7 +398,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b8f97ec..496edba 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -57,8 +56,8 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -121,19 +120,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index c3b3b66..5f6a3e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -39,7 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -87,16 +86,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseOpinionView) TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; - @BindView(R.id.caseVerifyRecyclerView) - RecyclerView caseVerifyRecyclerView; + @BindView(R.id.verifyGridView) + GridView verifyGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -139,7 +138,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private ImageRecycleViewAdapter verifyImageAdapter; + private ImageGridViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -168,10 +167,8 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); - verifyImageAdapter = new ImageRecycleViewAdapter(this); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(verifyImageAdapter); + verifyImageAdapter = new ImageGridViewAdapter(this); + verifyGridView.setAdapter(verifyImageAdapter); } @Override @@ -226,19 +223,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -386,7 +381,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -402,7 +397,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -533,7 +528,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = verifyImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -541,22 +536,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); //九宫格点击事件 - verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + verifyGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - verifyImageAdapter.setDeleteView(true); - verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + verifyImageAdapter.isDeleteVisible(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 3cedbfe..8b08041 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -57,8 +56,8 @@ EditText shopKeeperView; @BindView(R.id.phoneNumberView) EditText phoneNumberView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -67,7 +66,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopChangePresenterImpl shopChangePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; private ArrayList realPaths = new ArrayList<>();//真实图片路径 @@ -91,10 +90,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -153,7 +150,7 @@ ToastHelper.showToast("店主名还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -235,7 +232,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -243,21 +240,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 381b704..d371d17 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -80,7 +80,7 @@ @Override public void initEvent() { - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", "", "", pageIndex); + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); calendarView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -98,7 +98,7 @@ endGroup = endGroupPosition;//结束月份位置 endChild = endChildPosition;//结束对应月份中日的位置 dateView.setText(startDate + "~" + endDate); - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", startDate, endDate, pageIndex); } }).builder(); @@ -110,7 +110,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); @@ -119,7 +119,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0d7053a..3662274 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -3,17 +3,17 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -27,7 +27,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAdjustFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -66,14 +65,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.optionEditView) @@ -207,19 +206,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -250,19 +247,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index bd491c3..19b9039 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAuthorizeFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -70,14 +69,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -264,19 +263,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -307,19 +304,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java index f22a99d..797b130 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -32,7 +32,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -71,14 +70,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -157,19 +156,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -200,19 +197,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 1c1fcd0..e40d2cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -22,9 +22,11 @@ import com.casic.dcms.base.BaseApplication; import com.casic.dcms.base.DoubleClickExitActivity; import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.HomePageBean; import com.casic.dcms.bean.NoticeBean; import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.greendao.NoticeBeanDao; import com.casic.dcms.mvp.presenter.PushRegisterPresenterImpl; import com.casic.dcms.mvp.presenter.ToiletListPresenterImpl; @@ -44,6 +46,8 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StatusBarColorUtil; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.callback.IHttpRequestListener; import com.casic.dcms.widgets.NoScrollViewPager; import com.google.android.material.bottomnavigation.BottomNavigationView; @@ -59,7 +63,8 @@ import butterknife.BindView; import okhttp3.ResponseBody; -public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, IPushRegisterView, IToiletListView { +public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, + IPushRegisterView, IToiletListView { private static final String TAG = "MainActivity"; @BindView(R.id.pageTitleView) @@ -100,18 +105,17 @@ uploadPositionPresenter = new UploadPositionPresenterImpl(this); registerPresenter = new PushRegisterPresenterImpl(this); toiletListPresenter = new ToiletListPresenterImpl(this); - gson = new Gson(); + //获取配置项 + obtainProjectConfig(); + //配置页面 pageList = new ArrayList<>(); pageList.add(new HomePageFragment()); pageList.add(new PhonePageFragment()); pageList.add(new NoticePageFragment()); pageList.add(new MinePageFragment()); + imei = OtherUtils.obtainSimCardSerialNumber(this); - - //获取配置项 - obtainProjectConfig(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UploadLocationService.class)); } else { @@ -128,7 +132,7 @@ try { String resultStr = resultBean.string(); List bridges = gson.fromJson(resultStr, ProjectConfigBean.class).getBridges(); - SaveKeyValues.putValue(Constant.BRIDGE_LIST, gson.toJson(bridges)); + StringHelper.saveBridgeList(gson.toJson(bridges)); } catch (IOException e) { e.printStackTrace(); } @@ -310,7 +314,7 @@ @Override public void obtainToiletListData(ToiletListBean resultBean) { if (resultBean.isSuccess()) { - SaveKeyValues.putValue(Constant.TOILET_LIST, gson.toJson(resultBean.getData())); + StringHelper.saveToiletList(gson.toJson(resultBean.getData())); } } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 441625b..fe48830 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -3,18 +3,16 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -44,16 +42,16 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.punishTypeView) TextView punishTypeView; @BindView(R.id.punishOpinionView) TextView punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.punishDateView) TextView punishDateView; @@ -106,19 +104,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -131,19 +127,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处罚记录 @@ -158,19 +152,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + punishGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } punishDateView.setText(data.getPunishTime()); } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index 1dec74b..6711568 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -5,7 +5,9 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; @@ -13,11 +15,9 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; @@ -78,8 +77,8 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.line1) @@ -90,8 +89,8 @@ View line2; @BindView(R.id.reasonLayout) RelativeLayout reasonLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.addHandleImageView) ImageView addHandleImageView; @BindView(R.id.caseReasonView) @@ -102,8 +101,8 @@ TextView punishTypeView; @BindView(R.id.punishOpinionView) EditText punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.addPunishImageView) ImageView addPunishImageView; @BindView(R.id.punishDateView) @@ -120,7 +119,8 @@ private ArrayList punishRealPaths = new ArrayList<>();//真实图片路径 private List handleImageList = new ArrayList<>();//上传到服务器的数据集 private List punishImageList = new ArrayList<>();//上传到服务器的数据集 - private ImageRecycleViewAdapter punishImageAdapter, handleImageAdapter; + private ImageGridViewAdapter handleImageAdapter; + private ImageGridViewAdapter punishImageAdapter; private CaseNextNodePresenterImpl caseNextNodePresenter; private String changeState; private String approvalResult; @@ -155,17 +155,13 @@ .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); //处罚adapter - punishImageAdapter = new ImageRecycleViewAdapter(this); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(punishImageAdapter); + punishImageAdapter = new ImageGridViewAdapter(this); + punishGridView.setAdapter(punishImageAdapter); //下级结点 caseNextNodePresenter = new CaseNextNodePresenterImpl(this); - //案卷处理adapter - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); caseHandlePresenter = new CaseHandlePresenterImpl(this); packageHandlePresenter = new PackageHandlePresenterImpl(this); @@ -206,19 +202,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -231,19 +225,16 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + handleImageAdapter.setImageList(urls); + handleGridView.setAdapter(handleImageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + handleImageAdapter.isDeleteVisible(true); } } } @@ -382,7 +373,7 @@ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg if (isAddHandleImage) { //处理图片 - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); handleImageList.add(url); @@ -390,22 +381,22 @@ if (handleRealPaths.size() == 2) { addHandleImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, handleRealPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { handleImageList.remove(position); handleRealPaths.remove(position); - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); if (handleRealPaths.size() != 2) { addHandleImageView.setVisibility(View.VISIBLE); } @@ -416,7 +407,7 @@ } } else { //处罚图片 - int sumItemCount = punishImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = punishImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); punishImageList.add(url); @@ -424,21 +415,21 @@ if (punishRealPaths.size() == 2) { addPunishImageView.setVisibility(View.GONE); } - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); //九宫格点击事件 - punishImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, punishRealPaths); } }); //删除按钮点击事件 - punishImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + punishImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { punishImageList.remove(position); punishRealPaths.remove(position); - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); if (punishRealPaths.size() != 2) { addPunishImageView.setVisibility(View.VISIBLE); } @@ -506,7 +497,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index 7e3d47e..7c58e30 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -31,7 +31,6 @@ import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; @@ -50,8 +49,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; @@ -216,16 +213,14 @@ mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.obtainToiletIdLayout: - String toiletValue = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); - if (toiletValue.equals("")) { + List toiletBeanList = StringHelper.getToiletBeanList(); + if (toiletBeanList.size() == 0) { ToastHelper.showToast("获取公厕数据失败，请联系管理员", ToastHelper.ERROR); return; } - List dataBeans = new Gson().fromJson(toiletValue, new TypeToken>() { - }.getType()); QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("请选择您要打卡的公厕"); - for (ToiletListBean.DataBean it : dataBeans) { + for (ToiletListBean.DataBean it : toiletBeanList) { sheetBuilder.addItem(it.getName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -233,7 +228,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - toiletIdView.setText(dataBeans.get(position).getId()); + toiletIdView.setText(toiletBeanList.get(position).getId()); //TODO 是否需要将地图移到相应的公厕，待定 } }).build().show(); @@ -308,7 +303,7 @@ ToastHelper.showToast("保洁开始时间不能为空", ToastHelper.WARING); return; } - cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserId(), + cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, endTimeView.getText().toString(), imagePath, StringHelper.filterString(workContentView.getText().toString())); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 3a8ebc6..9f316a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -7,6 +7,7 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.utils.StringHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; @@ -47,9 +48,10 @@ @Override public void initData() { - userNameView.setText(StringHelper.getUserName()); - userPhoneView.setText(StringHelper.getUserPhone()); - userDeptView.setText(StringHelper.getUserDept()); + UserBean.DataBean userBean = StringHelper.getUserBean(); + userNameView.setText(userBean.getName()); + userPhoneView.setText(userBean.getPhone()); + userDeptView.setText(userBean.getDeptName()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index d9656aa..16bd2e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -39,6 +39,7 @@ import com.casic.dcms.ui.UrgentCaseActivity; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import butterknife.BindView; @@ -74,36 +75,38 @@ @Override protected void initData() { - userDataPresenter = new UserDataPresenterImpl(this); homePagePresenter = new HomePagePresenterImpl(this); + userDataPresenter = new UserDataPresenterImpl(this); + + //用户信息 + userDataPresenter.onReadyRetrofitRequest(); + //首页相关功能项 + homePagePresenter.onReadyRetrofitRequest("05"); } @Override protected void initEvent() { - userDataPresenter.onReadyRetrofitRequest(); - homePagePresenter.onReadyRetrofitRequest("05"); + //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 +// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); + Glide.with(this).load(R.mipmap.app_logo).into(userIconView); } @SuppressLint("SetTextI18n") @Override public void obtainUserData(UserBean userBean) { if (userBean.isSuccess()) { - //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 -// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); - Glide.with(this).load(R.mipmap.app_logo).into(userIconView); + UserBean.DataBean dataBean = userBean.getData(); + StringHelper.saveUserBean(new Gson().toJson(dataBean)); - UserBean.DataBean data = userBean.getData(); - userNameView.setText(data.getName()); - userDeptView.setText(data.getDeptName() + data.getRoleNames()); - - StringHelper.saveUserName(data.getName()); - StringHelper.saveUserPhone(data.getPhone()); - StringHelper.saveUserDept(data.getDeptName()); - StringHelper.saveUserDeptId(data.getDeptId()); - StringHelper.saveUserId(data.getId()); + userNameView.setText(dataBean.getName()); + userDeptView.setText(dataBean.getDeptName() + dataBean.getRoleNames()); } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); + } @Override public void obtainHomePageResult(HomePageBean resultBean) { @@ -183,11 +186,6 @@ } @Override - public void obtainDataFail() { - ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); - } - - @Override public void onDestroyView() { super.onDestroyView(); if (userDataPresenter != null) { @@ -197,4 +195,4 @@ homePagePresenter.disposeRetrofitRequest(); } } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 1657341..13aa09b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -76,7 +76,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserDeptId()); + phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 9e3437c..859d2ac 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -37,8 +37,9 @@ Color.rgb(120, 104, 230)}; public static final String IP_KEY = "ip"; - public static final String BRIDGE_LIST = "projectBridges"; - public static final String TOILET_LIST = "toilets"; + static final String USER_BEAN = "userBean"; + static final String BRIDGE_LIST = "projectBridges"; + static final String TOILET_LIST = "toilets"; public static final long HALF_YEAR = 180 * 60 * 60 * 24 * 1000L; public static final long ONE_YEAR = 365 * 60 * 60 * 24 * 1000L; diff --git a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java b/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java deleted file mode 100644 index 0286bb6..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.dcms.utils; - -import android.graphics.Rect; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -public class ItemDecorationSpace extends RecyclerView.ItemDecoration { - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (parent.getChildAdapterPosition(view) % 2 == 0) { - outRect.left = 0; - outRect.right = 5; - } else if (parent.getChildAdapterPosition(view) % 2 == 1) { - outRect.left = 5; - outRect.right = 0; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 4dd4dbd..cac58c5 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,7 +4,14 @@ import android.util.Log; import com.casic.dcms.R; +import com.casic.dcms.bean.HomePageBean; +import com.casic.dcms.bean.ProjectConfigBean; +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -21,44 +28,45 @@ return (String) SaveKeyValues.getValue("userAccount", ""); } - public static void saveUserId(String userId) { - SaveKeyValues.putValue("userId", userId); + public static void saveUserBean(String userBeanJson) { + SaveKeyValues.putValue(Constant.USER_BEAN, userBeanJson); } - public static String getUserId() { - return (String) SaveKeyValues.getValue("userId", ""); + public static UserBean.DataBean getUserBean() { + String userBeanJson = (String) SaveKeyValues.getValue(Constant.USER_BEAN, ""); + UserBean.DataBean dataBean = new UserBean.DataBean(); + if (userBeanJson.equals("")) { + return dataBean; + } + return new Gson().fromJson(userBeanJson, UserBean.DataBean.class); } - public static void saveUserName(String name) { - SaveKeyValues.putValue("userName", name); + public static void saveBridgeList(String bridgesJson) { + SaveKeyValues.putValue(Constant.BRIDGE_LIST, bridgesJson); } - public static String getUserName() { - return (String) SaveKeyValues.getValue("userName", ""); + public static List getBridgeBeanList() { + String bridgesJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); + List bridges = new ArrayList<>(); + if (bridgesJson.equals("")) { + return bridges; + } + return new Gson().fromJson(bridgesJson, new TypeToken>() { + }.getType()); } - public static void saveUserPhone(String phone) { - SaveKeyValues.putValue("userPhone", phone); + public static void saveToiletList(String toiletsJson) { + SaveKeyValues.putValue(Constant.TOILET_LIST, toiletsJson); } - public static String getUserPhone() { - return (String) SaveKeyValues.getValue("userPhone", ""); - } - - public static void saveUserDept(String dept) { - SaveKeyValues.putValue("userDept", dept); - } - - public static String getUserDept() { - return (String) SaveKeyValues.getValue("userDept", ""); - } - - public static void saveUserDeptId(String deptid) { - SaveKeyValues.putValue("userDeptId", deptid); - } - - public static String getUserDeptId() { - return (String) SaveKeyValues.getValue("userDeptId", ""); + public static List getToiletBeanList() { + String toiletsJson = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); + List toilets = new ArrayList<>(); + if (toiletsJson.equals("")) { + return toilets; + } + return new Gson().fromJson(toiletsJson, new TypeToken>() { + }.getType()); } public static boolean isLetterAndDigit(String str) { diff --git a/app/src/main/res/drawable/ic_package_holder.xml b/app/src/main/res/drawable/ic_package_holder.xml deleted file mode 100644 index 1f5ad5e..0000000 --- a/app/src/main/res/drawable/ic_package_holder.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 91bf9f9..e3a2c99 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -11,7 +11,9 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -20,13 +22,11 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -104,8 +103,8 @@ JzvdStd videoPlayerView; @BindView(R.id.addImageView) ImageView addImageView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -125,7 +124,7 @@ private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; private UploadVideoPresenterImpl uploadVideoPresenter; private String audioUrl, videoUrl; @@ -164,10 +163,8 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @SuppressLint("ClickableViewAccessibility") @@ -534,7 +531,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); imageList.add(url); @@ -542,21 +539,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -618,7 +615,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index aa02a1c..b7b71f5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -62,8 +61,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -73,7 +72,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -97,10 +96,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -217,7 +214,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -273,7 +270,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -281,21 +278,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 964490e..f4f3501 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -29,7 +29,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -71,8 +70,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -90,7 +89,7 @@ private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; @Override @@ -115,10 +114,8 @@ .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -331,28 +328,28 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -401,7 +398,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b8f97ec..496edba 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -57,8 +56,8 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -121,19 +120,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index c3b3b66..5f6a3e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -39,7 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -87,16 +86,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseOpinionView) TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; - @BindView(R.id.caseVerifyRecyclerView) - RecyclerView caseVerifyRecyclerView; + @BindView(R.id.verifyGridView) + GridView verifyGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -139,7 +138,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private ImageRecycleViewAdapter verifyImageAdapter; + private ImageGridViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -168,10 +167,8 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); - verifyImageAdapter = new ImageRecycleViewAdapter(this); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(verifyImageAdapter); + verifyImageAdapter = new ImageGridViewAdapter(this); + verifyGridView.setAdapter(verifyImageAdapter); } @Override @@ -226,19 +223,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -386,7 +381,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -402,7 +397,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -533,7 +528,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = verifyImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -541,22 +536,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); //九宫格点击事件 - verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + verifyGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - verifyImageAdapter.setDeleteView(true); - verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + verifyImageAdapter.isDeleteVisible(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 3cedbfe..8b08041 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -57,8 +56,8 @@ EditText shopKeeperView; @BindView(R.id.phoneNumberView) EditText phoneNumberView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -67,7 +66,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopChangePresenterImpl shopChangePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; private ArrayList realPaths = new ArrayList<>();//真实图片路径 @@ -91,10 +90,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -153,7 +150,7 @@ ToastHelper.showToast("店主名还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -235,7 +232,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -243,21 +240,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 381b704..d371d17 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -80,7 +80,7 @@ @Override public void initEvent() { - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", "", "", pageIndex); + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); calendarView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -98,7 +98,7 @@ endGroup = endGroupPosition;//结束月份位置 endChild = endChildPosition;//结束对应月份中日的位置 dateView.setText(startDate + "~" + endDate); - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", startDate, endDate, pageIndex); } }).builder(); @@ -110,7 +110,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); @@ -119,7 +119,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0d7053a..3662274 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -3,17 +3,17 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -27,7 +27,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAdjustFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -66,14 +65,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.optionEditView) @@ -207,19 +206,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -250,19 +247,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index bd491c3..19b9039 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAuthorizeFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -70,14 +69,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -264,19 +263,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -307,19 +304,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java index f22a99d..797b130 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -32,7 +32,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -71,14 +70,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -157,19 +156,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -200,19 +197,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 1c1fcd0..e40d2cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -22,9 +22,11 @@ import com.casic.dcms.base.BaseApplication; import com.casic.dcms.base.DoubleClickExitActivity; import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.HomePageBean; import com.casic.dcms.bean.NoticeBean; import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.greendao.NoticeBeanDao; import com.casic.dcms.mvp.presenter.PushRegisterPresenterImpl; import com.casic.dcms.mvp.presenter.ToiletListPresenterImpl; @@ -44,6 +46,8 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StatusBarColorUtil; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.callback.IHttpRequestListener; import com.casic.dcms.widgets.NoScrollViewPager; import com.google.android.material.bottomnavigation.BottomNavigationView; @@ -59,7 +63,8 @@ import butterknife.BindView; import okhttp3.ResponseBody; -public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, IPushRegisterView, IToiletListView { +public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, + IPushRegisterView, IToiletListView { private static final String TAG = "MainActivity"; @BindView(R.id.pageTitleView) @@ -100,18 +105,17 @@ uploadPositionPresenter = new UploadPositionPresenterImpl(this); registerPresenter = new PushRegisterPresenterImpl(this); toiletListPresenter = new ToiletListPresenterImpl(this); - gson = new Gson(); + //获取配置项 + obtainProjectConfig(); + //配置页面 pageList = new ArrayList<>(); pageList.add(new HomePageFragment()); pageList.add(new PhonePageFragment()); pageList.add(new NoticePageFragment()); pageList.add(new MinePageFragment()); + imei = OtherUtils.obtainSimCardSerialNumber(this); - - //获取配置项 - obtainProjectConfig(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UploadLocationService.class)); } else { @@ -128,7 +132,7 @@ try { String resultStr = resultBean.string(); List bridges = gson.fromJson(resultStr, ProjectConfigBean.class).getBridges(); - SaveKeyValues.putValue(Constant.BRIDGE_LIST, gson.toJson(bridges)); + StringHelper.saveBridgeList(gson.toJson(bridges)); } catch (IOException e) { e.printStackTrace(); } @@ -310,7 +314,7 @@ @Override public void obtainToiletListData(ToiletListBean resultBean) { if (resultBean.isSuccess()) { - SaveKeyValues.putValue(Constant.TOILET_LIST, gson.toJson(resultBean.getData())); + StringHelper.saveToiletList(gson.toJson(resultBean.getData())); } } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 441625b..fe48830 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -3,18 +3,16 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -44,16 +42,16 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.punishTypeView) TextView punishTypeView; @BindView(R.id.punishOpinionView) TextView punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.punishDateView) TextView punishDateView; @@ -106,19 +104,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -131,19 +127,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处罚记录 @@ -158,19 +152,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + punishGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } punishDateView.setText(data.getPunishTime()); } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index 1dec74b..6711568 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -5,7 +5,9 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; @@ -13,11 +15,9 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; @@ -78,8 +77,8 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.line1) @@ -90,8 +89,8 @@ View line2; @BindView(R.id.reasonLayout) RelativeLayout reasonLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.addHandleImageView) ImageView addHandleImageView; @BindView(R.id.caseReasonView) @@ -102,8 +101,8 @@ TextView punishTypeView; @BindView(R.id.punishOpinionView) EditText punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.addPunishImageView) ImageView addPunishImageView; @BindView(R.id.punishDateView) @@ -120,7 +119,8 @@ private ArrayList punishRealPaths = new ArrayList<>();//真实图片路径 private List handleImageList = new ArrayList<>();//上传到服务器的数据集 private List punishImageList = new ArrayList<>();//上传到服务器的数据集 - private ImageRecycleViewAdapter punishImageAdapter, handleImageAdapter; + private ImageGridViewAdapter handleImageAdapter; + private ImageGridViewAdapter punishImageAdapter; private CaseNextNodePresenterImpl caseNextNodePresenter; private String changeState; private String approvalResult; @@ -155,17 +155,13 @@ .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); //处罚adapter - punishImageAdapter = new ImageRecycleViewAdapter(this); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(punishImageAdapter); + punishImageAdapter = new ImageGridViewAdapter(this); + punishGridView.setAdapter(punishImageAdapter); //下级结点 caseNextNodePresenter = new CaseNextNodePresenterImpl(this); - //案卷处理adapter - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); caseHandlePresenter = new CaseHandlePresenterImpl(this); packageHandlePresenter = new PackageHandlePresenterImpl(this); @@ -206,19 +202,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -231,19 +225,16 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + handleImageAdapter.setImageList(urls); + handleGridView.setAdapter(handleImageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + handleImageAdapter.isDeleteVisible(true); } } } @@ -382,7 +373,7 @@ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg if (isAddHandleImage) { //处理图片 - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); handleImageList.add(url); @@ -390,22 +381,22 @@ if (handleRealPaths.size() == 2) { addHandleImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, handleRealPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { handleImageList.remove(position); handleRealPaths.remove(position); - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); if (handleRealPaths.size() != 2) { addHandleImageView.setVisibility(View.VISIBLE); } @@ -416,7 +407,7 @@ } } else { //处罚图片 - int sumItemCount = punishImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = punishImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); punishImageList.add(url); @@ -424,21 +415,21 @@ if (punishRealPaths.size() == 2) { addPunishImageView.setVisibility(View.GONE); } - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); //九宫格点击事件 - punishImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, punishRealPaths); } }); //删除按钮点击事件 - punishImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + punishImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { punishImageList.remove(position); punishRealPaths.remove(position); - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); if (punishRealPaths.size() != 2) { addPunishImageView.setVisibility(View.VISIBLE); } @@ -506,7 +497,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index 7e3d47e..7c58e30 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -31,7 +31,6 @@ import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; @@ -50,8 +49,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; @@ -216,16 +213,14 @@ mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.obtainToiletIdLayout: - String toiletValue = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); - if (toiletValue.equals("")) { + List toiletBeanList = StringHelper.getToiletBeanList(); + if (toiletBeanList.size() == 0) { ToastHelper.showToast("获取公厕数据失败，请联系管理员", ToastHelper.ERROR); return; } - List dataBeans = new Gson().fromJson(toiletValue, new TypeToken>() { - }.getType()); QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("请选择您要打卡的公厕"); - for (ToiletListBean.DataBean it : dataBeans) { + for (ToiletListBean.DataBean it : toiletBeanList) { sheetBuilder.addItem(it.getName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -233,7 +228,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - toiletIdView.setText(dataBeans.get(position).getId()); + toiletIdView.setText(toiletBeanList.get(position).getId()); //TODO 是否需要将地图移到相应的公厕，待定 } }).build().show(); @@ -308,7 +303,7 @@ ToastHelper.showToast("保洁开始时间不能为空", ToastHelper.WARING); return; } - cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserId(), + cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, endTimeView.getText().toString(), imagePath, StringHelper.filterString(workContentView.getText().toString())); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 3a8ebc6..9f316a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -7,6 +7,7 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.utils.StringHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; @@ -47,9 +48,10 @@ @Override public void initData() { - userNameView.setText(StringHelper.getUserName()); - userPhoneView.setText(StringHelper.getUserPhone()); - userDeptView.setText(StringHelper.getUserDept()); + UserBean.DataBean userBean = StringHelper.getUserBean(); + userNameView.setText(userBean.getName()); + userPhoneView.setText(userBean.getPhone()); + userDeptView.setText(userBean.getDeptName()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index d9656aa..16bd2e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -39,6 +39,7 @@ import com.casic.dcms.ui.UrgentCaseActivity; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import butterknife.BindView; @@ -74,36 +75,38 @@ @Override protected void initData() { - userDataPresenter = new UserDataPresenterImpl(this); homePagePresenter = new HomePagePresenterImpl(this); + userDataPresenter = new UserDataPresenterImpl(this); + + //用户信息 + userDataPresenter.onReadyRetrofitRequest(); + //首页相关功能项 + homePagePresenter.onReadyRetrofitRequest("05"); } @Override protected void initEvent() { - userDataPresenter.onReadyRetrofitRequest(); - homePagePresenter.onReadyRetrofitRequest("05"); + //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 +// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); + Glide.with(this).load(R.mipmap.app_logo).into(userIconView); } @SuppressLint("SetTextI18n") @Override public void obtainUserData(UserBean userBean) { if (userBean.isSuccess()) { - //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 -// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); - Glide.with(this).load(R.mipmap.app_logo).into(userIconView); + UserBean.DataBean dataBean = userBean.getData(); + StringHelper.saveUserBean(new Gson().toJson(dataBean)); - UserBean.DataBean data = userBean.getData(); - userNameView.setText(data.getName()); - userDeptView.setText(data.getDeptName() + data.getRoleNames()); - - StringHelper.saveUserName(data.getName()); - StringHelper.saveUserPhone(data.getPhone()); - StringHelper.saveUserDept(data.getDeptName()); - StringHelper.saveUserDeptId(data.getDeptId()); - StringHelper.saveUserId(data.getId()); + userNameView.setText(dataBean.getName()); + userDeptView.setText(dataBean.getDeptName() + dataBean.getRoleNames()); } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); + } @Override public void obtainHomePageResult(HomePageBean resultBean) { @@ -183,11 +186,6 @@ } @Override - public void obtainDataFail() { - ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); - } - - @Override public void onDestroyView() { super.onDestroyView(); if (userDataPresenter != null) { @@ -197,4 +195,4 @@ homePagePresenter.disposeRetrofitRequest(); } } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 1657341..13aa09b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -76,7 +76,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserDeptId()); + phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 9e3437c..859d2ac 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -37,8 +37,9 @@ Color.rgb(120, 104, 230)}; public static final String IP_KEY = "ip"; - public static final String BRIDGE_LIST = "projectBridges"; - public static final String TOILET_LIST = "toilets"; + static final String USER_BEAN = "userBean"; + static final String BRIDGE_LIST = "projectBridges"; + static final String TOILET_LIST = "toilets"; public static final long HALF_YEAR = 180 * 60 * 60 * 24 * 1000L; public static final long ONE_YEAR = 365 * 60 * 60 * 24 * 1000L; diff --git a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java b/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java deleted file mode 100644 index 0286bb6..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.dcms.utils; - -import android.graphics.Rect; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -public class ItemDecorationSpace extends RecyclerView.ItemDecoration { - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (parent.getChildAdapterPosition(view) % 2 == 0) { - outRect.left = 0; - outRect.right = 5; - } else if (parent.getChildAdapterPosition(view) % 2 == 1) { - outRect.left = 5; - outRect.right = 0; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 4dd4dbd..cac58c5 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,7 +4,14 @@ import android.util.Log; import com.casic.dcms.R; +import com.casic.dcms.bean.HomePageBean; +import com.casic.dcms.bean.ProjectConfigBean; +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -21,44 +28,45 @@ return (String) SaveKeyValues.getValue("userAccount", ""); } - public static void saveUserId(String userId) { - SaveKeyValues.putValue("userId", userId); + public static void saveUserBean(String userBeanJson) { + SaveKeyValues.putValue(Constant.USER_BEAN, userBeanJson); } - public static String getUserId() { - return (String) SaveKeyValues.getValue("userId", ""); + public static UserBean.DataBean getUserBean() { + String userBeanJson = (String) SaveKeyValues.getValue(Constant.USER_BEAN, ""); + UserBean.DataBean dataBean = new UserBean.DataBean(); + if (userBeanJson.equals("")) { + return dataBean; + } + return new Gson().fromJson(userBeanJson, UserBean.DataBean.class); } - public static void saveUserName(String name) { - SaveKeyValues.putValue("userName", name); + public static void saveBridgeList(String bridgesJson) { + SaveKeyValues.putValue(Constant.BRIDGE_LIST, bridgesJson); } - public static String getUserName() { - return (String) SaveKeyValues.getValue("userName", ""); + public static List getBridgeBeanList() { + String bridgesJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); + List bridges = new ArrayList<>(); + if (bridgesJson.equals("")) { + return bridges; + } + return new Gson().fromJson(bridgesJson, new TypeToken>() { + }.getType()); } - public static void saveUserPhone(String phone) { - SaveKeyValues.putValue("userPhone", phone); + public static void saveToiletList(String toiletsJson) { + SaveKeyValues.putValue(Constant.TOILET_LIST, toiletsJson); } - public static String getUserPhone() { - return (String) SaveKeyValues.getValue("userPhone", ""); - } - - public static void saveUserDept(String dept) { - SaveKeyValues.putValue("userDept", dept); - } - - public static String getUserDept() { - return (String) SaveKeyValues.getValue("userDept", ""); - } - - public static void saveUserDeptId(String deptid) { - SaveKeyValues.putValue("userDeptId", deptid); - } - - public static String getUserDeptId() { - return (String) SaveKeyValues.getValue("userDeptId", ""); + public static List getToiletBeanList() { + String toiletsJson = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); + List toilets = new ArrayList<>(); + if (toiletsJson.equals("")) { + return toilets; + } + return new Gson().fromJson(toiletsJson, new TypeToken>() { + }.getType()); } public static boolean isLetterAndDigit(String str) { diff --git a/app/src/main/res/drawable/ic_package_holder.xml b/app/src/main/res/drawable/ic_package_holder.xml deleted file mode 100644 index 1f5ad5e..0000000 --- a/app/src/main/res/drawable/ic_package_holder.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 1d21c58..b376886 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -50,10 +50,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -95,10 +94,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -142,10 +140,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 91bf9f9..e3a2c99 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -11,7 +11,9 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -20,13 +22,11 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -104,8 +103,8 @@ JzvdStd videoPlayerView; @BindView(R.id.addImageView) ImageView addImageView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -125,7 +124,7 @@ private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; private UploadVideoPresenterImpl uploadVideoPresenter; private String audioUrl, videoUrl; @@ -164,10 +163,8 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @SuppressLint("ClickableViewAccessibility") @@ -534,7 +531,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); imageList.add(url); @@ -542,21 +539,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -618,7 +615,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index aa02a1c..b7b71f5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -62,8 +61,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -73,7 +72,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -97,10 +96,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -217,7 +214,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -273,7 +270,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -281,21 +278,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 964490e..f4f3501 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -29,7 +29,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -71,8 +70,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -90,7 +89,7 @@ private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; @Override @@ -115,10 +114,8 @@ .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -331,28 +328,28 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -401,7 +398,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b8f97ec..496edba 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -57,8 +56,8 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -121,19 +120,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index c3b3b66..5f6a3e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -39,7 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -87,16 +86,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseOpinionView) TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; - @BindView(R.id.caseVerifyRecyclerView) - RecyclerView caseVerifyRecyclerView; + @BindView(R.id.verifyGridView) + GridView verifyGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -139,7 +138,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private ImageRecycleViewAdapter verifyImageAdapter; + private ImageGridViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -168,10 +167,8 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); - verifyImageAdapter = new ImageRecycleViewAdapter(this); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(verifyImageAdapter); + verifyImageAdapter = new ImageGridViewAdapter(this); + verifyGridView.setAdapter(verifyImageAdapter); } @Override @@ -226,19 +223,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -386,7 +381,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -402,7 +397,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -533,7 +528,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = verifyImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -541,22 +536,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); //九宫格点击事件 - verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + verifyGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - verifyImageAdapter.setDeleteView(true); - verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + verifyImageAdapter.isDeleteVisible(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 3cedbfe..8b08041 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -57,8 +56,8 @@ EditText shopKeeperView; @BindView(R.id.phoneNumberView) EditText phoneNumberView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -67,7 +66,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopChangePresenterImpl shopChangePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; private ArrayList realPaths = new ArrayList<>();//真实图片路径 @@ -91,10 +90,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -153,7 +150,7 @@ ToastHelper.showToast("店主名还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -235,7 +232,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -243,21 +240,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 381b704..d371d17 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -80,7 +80,7 @@ @Override public void initEvent() { - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", "", "", pageIndex); + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); calendarView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -98,7 +98,7 @@ endGroup = endGroupPosition;//结束月份位置 endChild = endChildPosition;//结束对应月份中日的位置 dateView.setText(startDate + "~" + endDate); - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", startDate, endDate, pageIndex); } }).builder(); @@ -110,7 +110,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); @@ -119,7 +119,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0d7053a..3662274 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -3,17 +3,17 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -27,7 +27,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAdjustFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -66,14 +65,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.optionEditView) @@ -207,19 +206,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -250,19 +247,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index bd491c3..19b9039 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAuthorizeFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -70,14 +69,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -264,19 +263,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -307,19 +304,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java index f22a99d..797b130 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -32,7 +32,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -71,14 +70,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -157,19 +156,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -200,19 +197,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 1c1fcd0..e40d2cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -22,9 +22,11 @@ import com.casic.dcms.base.BaseApplication; import com.casic.dcms.base.DoubleClickExitActivity; import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.HomePageBean; import com.casic.dcms.bean.NoticeBean; import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.greendao.NoticeBeanDao; import com.casic.dcms.mvp.presenter.PushRegisterPresenterImpl; import com.casic.dcms.mvp.presenter.ToiletListPresenterImpl; @@ -44,6 +46,8 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StatusBarColorUtil; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.callback.IHttpRequestListener; import com.casic.dcms.widgets.NoScrollViewPager; import com.google.android.material.bottomnavigation.BottomNavigationView; @@ -59,7 +63,8 @@ import butterknife.BindView; import okhttp3.ResponseBody; -public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, IPushRegisterView, IToiletListView { +public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, + IPushRegisterView, IToiletListView { private static final String TAG = "MainActivity"; @BindView(R.id.pageTitleView) @@ -100,18 +105,17 @@ uploadPositionPresenter = new UploadPositionPresenterImpl(this); registerPresenter = new PushRegisterPresenterImpl(this); toiletListPresenter = new ToiletListPresenterImpl(this); - gson = new Gson(); + //获取配置项 + obtainProjectConfig(); + //配置页面 pageList = new ArrayList<>(); pageList.add(new HomePageFragment()); pageList.add(new PhonePageFragment()); pageList.add(new NoticePageFragment()); pageList.add(new MinePageFragment()); + imei = OtherUtils.obtainSimCardSerialNumber(this); - - //获取配置项 - obtainProjectConfig(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UploadLocationService.class)); } else { @@ -128,7 +132,7 @@ try { String resultStr = resultBean.string(); List bridges = gson.fromJson(resultStr, ProjectConfigBean.class).getBridges(); - SaveKeyValues.putValue(Constant.BRIDGE_LIST, gson.toJson(bridges)); + StringHelper.saveBridgeList(gson.toJson(bridges)); } catch (IOException e) { e.printStackTrace(); } @@ -310,7 +314,7 @@ @Override public void obtainToiletListData(ToiletListBean resultBean) { if (resultBean.isSuccess()) { - SaveKeyValues.putValue(Constant.TOILET_LIST, gson.toJson(resultBean.getData())); + StringHelper.saveToiletList(gson.toJson(resultBean.getData())); } } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 441625b..fe48830 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -3,18 +3,16 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -44,16 +42,16 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.punishTypeView) TextView punishTypeView; @BindView(R.id.punishOpinionView) TextView punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.punishDateView) TextView punishDateView; @@ -106,19 +104,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -131,19 +127,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处罚记录 @@ -158,19 +152,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + punishGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } punishDateView.setText(data.getPunishTime()); } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index 1dec74b..6711568 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -5,7 +5,9 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; @@ -13,11 +15,9 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; @@ -78,8 +77,8 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.line1) @@ -90,8 +89,8 @@ View line2; @BindView(R.id.reasonLayout) RelativeLayout reasonLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.addHandleImageView) ImageView addHandleImageView; @BindView(R.id.caseReasonView) @@ -102,8 +101,8 @@ TextView punishTypeView; @BindView(R.id.punishOpinionView) EditText punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.addPunishImageView) ImageView addPunishImageView; @BindView(R.id.punishDateView) @@ -120,7 +119,8 @@ private ArrayList punishRealPaths = new ArrayList<>();//真实图片路径 private List handleImageList = new ArrayList<>();//上传到服务器的数据集 private List punishImageList = new ArrayList<>();//上传到服务器的数据集 - private ImageRecycleViewAdapter punishImageAdapter, handleImageAdapter; + private ImageGridViewAdapter handleImageAdapter; + private ImageGridViewAdapter punishImageAdapter; private CaseNextNodePresenterImpl caseNextNodePresenter; private String changeState; private String approvalResult; @@ -155,17 +155,13 @@ .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); //处罚adapter - punishImageAdapter = new ImageRecycleViewAdapter(this); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(punishImageAdapter); + punishImageAdapter = new ImageGridViewAdapter(this); + punishGridView.setAdapter(punishImageAdapter); //下级结点 caseNextNodePresenter = new CaseNextNodePresenterImpl(this); - //案卷处理adapter - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); caseHandlePresenter = new CaseHandlePresenterImpl(this); packageHandlePresenter = new PackageHandlePresenterImpl(this); @@ -206,19 +202,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -231,19 +225,16 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + handleImageAdapter.setImageList(urls); + handleGridView.setAdapter(handleImageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + handleImageAdapter.isDeleteVisible(true); } } } @@ -382,7 +373,7 @@ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg if (isAddHandleImage) { //处理图片 - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); handleImageList.add(url); @@ -390,22 +381,22 @@ if (handleRealPaths.size() == 2) { addHandleImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, handleRealPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { handleImageList.remove(position); handleRealPaths.remove(position); - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); if (handleRealPaths.size() != 2) { addHandleImageView.setVisibility(View.VISIBLE); } @@ -416,7 +407,7 @@ } } else { //处罚图片 - int sumItemCount = punishImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = punishImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); punishImageList.add(url); @@ -424,21 +415,21 @@ if (punishRealPaths.size() == 2) { addPunishImageView.setVisibility(View.GONE); } - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); //九宫格点击事件 - punishImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, punishRealPaths); } }); //删除按钮点击事件 - punishImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + punishImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { punishImageList.remove(position); punishRealPaths.remove(position); - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); if (punishRealPaths.size() != 2) { addPunishImageView.setVisibility(View.VISIBLE); } @@ -506,7 +497,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index 7e3d47e..7c58e30 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -31,7 +31,6 @@ import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; @@ -50,8 +49,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; @@ -216,16 +213,14 @@ mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.obtainToiletIdLayout: - String toiletValue = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); - if (toiletValue.equals("")) { + List toiletBeanList = StringHelper.getToiletBeanList(); + if (toiletBeanList.size() == 0) { ToastHelper.showToast("获取公厕数据失败，请联系管理员", ToastHelper.ERROR); return; } - List dataBeans = new Gson().fromJson(toiletValue, new TypeToken>() { - }.getType()); QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("请选择您要打卡的公厕"); - for (ToiletListBean.DataBean it : dataBeans) { + for (ToiletListBean.DataBean it : toiletBeanList) { sheetBuilder.addItem(it.getName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -233,7 +228,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - toiletIdView.setText(dataBeans.get(position).getId()); + toiletIdView.setText(toiletBeanList.get(position).getId()); //TODO 是否需要将地图移到相应的公厕，待定 } }).build().show(); @@ -308,7 +303,7 @@ ToastHelper.showToast("保洁开始时间不能为空", ToastHelper.WARING); return; } - cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserId(), + cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, endTimeView.getText().toString(), imagePath, StringHelper.filterString(workContentView.getText().toString())); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 3a8ebc6..9f316a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -7,6 +7,7 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.utils.StringHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; @@ -47,9 +48,10 @@ @Override public void initData() { - userNameView.setText(StringHelper.getUserName()); - userPhoneView.setText(StringHelper.getUserPhone()); - userDeptView.setText(StringHelper.getUserDept()); + UserBean.DataBean userBean = StringHelper.getUserBean(); + userNameView.setText(userBean.getName()); + userPhoneView.setText(userBean.getPhone()); + userDeptView.setText(userBean.getDeptName()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index d9656aa..16bd2e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -39,6 +39,7 @@ import com.casic.dcms.ui.UrgentCaseActivity; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import butterknife.BindView; @@ -74,36 +75,38 @@ @Override protected void initData() { - userDataPresenter = new UserDataPresenterImpl(this); homePagePresenter = new HomePagePresenterImpl(this); + userDataPresenter = new UserDataPresenterImpl(this); + + //用户信息 + userDataPresenter.onReadyRetrofitRequest(); + //首页相关功能项 + homePagePresenter.onReadyRetrofitRequest("05"); } @Override protected void initEvent() { - userDataPresenter.onReadyRetrofitRequest(); - homePagePresenter.onReadyRetrofitRequest("05"); + //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 +// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); + Glide.with(this).load(R.mipmap.app_logo).into(userIconView); } @SuppressLint("SetTextI18n") @Override public void obtainUserData(UserBean userBean) { if (userBean.isSuccess()) { - //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 -// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); - Glide.with(this).load(R.mipmap.app_logo).into(userIconView); + UserBean.DataBean dataBean = userBean.getData(); + StringHelper.saveUserBean(new Gson().toJson(dataBean)); - UserBean.DataBean data = userBean.getData(); - userNameView.setText(data.getName()); - userDeptView.setText(data.getDeptName() + data.getRoleNames()); - - StringHelper.saveUserName(data.getName()); - StringHelper.saveUserPhone(data.getPhone()); - StringHelper.saveUserDept(data.getDeptName()); - StringHelper.saveUserDeptId(data.getDeptId()); - StringHelper.saveUserId(data.getId()); + userNameView.setText(dataBean.getName()); + userDeptView.setText(dataBean.getDeptName() + dataBean.getRoleNames()); } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); + } @Override public void obtainHomePageResult(HomePageBean resultBean) { @@ -183,11 +186,6 @@ } @Override - public void obtainDataFail() { - ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); - } - - @Override public void onDestroyView() { super.onDestroyView(); if (userDataPresenter != null) { @@ -197,4 +195,4 @@ homePagePresenter.disposeRetrofitRequest(); } } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 1657341..13aa09b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -76,7 +76,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserDeptId()); + phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 9e3437c..859d2ac 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -37,8 +37,9 @@ Color.rgb(120, 104, 230)}; public static final String IP_KEY = "ip"; - public static final String BRIDGE_LIST = "projectBridges"; - public static final String TOILET_LIST = "toilets"; + static final String USER_BEAN = "userBean"; + static final String BRIDGE_LIST = "projectBridges"; + static final String TOILET_LIST = "toilets"; public static final long HALF_YEAR = 180 * 60 * 60 * 24 * 1000L; public static final long ONE_YEAR = 365 * 60 * 60 * 24 * 1000L; diff --git a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java b/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java deleted file mode 100644 index 0286bb6..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.dcms.utils; - -import android.graphics.Rect; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -public class ItemDecorationSpace extends RecyclerView.ItemDecoration { - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (parent.getChildAdapterPosition(view) % 2 == 0) { - outRect.left = 0; - outRect.right = 5; - } else if (parent.getChildAdapterPosition(view) % 2 == 1) { - outRect.left = 5; - outRect.right = 0; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 4dd4dbd..cac58c5 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,7 +4,14 @@ import android.util.Log; import com.casic.dcms.R; +import com.casic.dcms.bean.HomePageBean; +import com.casic.dcms.bean.ProjectConfigBean; +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -21,44 +28,45 @@ return (String) SaveKeyValues.getValue("userAccount", ""); } - public static void saveUserId(String userId) { - SaveKeyValues.putValue("userId", userId); + public static void saveUserBean(String userBeanJson) { + SaveKeyValues.putValue(Constant.USER_BEAN, userBeanJson); } - public static String getUserId() { - return (String) SaveKeyValues.getValue("userId", ""); + public static UserBean.DataBean getUserBean() { + String userBeanJson = (String) SaveKeyValues.getValue(Constant.USER_BEAN, ""); + UserBean.DataBean dataBean = new UserBean.DataBean(); + if (userBeanJson.equals("")) { + return dataBean; + } + return new Gson().fromJson(userBeanJson, UserBean.DataBean.class); } - public static void saveUserName(String name) { - SaveKeyValues.putValue("userName", name); + public static void saveBridgeList(String bridgesJson) { + SaveKeyValues.putValue(Constant.BRIDGE_LIST, bridgesJson); } - public static String getUserName() { - return (String) SaveKeyValues.getValue("userName", ""); + public static List getBridgeBeanList() { + String bridgesJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); + List bridges = new ArrayList<>(); + if (bridgesJson.equals("")) { + return bridges; + } + return new Gson().fromJson(bridgesJson, new TypeToken>() { + }.getType()); } - public static void saveUserPhone(String phone) { - SaveKeyValues.putValue("userPhone", phone); + public static void saveToiletList(String toiletsJson) { + SaveKeyValues.putValue(Constant.TOILET_LIST, toiletsJson); } - public static String getUserPhone() { - return (String) SaveKeyValues.getValue("userPhone", ""); - } - - public static void saveUserDept(String dept) { - SaveKeyValues.putValue("userDept", dept); - } - - public static String getUserDept() { - return (String) SaveKeyValues.getValue("userDept", ""); - } - - public static void saveUserDeptId(String deptid) { - SaveKeyValues.putValue("userDeptId", deptid); - } - - public static String getUserDeptId() { - return (String) SaveKeyValues.getValue("userDeptId", ""); + public static List getToiletBeanList() { + String toiletsJson = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); + List toilets = new ArrayList<>(); + if (toiletsJson.equals("")) { + return toilets; + } + return new Gson().fromJson(toiletsJson, new TypeToken>() { + }.getType()); } public static boolean isLetterAndDigit(String str) { diff --git a/app/src/main/res/drawable/ic_package_holder.xml b/app/src/main/res/drawable/ic_package_holder.xml deleted file mode 100644 index 1f5ad5e..0000000 --- a/app/src/main/res/drawable/ic_package_holder.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 1d21c58..b376886 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -50,10 +50,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -95,10 +94,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -142,10 +140,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - @@ -38,10 +37,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -53,10 +51,9 @@ style="@style/noPointTextViewStyle" android:text="核查图片" /> - diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 91bf9f9..e3a2c99 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -11,7 +11,9 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -20,13 +22,11 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -104,8 +103,8 @@ JzvdStd videoPlayerView; @BindView(R.id.addImageView) ImageView addImageView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -125,7 +124,7 @@ private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; private UploadVideoPresenterImpl uploadVideoPresenter; private String audioUrl, videoUrl; @@ -164,10 +163,8 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @SuppressLint("ClickableViewAccessibility") @@ -534,7 +531,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); imageList.add(url); @@ -542,21 +539,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -618,7 +615,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index aa02a1c..b7b71f5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -62,8 +61,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -73,7 +72,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -97,10 +96,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -217,7 +214,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -273,7 +270,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -281,21 +278,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 964490e..f4f3501 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -29,7 +29,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -71,8 +70,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -90,7 +89,7 @@ private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; @Override @@ -115,10 +114,8 @@ .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -331,28 +328,28 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -401,7 +398,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b8f97ec..496edba 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -57,8 +56,8 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -121,19 +120,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index c3b3b66..5f6a3e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -39,7 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -87,16 +86,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseOpinionView) TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; - @BindView(R.id.caseVerifyRecyclerView) - RecyclerView caseVerifyRecyclerView; + @BindView(R.id.verifyGridView) + GridView verifyGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -139,7 +138,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private ImageRecycleViewAdapter verifyImageAdapter; + private ImageGridViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -168,10 +167,8 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); - verifyImageAdapter = new ImageRecycleViewAdapter(this); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(verifyImageAdapter); + verifyImageAdapter = new ImageGridViewAdapter(this); + verifyGridView.setAdapter(verifyImageAdapter); } @Override @@ -226,19 +223,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -386,7 +381,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -402,7 +397,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -533,7 +528,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = verifyImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -541,22 +536,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); //九宫格点击事件 - verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + verifyGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - verifyImageAdapter.setDeleteView(true); - verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + verifyImageAdapter.isDeleteVisible(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 3cedbfe..8b08041 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -57,8 +56,8 @@ EditText shopKeeperView; @BindView(R.id.phoneNumberView) EditText phoneNumberView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -67,7 +66,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopChangePresenterImpl shopChangePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; private ArrayList realPaths = new ArrayList<>();//真实图片路径 @@ -91,10 +90,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -153,7 +150,7 @@ ToastHelper.showToast("店主名还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -235,7 +232,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -243,21 +240,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 381b704..d371d17 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -80,7 +80,7 @@ @Override public void initEvent() { - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", "", "", pageIndex); + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); calendarView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -98,7 +98,7 @@ endGroup = endGroupPosition;//结束月份位置 endChild = endChildPosition;//结束对应月份中日的位置 dateView.setText(startDate + "~" + endDate); - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", startDate, endDate, pageIndex); } }).builder(); @@ -110,7 +110,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); @@ -119,7 +119,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0d7053a..3662274 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -3,17 +3,17 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -27,7 +27,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAdjustFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -66,14 +65,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.optionEditView) @@ -207,19 +206,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -250,19 +247,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index bd491c3..19b9039 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAuthorizeFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -70,14 +69,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -264,19 +263,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -307,19 +304,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java index f22a99d..797b130 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -32,7 +32,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -71,14 +70,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -157,19 +156,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -200,19 +197,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 1c1fcd0..e40d2cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -22,9 +22,11 @@ import com.casic.dcms.base.BaseApplication; import com.casic.dcms.base.DoubleClickExitActivity; import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.HomePageBean; import com.casic.dcms.bean.NoticeBean; import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.greendao.NoticeBeanDao; import com.casic.dcms.mvp.presenter.PushRegisterPresenterImpl; import com.casic.dcms.mvp.presenter.ToiletListPresenterImpl; @@ -44,6 +46,8 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StatusBarColorUtil; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.callback.IHttpRequestListener; import com.casic.dcms.widgets.NoScrollViewPager; import com.google.android.material.bottomnavigation.BottomNavigationView; @@ -59,7 +63,8 @@ import butterknife.BindView; import okhttp3.ResponseBody; -public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, IPushRegisterView, IToiletListView { +public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, + IPushRegisterView, IToiletListView { private static final String TAG = "MainActivity"; @BindView(R.id.pageTitleView) @@ -100,18 +105,17 @@ uploadPositionPresenter = new UploadPositionPresenterImpl(this); registerPresenter = new PushRegisterPresenterImpl(this); toiletListPresenter = new ToiletListPresenterImpl(this); - gson = new Gson(); + //获取配置项 + obtainProjectConfig(); + //配置页面 pageList = new ArrayList<>(); pageList.add(new HomePageFragment()); pageList.add(new PhonePageFragment()); pageList.add(new NoticePageFragment()); pageList.add(new MinePageFragment()); + imei = OtherUtils.obtainSimCardSerialNumber(this); - - //获取配置项 - obtainProjectConfig(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UploadLocationService.class)); } else { @@ -128,7 +132,7 @@ try { String resultStr = resultBean.string(); List bridges = gson.fromJson(resultStr, ProjectConfigBean.class).getBridges(); - SaveKeyValues.putValue(Constant.BRIDGE_LIST, gson.toJson(bridges)); + StringHelper.saveBridgeList(gson.toJson(bridges)); } catch (IOException e) { e.printStackTrace(); } @@ -310,7 +314,7 @@ @Override public void obtainToiletListData(ToiletListBean resultBean) { if (resultBean.isSuccess()) { - SaveKeyValues.putValue(Constant.TOILET_LIST, gson.toJson(resultBean.getData())); + StringHelper.saveToiletList(gson.toJson(resultBean.getData())); } } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 441625b..fe48830 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -3,18 +3,16 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -44,16 +42,16 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.punishTypeView) TextView punishTypeView; @BindView(R.id.punishOpinionView) TextView punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.punishDateView) TextView punishDateView; @@ -106,19 +104,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -131,19 +127,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处罚记录 @@ -158,19 +152,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + punishGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } punishDateView.setText(data.getPunishTime()); } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index 1dec74b..6711568 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -5,7 +5,9 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; @@ -13,11 +15,9 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; @@ -78,8 +77,8 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.line1) @@ -90,8 +89,8 @@ View line2; @BindView(R.id.reasonLayout) RelativeLayout reasonLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.addHandleImageView) ImageView addHandleImageView; @BindView(R.id.caseReasonView) @@ -102,8 +101,8 @@ TextView punishTypeView; @BindView(R.id.punishOpinionView) EditText punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.addPunishImageView) ImageView addPunishImageView; @BindView(R.id.punishDateView) @@ -120,7 +119,8 @@ private ArrayList punishRealPaths = new ArrayList<>();//真实图片路径 private List handleImageList = new ArrayList<>();//上传到服务器的数据集 private List punishImageList = new ArrayList<>();//上传到服务器的数据集 - private ImageRecycleViewAdapter punishImageAdapter, handleImageAdapter; + private ImageGridViewAdapter handleImageAdapter; + private ImageGridViewAdapter punishImageAdapter; private CaseNextNodePresenterImpl caseNextNodePresenter; private String changeState; private String approvalResult; @@ -155,17 +155,13 @@ .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); //处罚adapter - punishImageAdapter = new ImageRecycleViewAdapter(this); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(punishImageAdapter); + punishImageAdapter = new ImageGridViewAdapter(this); + punishGridView.setAdapter(punishImageAdapter); //下级结点 caseNextNodePresenter = new CaseNextNodePresenterImpl(this); - //案卷处理adapter - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); caseHandlePresenter = new CaseHandlePresenterImpl(this); packageHandlePresenter = new PackageHandlePresenterImpl(this); @@ -206,19 +202,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -231,19 +225,16 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + handleImageAdapter.setImageList(urls); + handleGridView.setAdapter(handleImageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + handleImageAdapter.isDeleteVisible(true); } } } @@ -382,7 +373,7 @@ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg if (isAddHandleImage) { //处理图片 - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); handleImageList.add(url); @@ -390,22 +381,22 @@ if (handleRealPaths.size() == 2) { addHandleImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, handleRealPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { handleImageList.remove(position); handleRealPaths.remove(position); - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); if (handleRealPaths.size() != 2) { addHandleImageView.setVisibility(View.VISIBLE); } @@ -416,7 +407,7 @@ } } else { //处罚图片 - int sumItemCount = punishImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = punishImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); punishImageList.add(url); @@ -424,21 +415,21 @@ if (punishRealPaths.size() == 2) { addPunishImageView.setVisibility(View.GONE); } - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); //九宫格点击事件 - punishImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, punishRealPaths); } }); //删除按钮点击事件 - punishImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + punishImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { punishImageList.remove(position); punishRealPaths.remove(position); - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); if (punishRealPaths.size() != 2) { addPunishImageView.setVisibility(View.VISIBLE); } @@ -506,7 +497,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index 7e3d47e..7c58e30 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -31,7 +31,6 @@ import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; @@ -50,8 +49,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; @@ -216,16 +213,14 @@ mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.obtainToiletIdLayout: - String toiletValue = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); - if (toiletValue.equals("")) { + List toiletBeanList = StringHelper.getToiletBeanList(); + if (toiletBeanList.size() == 0) { ToastHelper.showToast("获取公厕数据失败，请联系管理员", ToastHelper.ERROR); return; } - List dataBeans = new Gson().fromJson(toiletValue, new TypeToken>() { - }.getType()); QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("请选择您要打卡的公厕"); - for (ToiletListBean.DataBean it : dataBeans) { + for (ToiletListBean.DataBean it : toiletBeanList) { sheetBuilder.addItem(it.getName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -233,7 +228,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - toiletIdView.setText(dataBeans.get(position).getId()); + toiletIdView.setText(toiletBeanList.get(position).getId()); //TODO 是否需要将地图移到相应的公厕，待定 } }).build().show(); @@ -308,7 +303,7 @@ ToastHelper.showToast("保洁开始时间不能为空", ToastHelper.WARING); return; } - cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserId(), + cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, endTimeView.getText().toString(), imagePath, StringHelper.filterString(workContentView.getText().toString())); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 3a8ebc6..9f316a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -7,6 +7,7 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.utils.StringHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; @@ -47,9 +48,10 @@ @Override public void initData() { - userNameView.setText(StringHelper.getUserName()); - userPhoneView.setText(StringHelper.getUserPhone()); - userDeptView.setText(StringHelper.getUserDept()); + UserBean.DataBean userBean = StringHelper.getUserBean(); + userNameView.setText(userBean.getName()); + userPhoneView.setText(userBean.getPhone()); + userDeptView.setText(userBean.getDeptName()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index d9656aa..16bd2e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -39,6 +39,7 @@ import com.casic.dcms.ui.UrgentCaseActivity; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import butterknife.BindView; @@ -74,36 +75,38 @@ @Override protected void initData() { - userDataPresenter = new UserDataPresenterImpl(this); homePagePresenter = new HomePagePresenterImpl(this); + userDataPresenter = new UserDataPresenterImpl(this); + + //用户信息 + userDataPresenter.onReadyRetrofitRequest(); + //首页相关功能项 + homePagePresenter.onReadyRetrofitRequest("05"); } @Override protected void initEvent() { - userDataPresenter.onReadyRetrofitRequest(); - homePagePresenter.onReadyRetrofitRequest("05"); + //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 +// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); + Glide.with(this).load(R.mipmap.app_logo).into(userIconView); } @SuppressLint("SetTextI18n") @Override public void obtainUserData(UserBean userBean) { if (userBean.isSuccess()) { - //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 -// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); - Glide.with(this).load(R.mipmap.app_logo).into(userIconView); + UserBean.DataBean dataBean = userBean.getData(); + StringHelper.saveUserBean(new Gson().toJson(dataBean)); - UserBean.DataBean data = userBean.getData(); - userNameView.setText(data.getName()); - userDeptView.setText(data.getDeptName() + data.getRoleNames()); - - StringHelper.saveUserName(data.getName()); - StringHelper.saveUserPhone(data.getPhone()); - StringHelper.saveUserDept(data.getDeptName()); - StringHelper.saveUserDeptId(data.getDeptId()); - StringHelper.saveUserId(data.getId()); + userNameView.setText(dataBean.getName()); + userDeptView.setText(dataBean.getDeptName() + dataBean.getRoleNames()); } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); + } @Override public void obtainHomePageResult(HomePageBean resultBean) { @@ -183,11 +186,6 @@ } @Override - public void obtainDataFail() { - ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); - } - - @Override public void onDestroyView() { super.onDestroyView(); if (userDataPresenter != null) { @@ -197,4 +195,4 @@ homePagePresenter.disposeRetrofitRequest(); } } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 1657341..13aa09b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -76,7 +76,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserDeptId()); + phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 9e3437c..859d2ac 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -37,8 +37,9 @@ Color.rgb(120, 104, 230)}; public static final String IP_KEY = "ip"; - public static final String BRIDGE_LIST = "projectBridges"; - public static final String TOILET_LIST = "toilets"; + static final String USER_BEAN = "userBean"; + static final String BRIDGE_LIST = "projectBridges"; + static final String TOILET_LIST = "toilets"; public static final long HALF_YEAR = 180 * 60 * 60 * 24 * 1000L; public static final long ONE_YEAR = 365 * 60 * 60 * 24 * 1000L; diff --git a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java b/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java deleted file mode 100644 index 0286bb6..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.dcms.utils; - -import android.graphics.Rect; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -public class ItemDecorationSpace extends RecyclerView.ItemDecoration { - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (parent.getChildAdapterPosition(view) % 2 == 0) { - outRect.left = 0; - outRect.right = 5; - } else if (parent.getChildAdapterPosition(view) % 2 == 1) { - outRect.left = 5; - outRect.right = 0; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 4dd4dbd..cac58c5 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,7 +4,14 @@ import android.util.Log; import com.casic.dcms.R; +import com.casic.dcms.bean.HomePageBean; +import com.casic.dcms.bean.ProjectConfigBean; +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -21,44 +28,45 @@ return (String) SaveKeyValues.getValue("userAccount", ""); } - public static void saveUserId(String userId) { - SaveKeyValues.putValue("userId", userId); + public static void saveUserBean(String userBeanJson) { + SaveKeyValues.putValue(Constant.USER_BEAN, userBeanJson); } - public static String getUserId() { - return (String) SaveKeyValues.getValue("userId", ""); + public static UserBean.DataBean getUserBean() { + String userBeanJson = (String) SaveKeyValues.getValue(Constant.USER_BEAN, ""); + UserBean.DataBean dataBean = new UserBean.DataBean(); + if (userBeanJson.equals("")) { + return dataBean; + } + return new Gson().fromJson(userBeanJson, UserBean.DataBean.class); } - public static void saveUserName(String name) { - SaveKeyValues.putValue("userName", name); + public static void saveBridgeList(String bridgesJson) { + SaveKeyValues.putValue(Constant.BRIDGE_LIST, bridgesJson); } - public static String getUserName() { - return (String) SaveKeyValues.getValue("userName", ""); + public static List getBridgeBeanList() { + String bridgesJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); + List bridges = new ArrayList<>(); + if (bridgesJson.equals("")) { + return bridges; + } + return new Gson().fromJson(bridgesJson, new TypeToken>() { + }.getType()); } - public static void saveUserPhone(String phone) { - SaveKeyValues.putValue("userPhone", phone); + public static void saveToiletList(String toiletsJson) { + SaveKeyValues.putValue(Constant.TOILET_LIST, toiletsJson); } - public static String getUserPhone() { - return (String) SaveKeyValues.getValue("userPhone", ""); - } - - public static void saveUserDept(String dept) { - SaveKeyValues.putValue("userDept", dept); - } - - public static String getUserDept() { - return (String) SaveKeyValues.getValue("userDept", ""); - } - - public static void saveUserDeptId(String deptid) { - SaveKeyValues.putValue("userDeptId", deptid); - } - - public static String getUserDeptId() { - return (String) SaveKeyValues.getValue("userDeptId", ""); + public static List getToiletBeanList() { + String toiletsJson = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); + List toilets = new ArrayList<>(); + if (toiletsJson.equals("")) { + return toilets; + } + return new Gson().fromJson(toiletsJson, new TypeToken>() { + }.getType()); } public static boolean isLetterAndDigit(String str) { diff --git a/app/src/main/res/drawable/ic_package_holder.xml b/app/src/main/res/drawable/ic_package_holder.xml deleted file mode 100644 index 1f5ad5e..0000000 --- a/app/src/main/res/drawable/ic_package_holder.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 1d21c58..b376886 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -50,10 +50,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -95,10 +94,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -142,10 +140,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - @@ -38,10 +37,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -53,10 +51,9 @@ style="@style/noPointTextViewStyle" android:text="核查图片" /> - diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index e754c14..7d7a7c2 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -136,10 +136,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -151,10 +150,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -166,10 +164,9 @@ style="@style/noPointTextViewStyle" android:text="核查图片" /> - diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 91bf9f9..e3a2c99 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -11,7 +11,9 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -20,13 +22,11 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -104,8 +103,8 @@ JzvdStd videoPlayerView; @BindView(R.id.addImageView) ImageView addImageView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -125,7 +124,7 @@ private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; private UploadVideoPresenterImpl uploadVideoPresenter; private String audioUrl, videoUrl; @@ -164,10 +163,8 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @SuppressLint("ClickableViewAccessibility") @@ -534,7 +531,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); imageList.add(url); @@ -542,21 +539,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -618,7 +615,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index aa02a1c..b7b71f5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -62,8 +61,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -73,7 +72,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -97,10 +96,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -217,7 +214,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -273,7 +270,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -281,21 +278,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 964490e..f4f3501 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -29,7 +29,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -71,8 +70,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -90,7 +89,7 @@ private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; @Override @@ -115,10 +114,8 @@ .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -331,28 +328,28 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -401,7 +398,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b8f97ec..496edba 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -57,8 +56,8 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -121,19 +120,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index c3b3b66..5f6a3e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -39,7 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -87,16 +86,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseOpinionView) TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; - @BindView(R.id.caseVerifyRecyclerView) - RecyclerView caseVerifyRecyclerView; + @BindView(R.id.verifyGridView) + GridView verifyGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -139,7 +138,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private ImageRecycleViewAdapter verifyImageAdapter; + private ImageGridViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -168,10 +167,8 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); - verifyImageAdapter = new ImageRecycleViewAdapter(this); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(verifyImageAdapter); + verifyImageAdapter = new ImageGridViewAdapter(this); + verifyGridView.setAdapter(verifyImageAdapter); } @Override @@ -226,19 +223,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -386,7 +381,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -402,7 +397,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -533,7 +528,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = verifyImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -541,22 +536,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); //九宫格点击事件 - verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + verifyGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - verifyImageAdapter.setDeleteView(true); - verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + verifyImageAdapter.isDeleteVisible(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 3cedbfe..8b08041 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -57,8 +56,8 @@ EditText shopKeeperView; @BindView(R.id.phoneNumberView) EditText phoneNumberView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -67,7 +66,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopChangePresenterImpl shopChangePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; private ArrayList realPaths = new ArrayList<>();//真实图片路径 @@ -91,10 +90,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -153,7 +150,7 @@ ToastHelper.showToast("店主名还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -235,7 +232,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -243,21 +240,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 381b704..d371d17 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -80,7 +80,7 @@ @Override public void initEvent() { - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", "", "", pageIndex); + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); calendarView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -98,7 +98,7 @@ endGroup = endGroupPosition;//结束月份位置 endChild = endChildPosition;//结束对应月份中日的位置 dateView.setText(startDate + "~" + endDate); - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", startDate, endDate, pageIndex); } }).builder(); @@ -110,7 +110,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); @@ -119,7 +119,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0d7053a..3662274 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -3,17 +3,17 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -27,7 +27,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAdjustFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -66,14 +65,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.optionEditView) @@ -207,19 +206,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -250,19 +247,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index bd491c3..19b9039 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAuthorizeFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -70,14 +69,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -264,19 +263,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -307,19 +304,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java index f22a99d..797b130 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -32,7 +32,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -71,14 +70,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -157,19 +156,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -200,19 +197,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 1c1fcd0..e40d2cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -22,9 +22,11 @@ import com.casic.dcms.base.BaseApplication; import com.casic.dcms.base.DoubleClickExitActivity; import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.HomePageBean; import com.casic.dcms.bean.NoticeBean; import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.greendao.NoticeBeanDao; import com.casic.dcms.mvp.presenter.PushRegisterPresenterImpl; import com.casic.dcms.mvp.presenter.ToiletListPresenterImpl; @@ -44,6 +46,8 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StatusBarColorUtil; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.callback.IHttpRequestListener; import com.casic.dcms.widgets.NoScrollViewPager; import com.google.android.material.bottomnavigation.BottomNavigationView; @@ -59,7 +63,8 @@ import butterknife.BindView; import okhttp3.ResponseBody; -public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, IPushRegisterView, IToiletListView { +public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, + IPushRegisterView, IToiletListView { private static final String TAG = "MainActivity"; @BindView(R.id.pageTitleView) @@ -100,18 +105,17 @@ uploadPositionPresenter = new UploadPositionPresenterImpl(this); registerPresenter = new PushRegisterPresenterImpl(this); toiletListPresenter = new ToiletListPresenterImpl(this); - gson = new Gson(); + //获取配置项 + obtainProjectConfig(); + //配置页面 pageList = new ArrayList<>(); pageList.add(new HomePageFragment()); pageList.add(new PhonePageFragment()); pageList.add(new NoticePageFragment()); pageList.add(new MinePageFragment()); + imei = OtherUtils.obtainSimCardSerialNumber(this); - - //获取配置项 - obtainProjectConfig(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UploadLocationService.class)); } else { @@ -128,7 +132,7 @@ try { String resultStr = resultBean.string(); List bridges = gson.fromJson(resultStr, ProjectConfigBean.class).getBridges(); - SaveKeyValues.putValue(Constant.BRIDGE_LIST, gson.toJson(bridges)); + StringHelper.saveBridgeList(gson.toJson(bridges)); } catch (IOException e) { e.printStackTrace(); } @@ -310,7 +314,7 @@ @Override public void obtainToiletListData(ToiletListBean resultBean) { if (resultBean.isSuccess()) { - SaveKeyValues.putValue(Constant.TOILET_LIST, gson.toJson(resultBean.getData())); + StringHelper.saveToiletList(gson.toJson(resultBean.getData())); } } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 441625b..fe48830 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -3,18 +3,16 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -44,16 +42,16 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.punishTypeView) TextView punishTypeView; @BindView(R.id.punishOpinionView) TextView punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.punishDateView) TextView punishDateView; @@ -106,19 +104,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -131,19 +127,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处罚记录 @@ -158,19 +152,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + punishGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } punishDateView.setText(data.getPunishTime()); } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index 1dec74b..6711568 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -5,7 +5,9 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; @@ -13,11 +15,9 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; @@ -78,8 +77,8 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.line1) @@ -90,8 +89,8 @@ View line2; @BindView(R.id.reasonLayout) RelativeLayout reasonLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.addHandleImageView) ImageView addHandleImageView; @BindView(R.id.caseReasonView) @@ -102,8 +101,8 @@ TextView punishTypeView; @BindView(R.id.punishOpinionView) EditText punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.addPunishImageView) ImageView addPunishImageView; @BindView(R.id.punishDateView) @@ -120,7 +119,8 @@ private ArrayList punishRealPaths = new ArrayList<>();//真实图片路径 private List handleImageList = new ArrayList<>();//上传到服务器的数据集 private List punishImageList = new ArrayList<>();//上传到服务器的数据集 - private ImageRecycleViewAdapter punishImageAdapter, handleImageAdapter; + private ImageGridViewAdapter handleImageAdapter; + private ImageGridViewAdapter punishImageAdapter; private CaseNextNodePresenterImpl caseNextNodePresenter; private String changeState; private String approvalResult; @@ -155,17 +155,13 @@ .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); //处罚adapter - punishImageAdapter = new ImageRecycleViewAdapter(this); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(punishImageAdapter); + punishImageAdapter = new ImageGridViewAdapter(this); + punishGridView.setAdapter(punishImageAdapter); //下级结点 caseNextNodePresenter = new CaseNextNodePresenterImpl(this); - //案卷处理adapter - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); caseHandlePresenter = new CaseHandlePresenterImpl(this); packageHandlePresenter = new PackageHandlePresenterImpl(this); @@ -206,19 +202,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -231,19 +225,16 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + handleImageAdapter.setImageList(urls); + handleGridView.setAdapter(handleImageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + handleImageAdapter.isDeleteVisible(true); } } } @@ -382,7 +373,7 @@ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg if (isAddHandleImage) { //处理图片 - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); handleImageList.add(url); @@ -390,22 +381,22 @@ if (handleRealPaths.size() == 2) { addHandleImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, handleRealPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { handleImageList.remove(position); handleRealPaths.remove(position); - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); if (handleRealPaths.size() != 2) { addHandleImageView.setVisibility(View.VISIBLE); } @@ -416,7 +407,7 @@ } } else { //处罚图片 - int sumItemCount = punishImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = punishImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); punishImageList.add(url); @@ -424,21 +415,21 @@ if (punishRealPaths.size() == 2) { addPunishImageView.setVisibility(View.GONE); } - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); //九宫格点击事件 - punishImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, punishRealPaths); } }); //删除按钮点击事件 - punishImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + punishImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { punishImageList.remove(position); punishRealPaths.remove(position); - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); if (punishRealPaths.size() != 2) { addPunishImageView.setVisibility(View.VISIBLE); } @@ -506,7 +497,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index 7e3d47e..7c58e30 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -31,7 +31,6 @@ import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; @@ -50,8 +49,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; @@ -216,16 +213,14 @@ mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.obtainToiletIdLayout: - String toiletValue = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); - if (toiletValue.equals("")) { + List toiletBeanList = StringHelper.getToiletBeanList(); + if (toiletBeanList.size() == 0) { ToastHelper.showToast("获取公厕数据失败，请联系管理员", ToastHelper.ERROR); return; } - List dataBeans = new Gson().fromJson(toiletValue, new TypeToken>() { - }.getType()); QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("请选择您要打卡的公厕"); - for (ToiletListBean.DataBean it : dataBeans) { + for (ToiletListBean.DataBean it : toiletBeanList) { sheetBuilder.addItem(it.getName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -233,7 +228,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - toiletIdView.setText(dataBeans.get(position).getId()); + toiletIdView.setText(toiletBeanList.get(position).getId()); //TODO 是否需要将地图移到相应的公厕，待定 } }).build().show(); @@ -308,7 +303,7 @@ ToastHelper.showToast("保洁开始时间不能为空", ToastHelper.WARING); return; } - cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserId(), + cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, endTimeView.getText().toString(), imagePath, StringHelper.filterString(workContentView.getText().toString())); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 3a8ebc6..9f316a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -7,6 +7,7 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.utils.StringHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; @@ -47,9 +48,10 @@ @Override public void initData() { - userNameView.setText(StringHelper.getUserName()); - userPhoneView.setText(StringHelper.getUserPhone()); - userDeptView.setText(StringHelper.getUserDept()); + UserBean.DataBean userBean = StringHelper.getUserBean(); + userNameView.setText(userBean.getName()); + userPhoneView.setText(userBean.getPhone()); + userDeptView.setText(userBean.getDeptName()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index d9656aa..16bd2e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -39,6 +39,7 @@ import com.casic.dcms.ui.UrgentCaseActivity; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import butterknife.BindView; @@ -74,36 +75,38 @@ @Override protected void initData() { - userDataPresenter = new UserDataPresenterImpl(this); homePagePresenter = new HomePagePresenterImpl(this); + userDataPresenter = new UserDataPresenterImpl(this); + + //用户信息 + userDataPresenter.onReadyRetrofitRequest(); + //首页相关功能项 + homePagePresenter.onReadyRetrofitRequest("05"); } @Override protected void initEvent() { - userDataPresenter.onReadyRetrofitRequest(); - homePagePresenter.onReadyRetrofitRequest("05"); + //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 +// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); + Glide.with(this).load(R.mipmap.app_logo).into(userIconView); } @SuppressLint("SetTextI18n") @Override public void obtainUserData(UserBean userBean) { if (userBean.isSuccess()) { - //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 -// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); - Glide.with(this).load(R.mipmap.app_logo).into(userIconView); + UserBean.DataBean dataBean = userBean.getData(); + StringHelper.saveUserBean(new Gson().toJson(dataBean)); - UserBean.DataBean data = userBean.getData(); - userNameView.setText(data.getName()); - userDeptView.setText(data.getDeptName() + data.getRoleNames()); - - StringHelper.saveUserName(data.getName()); - StringHelper.saveUserPhone(data.getPhone()); - StringHelper.saveUserDept(data.getDeptName()); - StringHelper.saveUserDeptId(data.getDeptId()); - StringHelper.saveUserId(data.getId()); + userNameView.setText(dataBean.getName()); + userDeptView.setText(dataBean.getDeptName() + dataBean.getRoleNames()); } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); + } @Override public void obtainHomePageResult(HomePageBean resultBean) { @@ -183,11 +186,6 @@ } @Override - public void obtainDataFail() { - ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); - } - - @Override public void onDestroyView() { super.onDestroyView(); if (userDataPresenter != null) { @@ -197,4 +195,4 @@ homePagePresenter.disposeRetrofitRequest(); } } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 1657341..13aa09b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -76,7 +76,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserDeptId()); + phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 9e3437c..859d2ac 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -37,8 +37,9 @@ Color.rgb(120, 104, 230)}; public static final String IP_KEY = "ip"; - public static final String BRIDGE_LIST = "projectBridges"; - public static final String TOILET_LIST = "toilets"; + static final String USER_BEAN = "userBean"; + static final String BRIDGE_LIST = "projectBridges"; + static final String TOILET_LIST = "toilets"; public static final long HALF_YEAR = 180 * 60 * 60 * 24 * 1000L; public static final long ONE_YEAR = 365 * 60 * 60 * 24 * 1000L; diff --git a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java b/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java deleted file mode 100644 index 0286bb6..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.dcms.utils; - -import android.graphics.Rect; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -public class ItemDecorationSpace extends RecyclerView.ItemDecoration { - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (parent.getChildAdapterPosition(view) % 2 == 0) { - outRect.left = 0; - outRect.right = 5; - } else if (parent.getChildAdapterPosition(view) % 2 == 1) { - outRect.left = 5; - outRect.right = 0; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 4dd4dbd..cac58c5 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,7 +4,14 @@ import android.util.Log; import com.casic.dcms.R; +import com.casic.dcms.bean.HomePageBean; +import com.casic.dcms.bean.ProjectConfigBean; +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -21,44 +28,45 @@ return (String) SaveKeyValues.getValue("userAccount", ""); } - public static void saveUserId(String userId) { - SaveKeyValues.putValue("userId", userId); + public static void saveUserBean(String userBeanJson) { + SaveKeyValues.putValue(Constant.USER_BEAN, userBeanJson); } - public static String getUserId() { - return (String) SaveKeyValues.getValue("userId", ""); + public static UserBean.DataBean getUserBean() { + String userBeanJson = (String) SaveKeyValues.getValue(Constant.USER_BEAN, ""); + UserBean.DataBean dataBean = new UserBean.DataBean(); + if (userBeanJson.equals("")) { + return dataBean; + } + return new Gson().fromJson(userBeanJson, UserBean.DataBean.class); } - public static void saveUserName(String name) { - SaveKeyValues.putValue("userName", name); + public static void saveBridgeList(String bridgesJson) { + SaveKeyValues.putValue(Constant.BRIDGE_LIST, bridgesJson); } - public static String getUserName() { - return (String) SaveKeyValues.getValue("userName", ""); + public static List getBridgeBeanList() { + String bridgesJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); + List bridges = new ArrayList<>(); + if (bridgesJson.equals("")) { + return bridges; + } + return new Gson().fromJson(bridgesJson, new TypeToken>() { + }.getType()); } - public static void saveUserPhone(String phone) { - SaveKeyValues.putValue("userPhone", phone); + public static void saveToiletList(String toiletsJson) { + SaveKeyValues.putValue(Constant.TOILET_LIST, toiletsJson); } - public static String getUserPhone() { - return (String) SaveKeyValues.getValue("userPhone", ""); - } - - public static void saveUserDept(String dept) { - SaveKeyValues.putValue("userDept", dept); - } - - public static String getUserDept() { - return (String) SaveKeyValues.getValue("userDept", ""); - } - - public static void saveUserDeptId(String deptid) { - SaveKeyValues.putValue("userDeptId", deptid); - } - - public static String getUserDeptId() { - return (String) SaveKeyValues.getValue("userDeptId", ""); + public static List getToiletBeanList() { + String toiletsJson = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); + List toilets = new ArrayList<>(); + if (toiletsJson.equals("")) { + return toilets; + } + return new Gson().fromJson(toiletsJson, new TypeToken>() { + }.getType()); } public static boolean isLetterAndDigit(String str) { diff --git a/app/src/main/res/drawable/ic_package_holder.xml b/app/src/main/res/drawable/ic_package_holder.xml deleted file mode 100644 index 1f5ad5e..0000000 --- a/app/src/main/res/drawable/ic_package_holder.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 1d21c58..b376886 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -50,10 +50,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -95,10 +94,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -142,10 +140,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - @@ -38,10 +37,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -53,10 +51,9 @@ style="@style/noPointTextViewStyle" android:text="核查图片" /> - diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index e754c14..7d7a7c2 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -136,10 +136,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -151,10 +150,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -166,10 +164,9 @@ style="@style/noPointTextViewStyle" android:text="核查图片" /> - diff --git a/app/src/main/res/layout/activity_case_handle_detail.xml b/app/src/main/res/layout/activity_case_handle_detail.xml index 4cc674c..19a1a4a 100644 --- a/app/src/main/res/layout/activity_case_handle_detail.xml +++ b/app/src/main/res/layout/activity_case_handle_detail.xml @@ -22,16 +22,13 @@ - + @@ -132,10 +129,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 91bf9f9..e3a2c99 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -11,7 +11,9 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -20,13 +22,11 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -104,8 +103,8 @@ JzvdStd videoPlayerView; @BindView(R.id.addImageView) ImageView addImageView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -125,7 +124,7 @@ private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; private UploadVideoPresenterImpl uploadVideoPresenter; private String audioUrl, videoUrl; @@ -164,10 +163,8 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @SuppressLint("ClickableViewAccessibility") @@ -534,7 +531,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); imageList.add(url); @@ -542,21 +539,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -618,7 +615,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index aa02a1c..b7b71f5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -62,8 +61,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -73,7 +72,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -97,10 +96,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -217,7 +214,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -273,7 +270,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -281,21 +278,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 964490e..f4f3501 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -29,7 +29,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -71,8 +70,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -90,7 +89,7 @@ private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; @Override @@ -115,10 +114,8 @@ .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -331,28 +328,28 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -401,7 +398,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b8f97ec..496edba 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -57,8 +56,8 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -121,19 +120,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index c3b3b66..5f6a3e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -39,7 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -87,16 +86,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseOpinionView) TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; - @BindView(R.id.caseVerifyRecyclerView) - RecyclerView caseVerifyRecyclerView; + @BindView(R.id.verifyGridView) + GridView verifyGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -139,7 +138,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private ImageRecycleViewAdapter verifyImageAdapter; + private ImageGridViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -168,10 +167,8 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); - verifyImageAdapter = new ImageRecycleViewAdapter(this); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(verifyImageAdapter); + verifyImageAdapter = new ImageGridViewAdapter(this); + verifyGridView.setAdapter(verifyImageAdapter); } @Override @@ -226,19 +223,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -386,7 +381,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -402,7 +397,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -533,7 +528,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = verifyImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -541,22 +536,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); //九宫格点击事件 - verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + verifyGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - verifyImageAdapter.setDeleteView(true); - verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + verifyImageAdapter.isDeleteVisible(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 3cedbfe..8b08041 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -57,8 +56,8 @@ EditText shopKeeperView; @BindView(R.id.phoneNumberView) EditText phoneNumberView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -67,7 +66,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopChangePresenterImpl shopChangePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; private ArrayList realPaths = new ArrayList<>();//真实图片路径 @@ -91,10 +90,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -153,7 +150,7 @@ ToastHelper.showToast("店主名还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -235,7 +232,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -243,21 +240,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 381b704..d371d17 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -80,7 +80,7 @@ @Override public void initEvent() { - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", "", "", pageIndex); + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); calendarView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -98,7 +98,7 @@ endGroup = endGroupPosition;//结束月份位置 endChild = endChildPosition;//结束对应月份中日的位置 dateView.setText(startDate + "~" + endDate); - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", startDate, endDate, pageIndex); } }).builder(); @@ -110,7 +110,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); @@ -119,7 +119,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0d7053a..3662274 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -3,17 +3,17 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -27,7 +27,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAdjustFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -66,14 +65,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.optionEditView) @@ -207,19 +206,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -250,19 +247,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index bd491c3..19b9039 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAuthorizeFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -70,14 +69,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -264,19 +263,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -307,19 +304,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java index f22a99d..797b130 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -32,7 +32,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -71,14 +70,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -157,19 +156,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -200,19 +197,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 1c1fcd0..e40d2cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -22,9 +22,11 @@ import com.casic.dcms.base.BaseApplication; import com.casic.dcms.base.DoubleClickExitActivity; import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.HomePageBean; import com.casic.dcms.bean.NoticeBean; import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.greendao.NoticeBeanDao; import com.casic.dcms.mvp.presenter.PushRegisterPresenterImpl; import com.casic.dcms.mvp.presenter.ToiletListPresenterImpl; @@ -44,6 +46,8 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StatusBarColorUtil; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.callback.IHttpRequestListener; import com.casic.dcms.widgets.NoScrollViewPager; import com.google.android.material.bottomnavigation.BottomNavigationView; @@ -59,7 +63,8 @@ import butterknife.BindView; import okhttp3.ResponseBody; -public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, IPushRegisterView, IToiletListView { +public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, + IPushRegisterView, IToiletListView { private static final String TAG = "MainActivity"; @BindView(R.id.pageTitleView) @@ -100,18 +105,17 @@ uploadPositionPresenter = new UploadPositionPresenterImpl(this); registerPresenter = new PushRegisterPresenterImpl(this); toiletListPresenter = new ToiletListPresenterImpl(this); - gson = new Gson(); + //获取配置项 + obtainProjectConfig(); + //配置页面 pageList = new ArrayList<>(); pageList.add(new HomePageFragment()); pageList.add(new PhonePageFragment()); pageList.add(new NoticePageFragment()); pageList.add(new MinePageFragment()); + imei = OtherUtils.obtainSimCardSerialNumber(this); - - //获取配置项 - obtainProjectConfig(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UploadLocationService.class)); } else { @@ -128,7 +132,7 @@ try { String resultStr = resultBean.string(); List bridges = gson.fromJson(resultStr, ProjectConfigBean.class).getBridges(); - SaveKeyValues.putValue(Constant.BRIDGE_LIST, gson.toJson(bridges)); + StringHelper.saveBridgeList(gson.toJson(bridges)); } catch (IOException e) { e.printStackTrace(); } @@ -310,7 +314,7 @@ @Override public void obtainToiletListData(ToiletListBean resultBean) { if (resultBean.isSuccess()) { - SaveKeyValues.putValue(Constant.TOILET_LIST, gson.toJson(resultBean.getData())); + StringHelper.saveToiletList(gson.toJson(resultBean.getData())); } } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 441625b..fe48830 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -3,18 +3,16 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -44,16 +42,16 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.punishTypeView) TextView punishTypeView; @BindView(R.id.punishOpinionView) TextView punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.punishDateView) TextView punishDateView; @@ -106,19 +104,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -131,19 +127,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处罚记录 @@ -158,19 +152,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + punishGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } punishDateView.setText(data.getPunishTime()); } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index 1dec74b..6711568 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -5,7 +5,9 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; @@ -13,11 +15,9 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; @@ -78,8 +77,8 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.line1) @@ -90,8 +89,8 @@ View line2; @BindView(R.id.reasonLayout) RelativeLayout reasonLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.addHandleImageView) ImageView addHandleImageView; @BindView(R.id.caseReasonView) @@ -102,8 +101,8 @@ TextView punishTypeView; @BindView(R.id.punishOpinionView) EditText punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.addPunishImageView) ImageView addPunishImageView; @BindView(R.id.punishDateView) @@ -120,7 +119,8 @@ private ArrayList punishRealPaths = new ArrayList<>();//真实图片路径 private List handleImageList = new ArrayList<>();//上传到服务器的数据集 private List punishImageList = new ArrayList<>();//上传到服务器的数据集 - private ImageRecycleViewAdapter punishImageAdapter, handleImageAdapter; + private ImageGridViewAdapter handleImageAdapter; + private ImageGridViewAdapter punishImageAdapter; private CaseNextNodePresenterImpl caseNextNodePresenter; private String changeState; private String approvalResult; @@ -155,17 +155,13 @@ .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); //处罚adapter - punishImageAdapter = new ImageRecycleViewAdapter(this); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(punishImageAdapter); + punishImageAdapter = new ImageGridViewAdapter(this); + punishGridView.setAdapter(punishImageAdapter); //下级结点 caseNextNodePresenter = new CaseNextNodePresenterImpl(this); - //案卷处理adapter - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); caseHandlePresenter = new CaseHandlePresenterImpl(this); packageHandlePresenter = new PackageHandlePresenterImpl(this); @@ -206,19 +202,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -231,19 +225,16 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + handleImageAdapter.setImageList(urls); + handleGridView.setAdapter(handleImageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + handleImageAdapter.isDeleteVisible(true); } } } @@ -382,7 +373,7 @@ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg if (isAddHandleImage) { //处理图片 - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); handleImageList.add(url); @@ -390,22 +381,22 @@ if (handleRealPaths.size() == 2) { addHandleImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, handleRealPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { handleImageList.remove(position); handleRealPaths.remove(position); - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); if (handleRealPaths.size() != 2) { addHandleImageView.setVisibility(View.VISIBLE); } @@ -416,7 +407,7 @@ } } else { //处罚图片 - int sumItemCount = punishImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = punishImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); punishImageList.add(url); @@ -424,21 +415,21 @@ if (punishRealPaths.size() == 2) { addPunishImageView.setVisibility(View.GONE); } - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); //九宫格点击事件 - punishImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, punishRealPaths); } }); //删除按钮点击事件 - punishImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + punishImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { punishImageList.remove(position); punishRealPaths.remove(position); - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); if (punishRealPaths.size() != 2) { addPunishImageView.setVisibility(View.VISIBLE); } @@ -506,7 +497,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index 7e3d47e..7c58e30 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -31,7 +31,6 @@ import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; @@ -50,8 +49,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; @@ -216,16 +213,14 @@ mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.obtainToiletIdLayout: - String toiletValue = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); - if (toiletValue.equals("")) { + List toiletBeanList = StringHelper.getToiletBeanList(); + if (toiletBeanList.size() == 0) { ToastHelper.showToast("获取公厕数据失败，请联系管理员", ToastHelper.ERROR); return; } - List dataBeans = new Gson().fromJson(toiletValue, new TypeToken>() { - }.getType()); QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("请选择您要打卡的公厕"); - for (ToiletListBean.DataBean it : dataBeans) { + for (ToiletListBean.DataBean it : toiletBeanList) { sheetBuilder.addItem(it.getName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -233,7 +228,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - toiletIdView.setText(dataBeans.get(position).getId()); + toiletIdView.setText(toiletBeanList.get(position).getId()); //TODO 是否需要将地图移到相应的公厕，待定 } }).build().show(); @@ -308,7 +303,7 @@ ToastHelper.showToast("保洁开始时间不能为空", ToastHelper.WARING); return; } - cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserId(), + cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, endTimeView.getText().toString(), imagePath, StringHelper.filterString(workContentView.getText().toString())); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 3a8ebc6..9f316a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -7,6 +7,7 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.utils.StringHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; @@ -47,9 +48,10 @@ @Override public void initData() { - userNameView.setText(StringHelper.getUserName()); - userPhoneView.setText(StringHelper.getUserPhone()); - userDeptView.setText(StringHelper.getUserDept()); + UserBean.DataBean userBean = StringHelper.getUserBean(); + userNameView.setText(userBean.getName()); + userPhoneView.setText(userBean.getPhone()); + userDeptView.setText(userBean.getDeptName()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index d9656aa..16bd2e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -39,6 +39,7 @@ import com.casic.dcms.ui.UrgentCaseActivity; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import butterknife.BindView; @@ -74,36 +75,38 @@ @Override protected void initData() { - userDataPresenter = new UserDataPresenterImpl(this); homePagePresenter = new HomePagePresenterImpl(this); + userDataPresenter = new UserDataPresenterImpl(this); + + //用户信息 + userDataPresenter.onReadyRetrofitRequest(); + //首页相关功能项 + homePagePresenter.onReadyRetrofitRequest("05"); } @Override protected void initEvent() { - userDataPresenter.onReadyRetrofitRequest(); - homePagePresenter.onReadyRetrofitRequest("05"); + //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 +// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); + Glide.with(this).load(R.mipmap.app_logo).into(userIconView); } @SuppressLint("SetTextI18n") @Override public void obtainUserData(UserBean userBean) { if (userBean.isSuccess()) { - //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 -// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); - Glide.with(this).load(R.mipmap.app_logo).into(userIconView); + UserBean.DataBean dataBean = userBean.getData(); + StringHelper.saveUserBean(new Gson().toJson(dataBean)); - UserBean.DataBean data = userBean.getData(); - userNameView.setText(data.getName()); - userDeptView.setText(data.getDeptName() + data.getRoleNames()); - - StringHelper.saveUserName(data.getName()); - StringHelper.saveUserPhone(data.getPhone()); - StringHelper.saveUserDept(data.getDeptName()); - StringHelper.saveUserDeptId(data.getDeptId()); - StringHelper.saveUserId(data.getId()); + userNameView.setText(dataBean.getName()); + userDeptView.setText(dataBean.getDeptName() + dataBean.getRoleNames()); } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); + } @Override public void obtainHomePageResult(HomePageBean resultBean) { @@ -183,11 +186,6 @@ } @Override - public void obtainDataFail() { - ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); - } - - @Override public void onDestroyView() { super.onDestroyView(); if (userDataPresenter != null) { @@ -197,4 +195,4 @@ homePagePresenter.disposeRetrofitRequest(); } } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 1657341..13aa09b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -76,7 +76,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserDeptId()); + phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 9e3437c..859d2ac 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -37,8 +37,9 @@ Color.rgb(120, 104, 230)}; public static final String IP_KEY = "ip"; - public static final String BRIDGE_LIST = "projectBridges"; - public static final String TOILET_LIST = "toilets"; + static final String USER_BEAN = "userBean"; + static final String BRIDGE_LIST = "projectBridges"; + static final String TOILET_LIST = "toilets"; public static final long HALF_YEAR = 180 * 60 * 60 * 24 * 1000L; public static final long ONE_YEAR = 365 * 60 * 60 * 24 * 1000L; diff --git a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java b/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java deleted file mode 100644 index 0286bb6..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.dcms.utils; - -import android.graphics.Rect; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -public class ItemDecorationSpace extends RecyclerView.ItemDecoration { - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (parent.getChildAdapterPosition(view) % 2 == 0) { - outRect.left = 0; - outRect.right = 5; - } else if (parent.getChildAdapterPosition(view) % 2 == 1) { - outRect.left = 5; - outRect.right = 0; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 4dd4dbd..cac58c5 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,7 +4,14 @@ import android.util.Log; import com.casic.dcms.R; +import com.casic.dcms.bean.HomePageBean; +import com.casic.dcms.bean.ProjectConfigBean; +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -21,44 +28,45 @@ return (String) SaveKeyValues.getValue("userAccount", ""); } - public static void saveUserId(String userId) { - SaveKeyValues.putValue("userId", userId); + public static void saveUserBean(String userBeanJson) { + SaveKeyValues.putValue(Constant.USER_BEAN, userBeanJson); } - public static String getUserId() { - return (String) SaveKeyValues.getValue("userId", ""); + public static UserBean.DataBean getUserBean() { + String userBeanJson = (String) SaveKeyValues.getValue(Constant.USER_BEAN, ""); + UserBean.DataBean dataBean = new UserBean.DataBean(); + if (userBeanJson.equals("")) { + return dataBean; + } + return new Gson().fromJson(userBeanJson, UserBean.DataBean.class); } - public static void saveUserName(String name) { - SaveKeyValues.putValue("userName", name); + public static void saveBridgeList(String bridgesJson) { + SaveKeyValues.putValue(Constant.BRIDGE_LIST, bridgesJson); } - public static String getUserName() { - return (String) SaveKeyValues.getValue("userName", ""); + public static List getBridgeBeanList() { + String bridgesJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); + List bridges = new ArrayList<>(); + if (bridgesJson.equals("")) { + return bridges; + } + return new Gson().fromJson(bridgesJson, new TypeToken>() { + }.getType()); } - public static void saveUserPhone(String phone) { - SaveKeyValues.putValue("userPhone", phone); + public static void saveToiletList(String toiletsJson) { + SaveKeyValues.putValue(Constant.TOILET_LIST, toiletsJson); } - public static String getUserPhone() { - return (String) SaveKeyValues.getValue("userPhone", ""); - } - - public static void saveUserDept(String dept) { - SaveKeyValues.putValue("userDept", dept); - } - - public static String getUserDept() { - return (String) SaveKeyValues.getValue("userDept", ""); - } - - public static void saveUserDeptId(String deptid) { - SaveKeyValues.putValue("userDeptId", deptid); - } - - public static String getUserDeptId() { - return (String) SaveKeyValues.getValue("userDeptId", ""); + public static List getToiletBeanList() { + String toiletsJson = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); + List toilets = new ArrayList<>(); + if (toiletsJson.equals("")) { + return toilets; + } + return new Gson().fromJson(toiletsJson, new TypeToken>() { + }.getType()); } public static boolean isLetterAndDigit(String str) { diff --git a/app/src/main/res/drawable/ic_package_holder.xml b/app/src/main/res/drawable/ic_package_holder.xml deleted file mode 100644 index 1f5ad5e..0000000 --- a/app/src/main/res/drawable/ic_package_holder.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 1d21c58..b376886 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -50,10 +50,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -95,10 +94,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -142,10 +140,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - @@ -38,10 +37,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -53,10 +51,9 @@ style="@style/noPointTextViewStyle" android:text="核查图片" /> - diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index e754c14..7d7a7c2 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -136,10 +136,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -151,10 +150,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -166,10 +164,9 @@ style="@style/noPointTextViewStyle" android:text="核查图片" /> - diff --git a/app/src/main/res/layout/activity_case_handle_detail.xml b/app/src/main/res/layout/activity_case_handle_detail.xml index 4cc674c..19a1a4a 100644 --- a/app/src/main/res/layout/activity_case_handle_detail.xml +++ b/app/src/main/res/layout/activity_case_handle_detail.xml @@ -22,16 +22,13 @@ - + @@ -132,10 +129,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - @@ -150,10 +149,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 91bf9f9..e3a2c99 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -11,7 +11,9 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -20,13 +22,11 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -104,8 +103,8 @@ JzvdStd videoPlayerView; @BindView(R.id.addImageView) ImageView addImageView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -125,7 +124,7 @@ private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; private UploadVideoPresenterImpl uploadVideoPresenter; private String audioUrl, videoUrl; @@ -164,10 +163,8 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @SuppressLint("ClickableViewAccessibility") @@ -534,7 +531,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); imageList.add(url); @@ -542,21 +539,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -618,7 +615,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index aa02a1c..b7b71f5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -62,8 +61,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -73,7 +72,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -97,10 +96,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -217,7 +214,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -273,7 +270,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -281,21 +278,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 964490e..f4f3501 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -29,7 +29,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -71,8 +70,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -90,7 +89,7 @@ private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; @Override @@ -115,10 +114,8 @@ .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -331,28 +328,28 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -401,7 +398,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b8f97ec..496edba 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -57,8 +56,8 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -121,19 +120,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index c3b3b66..5f6a3e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -39,7 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -87,16 +86,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseOpinionView) TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; - @BindView(R.id.caseVerifyRecyclerView) - RecyclerView caseVerifyRecyclerView; + @BindView(R.id.verifyGridView) + GridView verifyGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -139,7 +138,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private ImageRecycleViewAdapter verifyImageAdapter; + private ImageGridViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -168,10 +167,8 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); - verifyImageAdapter = new ImageRecycleViewAdapter(this); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(verifyImageAdapter); + verifyImageAdapter = new ImageGridViewAdapter(this); + verifyGridView.setAdapter(verifyImageAdapter); } @Override @@ -226,19 +223,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -386,7 +381,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -402,7 +397,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -533,7 +528,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = verifyImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -541,22 +536,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); //九宫格点击事件 - verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + verifyGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - verifyImageAdapter.setDeleteView(true); - verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + verifyImageAdapter.isDeleteVisible(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 3cedbfe..8b08041 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -57,8 +56,8 @@ EditText shopKeeperView; @BindView(R.id.phoneNumberView) EditText phoneNumberView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -67,7 +66,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopChangePresenterImpl shopChangePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; private ArrayList realPaths = new ArrayList<>();//真实图片路径 @@ -91,10 +90,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -153,7 +150,7 @@ ToastHelper.showToast("店主名还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -235,7 +232,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -243,21 +240,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 381b704..d371d17 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -80,7 +80,7 @@ @Override public void initEvent() { - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", "", "", pageIndex); + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); calendarView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -98,7 +98,7 @@ endGroup = endGroupPosition;//结束月份位置 endChild = endChildPosition;//结束对应月份中日的位置 dateView.setText(startDate + "~" + endDate); - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", startDate, endDate, pageIndex); } }).builder(); @@ -110,7 +110,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); @@ -119,7 +119,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0d7053a..3662274 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -3,17 +3,17 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -27,7 +27,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAdjustFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -66,14 +65,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.optionEditView) @@ -207,19 +206,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -250,19 +247,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index bd491c3..19b9039 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAuthorizeFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -70,14 +69,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -264,19 +263,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -307,19 +304,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java index f22a99d..797b130 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -32,7 +32,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -71,14 +70,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -157,19 +156,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -200,19 +197,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 1c1fcd0..e40d2cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -22,9 +22,11 @@ import com.casic.dcms.base.BaseApplication; import com.casic.dcms.base.DoubleClickExitActivity; import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.HomePageBean; import com.casic.dcms.bean.NoticeBean; import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.greendao.NoticeBeanDao; import com.casic.dcms.mvp.presenter.PushRegisterPresenterImpl; import com.casic.dcms.mvp.presenter.ToiletListPresenterImpl; @@ -44,6 +46,8 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StatusBarColorUtil; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.callback.IHttpRequestListener; import com.casic.dcms.widgets.NoScrollViewPager; import com.google.android.material.bottomnavigation.BottomNavigationView; @@ -59,7 +63,8 @@ import butterknife.BindView; import okhttp3.ResponseBody; -public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, IPushRegisterView, IToiletListView { +public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, + IPushRegisterView, IToiletListView { private static final String TAG = "MainActivity"; @BindView(R.id.pageTitleView) @@ -100,18 +105,17 @@ uploadPositionPresenter = new UploadPositionPresenterImpl(this); registerPresenter = new PushRegisterPresenterImpl(this); toiletListPresenter = new ToiletListPresenterImpl(this); - gson = new Gson(); + //获取配置项 + obtainProjectConfig(); + //配置页面 pageList = new ArrayList<>(); pageList.add(new HomePageFragment()); pageList.add(new PhonePageFragment()); pageList.add(new NoticePageFragment()); pageList.add(new MinePageFragment()); + imei = OtherUtils.obtainSimCardSerialNumber(this); - - //获取配置项 - obtainProjectConfig(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UploadLocationService.class)); } else { @@ -128,7 +132,7 @@ try { String resultStr = resultBean.string(); List bridges = gson.fromJson(resultStr, ProjectConfigBean.class).getBridges(); - SaveKeyValues.putValue(Constant.BRIDGE_LIST, gson.toJson(bridges)); + StringHelper.saveBridgeList(gson.toJson(bridges)); } catch (IOException e) { e.printStackTrace(); } @@ -310,7 +314,7 @@ @Override public void obtainToiletListData(ToiletListBean resultBean) { if (resultBean.isSuccess()) { - SaveKeyValues.putValue(Constant.TOILET_LIST, gson.toJson(resultBean.getData())); + StringHelper.saveToiletList(gson.toJson(resultBean.getData())); } } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 441625b..fe48830 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -3,18 +3,16 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -44,16 +42,16 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.punishTypeView) TextView punishTypeView; @BindView(R.id.punishOpinionView) TextView punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.punishDateView) TextView punishDateView; @@ -106,19 +104,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -131,19 +127,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处罚记录 @@ -158,19 +152,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + punishGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } punishDateView.setText(data.getPunishTime()); } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index 1dec74b..6711568 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -5,7 +5,9 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; @@ -13,11 +15,9 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; @@ -78,8 +77,8 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.line1) @@ -90,8 +89,8 @@ View line2; @BindView(R.id.reasonLayout) RelativeLayout reasonLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.addHandleImageView) ImageView addHandleImageView; @BindView(R.id.caseReasonView) @@ -102,8 +101,8 @@ TextView punishTypeView; @BindView(R.id.punishOpinionView) EditText punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.addPunishImageView) ImageView addPunishImageView; @BindView(R.id.punishDateView) @@ -120,7 +119,8 @@ private ArrayList punishRealPaths = new ArrayList<>();//真实图片路径 private List handleImageList = new ArrayList<>();//上传到服务器的数据集 private List punishImageList = new ArrayList<>();//上传到服务器的数据集 - private ImageRecycleViewAdapter punishImageAdapter, handleImageAdapter; + private ImageGridViewAdapter handleImageAdapter; + private ImageGridViewAdapter punishImageAdapter; private CaseNextNodePresenterImpl caseNextNodePresenter; private String changeState; private String approvalResult; @@ -155,17 +155,13 @@ .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); //处罚adapter - punishImageAdapter = new ImageRecycleViewAdapter(this); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(punishImageAdapter); + punishImageAdapter = new ImageGridViewAdapter(this); + punishGridView.setAdapter(punishImageAdapter); //下级结点 caseNextNodePresenter = new CaseNextNodePresenterImpl(this); - //案卷处理adapter - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); caseHandlePresenter = new CaseHandlePresenterImpl(this); packageHandlePresenter = new PackageHandlePresenterImpl(this); @@ -206,19 +202,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -231,19 +225,16 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + handleImageAdapter.setImageList(urls); + handleGridView.setAdapter(handleImageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + handleImageAdapter.isDeleteVisible(true); } } } @@ -382,7 +373,7 @@ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg if (isAddHandleImage) { //处理图片 - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); handleImageList.add(url); @@ -390,22 +381,22 @@ if (handleRealPaths.size() == 2) { addHandleImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, handleRealPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { handleImageList.remove(position); handleRealPaths.remove(position); - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); if (handleRealPaths.size() != 2) { addHandleImageView.setVisibility(View.VISIBLE); } @@ -416,7 +407,7 @@ } } else { //处罚图片 - int sumItemCount = punishImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = punishImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); punishImageList.add(url); @@ -424,21 +415,21 @@ if (punishRealPaths.size() == 2) { addPunishImageView.setVisibility(View.GONE); } - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); //九宫格点击事件 - punishImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, punishRealPaths); } }); //删除按钮点击事件 - punishImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + punishImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { punishImageList.remove(position); punishRealPaths.remove(position); - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); if (punishRealPaths.size() != 2) { addPunishImageView.setVisibility(View.VISIBLE); } @@ -506,7 +497,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index 7e3d47e..7c58e30 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -31,7 +31,6 @@ import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; @@ -50,8 +49,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; @@ -216,16 +213,14 @@ mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.obtainToiletIdLayout: - String toiletValue = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); - if (toiletValue.equals("")) { + List toiletBeanList = StringHelper.getToiletBeanList(); + if (toiletBeanList.size() == 0) { ToastHelper.showToast("获取公厕数据失败，请联系管理员", ToastHelper.ERROR); return; } - List dataBeans = new Gson().fromJson(toiletValue, new TypeToken>() { - }.getType()); QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("请选择您要打卡的公厕"); - for (ToiletListBean.DataBean it : dataBeans) { + for (ToiletListBean.DataBean it : toiletBeanList) { sheetBuilder.addItem(it.getName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -233,7 +228,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - toiletIdView.setText(dataBeans.get(position).getId()); + toiletIdView.setText(toiletBeanList.get(position).getId()); //TODO 是否需要将地图移到相应的公厕，待定 } }).build().show(); @@ -308,7 +303,7 @@ ToastHelper.showToast("保洁开始时间不能为空", ToastHelper.WARING); return; } - cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserId(), + cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, endTimeView.getText().toString(), imagePath, StringHelper.filterString(workContentView.getText().toString())); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 3a8ebc6..9f316a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -7,6 +7,7 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.utils.StringHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; @@ -47,9 +48,10 @@ @Override public void initData() { - userNameView.setText(StringHelper.getUserName()); - userPhoneView.setText(StringHelper.getUserPhone()); - userDeptView.setText(StringHelper.getUserDept()); + UserBean.DataBean userBean = StringHelper.getUserBean(); + userNameView.setText(userBean.getName()); + userPhoneView.setText(userBean.getPhone()); + userDeptView.setText(userBean.getDeptName()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index d9656aa..16bd2e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -39,6 +39,7 @@ import com.casic.dcms.ui.UrgentCaseActivity; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import butterknife.BindView; @@ -74,36 +75,38 @@ @Override protected void initData() { - userDataPresenter = new UserDataPresenterImpl(this); homePagePresenter = new HomePagePresenterImpl(this); + userDataPresenter = new UserDataPresenterImpl(this); + + //用户信息 + userDataPresenter.onReadyRetrofitRequest(); + //首页相关功能项 + homePagePresenter.onReadyRetrofitRequest("05"); } @Override protected void initEvent() { - userDataPresenter.onReadyRetrofitRequest(); - homePagePresenter.onReadyRetrofitRequest("05"); + //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 +// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); + Glide.with(this).load(R.mipmap.app_logo).into(userIconView); } @SuppressLint("SetTextI18n") @Override public void obtainUserData(UserBean userBean) { if (userBean.isSuccess()) { - //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 -// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); - Glide.with(this).load(R.mipmap.app_logo).into(userIconView); + UserBean.DataBean dataBean = userBean.getData(); + StringHelper.saveUserBean(new Gson().toJson(dataBean)); - UserBean.DataBean data = userBean.getData(); - userNameView.setText(data.getName()); - userDeptView.setText(data.getDeptName() + data.getRoleNames()); - - StringHelper.saveUserName(data.getName()); - StringHelper.saveUserPhone(data.getPhone()); - StringHelper.saveUserDept(data.getDeptName()); - StringHelper.saveUserDeptId(data.getDeptId()); - StringHelper.saveUserId(data.getId()); + userNameView.setText(dataBean.getName()); + userDeptView.setText(dataBean.getDeptName() + dataBean.getRoleNames()); } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); + } @Override public void obtainHomePageResult(HomePageBean resultBean) { @@ -183,11 +186,6 @@ } @Override - public void obtainDataFail() { - ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); - } - - @Override public void onDestroyView() { super.onDestroyView(); if (userDataPresenter != null) { @@ -197,4 +195,4 @@ homePagePresenter.disposeRetrofitRequest(); } } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 1657341..13aa09b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -76,7 +76,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserDeptId()); + phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 9e3437c..859d2ac 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -37,8 +37,9 @@ Color.rgb(120, 104, 230)}; public static final String IP_KEY = "ip"; - public static final String BRIDGE_LIST = "projectBridges"; - public static final String TOILET_LIST = "toilets"; + static final String USER_BEAN = "userBean"; + static final String BRIDGE_LIST = "projectBridges"; + static final String TOILET_LIST = "toilets"; public static final long HALF_YEAR = 180 * 60 * 60 * 24 * 1000L; public static final long ONE_YEAR = 365 * 60 * 60 * 24 * 1000L; diff --git a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java b/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java deleted file mode 100644 index 0286bb6..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.dcms.utils; - -import android.graphics.Rect; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -public class ItemDecorationSpace extends RecyclerView.ItemDecoration { - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (parent.getChildAdapterPosition(view) % 2 == 0) { - outRect.left = 0; - outRect.right = 5; - } else if (parent.getChildAdapterPosition(view) % 2 == 1) { - outRect.left = 5; - outRect.right = 0; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 4dd4dbd..cac58c5 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,7 +4,14 @@ import android.util.Log; import com.casic.dcms.R; +import com.casic.dcms.bean.HomePageBean; +import com.casic.dcms.bean.ProjectConfigBean; +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -21,44 +28,45 @@ return (String) SaveKeyValues.getValue("userAccount", ""); } - public static void saveUserId(String userId) { - SaveKeyValues.putValue("userId", userId); + public static void saveUserBean(String userBeanJson) { + SaveKeyValues.putValue(Constant.USER_BEAN, userBeanJson); } - public static String getUserId() { - return (String) SaveKeyValues.getValue("userId", ""); + public static UserBean.DataBean getUserBean() { + String userBeanJson = (String) SaveKeyValues.getValue(Constant.USER_BEAN, ""); + UserBean.DataBean dataBean = new UserBean.DataBean(); + if (userBeanJson.equals("")) { + return dataBean; + } + return new Gson().fromJson(userBeanJson, UserBean.DataBean.class); } - public static void saveUserName(String name) { - SaveKeyValues.putValue("userName", name); + public static void saveBridgeList(String bridgesJson) { + SaveKeyValues.putValue(Constant.BRIDGE_LIST, bridgesJson); } - public static String getUserName() { - return (String) SaveKeyValues.getValue("userName", ""); + public static List getBridgeBeanList() { + String bridgesJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); + List bridges = new ArrayList<>(); + if (bridgesJson.equals("")) { + return bridges; + } + return new Gson().fromJson(bridgesJson, new TypeToken>() { + }.getType()); } - public static void saveUserPhone(String phone) { - SaveKeyValues.putValue("userPhone", phone); + public static void saveToiletList(String toiletsJson) { + SaveKeyValues.putValue(Constant.TOILET_LIST, toiletsJson); } - public static String getUserPhone() { - return (String) SaveKeyValues.getValue("userPhone", ""); - } - - public static void saveUserDept(String dept) { - SaveKeyValues.putValue("userDept", dept); - } - - public static String getUserDept() { - return (String) SaveKeyValues.getValue("userDept", ""); - } - - public static void saveUserDeptId(String deptid) { - SaveKeyValues.putValue("userDeptId", deptid); - } - - public static String getUserDeptId() { - return (String) SaveKeyValues.getValue("userDeptId", ""); + public static List getToiletBeanList() { + String toiletsJson = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); + List toilets = new ArrayList<>(); + if (toiletsJson.equals("")) { + return toilets; + } + return new Gson().fromJson(toiletsJson, new TypeToken>() { + }.getType()); } public static boolean isLetterAndDigit(String str) { diff --git a/app/src/main/res/drawable/ic_package_holder.xml b/app/src/main/res/drawable/ic_package_holder.xml deleted file mode 100644 index 1f5ad5e..0000000 --- a/app/src/main/res/drawable/ic_package_holder.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 1d21c58..b376886 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -50,10 +50,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -95,10 +94,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -142,10 +140,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - @@ -38,10 +37,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -53,10 +51,9 @@ style="@style/noPointTextViewStyle" android:text="核查图片" /> - diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index e754c14..7d7a7c2 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -136,10 +136,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -151,10 +150,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -166,10 +164,9 @@ style="@style/noPointTextViewStyle" android:text="核查图片" /> - diff --git a/app/src/main/res/layout/activity_case_handle_detail.xml b/app/src/main/res/layout/activity_case_handle_detail.xml index 4cc674c..19a1a4a 100644 --- a/app/src/main/res/layout/activity_case_handle_detail.xml +++ b/app/src/main/res/layout/activity_case_handle_detail.xml @@ -22,16 +22,13 @@ - + @@ -132,10 +129,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - @@ -150,10 +149,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - diff --git a/app/src/main/res/layout/activity_case_todo_detail.xml b/app/src/main/res/layout/activity_case_todo_detail.xml index 345ca19..255a52e 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -97,10 +97,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 91bf9f9..e3a2c99 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -11,7 +11,9 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -20,13 +22,11 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -104,8 +103,8 @@ JzvdStd videoPlayerView; @BindView(R.id.addImageView) ImageView addImageView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -125,7 +124,7 @@ private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; private UploadVideoPresenterImpl uploadVideoPresenter; private String audioUrl, videoUrl; @@ -164,10 +163,8 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @SuppressLint("ClickableViewAccessibility") @@ -534,7 +531,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); imageList.add(url); @@ -542,21 +539,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -618,7 +615,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index aa02a1c..b7b71f5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -62,8 +61,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -73,7 +72,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -97,10 +96,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -217,7 +214,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -273,7 +270,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -281,21 +278,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 964490e..f4f3501 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -29,7 +29,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -71,8 +70,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -90,7 +89,7 @@ private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; @Override @@ -115,10 +114,8 @@ .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -331,28 +328,28 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -401,7 +398,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b8f97ec..496edba 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -57,8 +56,8 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -121,19 +120,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index c3b3b66..5f6a3e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -39,7 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -87,16 +86,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseOpinionView) TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; - @BindView(R.id.caseVerifyRecyclerView) - RecyclerView caseVerifyRecyclerView; + @BindView(R.id.verifyGridView) + GridView verifyGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -139,7 +138,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private ImageRecycleViewAdapter verifyImageAdapter; + private ImageGridViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -168,10 +167,8 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); - verifyImageAdapter = new ImageRecycleViewAdapter(this); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(verifyImageAdapter); + verifyImageAdapter = new ImageGridViewAdapter(this); + verifyGridView.setAdapter(verifyImageAdapter); } @Override @@ -226,19 +223,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -386,7 +381,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -402,7 +397,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -533,7 +528,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = verifyImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -541,22 +536,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); //九宫格点击事件 - verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + verifyGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - verifyImageAdapter.setDeleteView(true); - verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + verifyImageAdapter.isDeleteVisible(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 3cedbfe..8b08041 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -57,8 +56,8 @@ EditText shopKeeperView; @BindView(R.id.phoneNumberView) EditText phoneNumberView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -67,7 +66,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopChangePresenterImpl shopChangePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; private ArrayList realPaths = new ArrayList<>();//真实图片路径 @@ -91,10 +90,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -153,7 +150,7 @@ ToastHelper.showToast("店主名还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -235,7 +232,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -243,21 +240,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 381b704..d371d17 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -80,7 +80,7 @@ @Override public void initEvent() { - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", "", "", pageIndex); + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); calendarView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -98,7 +98,7 @@ endGroup = endGroupPosition;//结束月份位置 endChild = endChildPosition;//结束对应月份中日的位置 dateView.setText(startDate + "~" + endDate); - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", startDate, endDate, pageIndex); } }).builder(); @@ -110,7 +110,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); @@ -119,7 +119,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0d7053a..3662274 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -3,17 +3,17 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -27,7 +27,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAdjustFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -66,14 +65,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.optionEditView) @@ -207,19 +206,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -250,19 +247,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index bd491c3..19b9039 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAuthorizeFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -70,14 +69,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -264,19 +263,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -307,19 +304,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java index f22a99d..797b130 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -32,7 +32,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -71,14 +70,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -157,19 +156,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -200,19 +197,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 1c1fcd0..e40d2cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -22,9 +22,11 @@ import com.casic.dcms.base.BaseApplication; import com.casic.dcms.base.DoubleClickExitActivity; import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.HomePageBean; import com.casic.dcms.bean.NoticeBean; import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.greendao.NoticeBeanDao; import com.casic.dcms.mvp.presenter.PushRegisterPresenterImpl; import com.casic.dcms.mvp.presenter.ToiletListPresenterImpl; @@ -44,6 +46,8 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StatusBarColorUtil; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.callback.IHttpRequestListener; import com.casic.dcms.widgets.NoScrollViewPager; import com.google.android.material.bottomnavigation.BottomNavigationView; @@ -59,7 +63,8 @@ import butterknife.BindView; import okhttp3.ResponseBody; -public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, IPushRegisterView, IToiletListView { +public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, + IPushRegisterView, IToiletListView { private static final String TAG = "MainActivity"; @BindView(R.id.pageTitleView) @@ -100,18 +105,17 @@ uploadPositionPresenter = new UploadPositionPresenterImpl(this); registerPresenter = new PushRegisterPresenterImpl(this); toiletListPresenter = new ToiletListPresenterImpl(this); - gson = new Gson(); + //获取配置项 + obtainProjectConfig(); + //配置页面 pageList = new ArrayList<>(); pageList.add(new HomePageFragment()); pageList.add(new PhonePageFragment()); pageList.add(new NoticePageFragment()); pageList.add(new MinePageFragment()); + imei = OtherUtils.obtainSimCardSerialNumber(this); - - //获取配置项 - obtainProjectConfig(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UploadLocationService.class)); } else { @@ -128,7 +132,7 @@ try { String resultStr = resultBean.string(); List bridges = gson.fromJson(resultStr, ProjectConfigBean.class).getBridges(); - SaveKeyValues.putValue(Constant.BRIDGE_LIST, gson.toJson(bridges)); + StringHelper.saveBridgeList(gson.toJson(bridges)); } catch (IOException e) { e.printStackTrace(); } @@ -310,7 +314,7 @@ @Override public void obtainToiletListData(ToiletListBean resultBean) { if (resultBean.isSuccess()) { - SaveKeyValues.putValue(Constant.TOILET_LIST, gson.toJson(resultBean.getData())); + StringHelper.saveToiletList(gson.toJson(resultBean.getData())); } } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 441625b..fe48830 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -3,18 +3,16 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -44,16 +42,16 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.punishTypeView) TextView punishTypeView; @BindView(R.id.punishOpinionView) TextView punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.punishDateView) TextView punishDateView; @@ -106,19 +104,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -131,19 +127,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处罚记录 @@ -158,19 +152,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + punishGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } punishDateView.setText(data.getPunishTime()); } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index 1dec74b..6711568 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -5,7 +5,9 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; @@ -13,11 +15,9 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; @@ -78,8 +77,8 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.line1) @@ -90,8 +89,8 @@ View line2; @BindView(R.id.reasonLayout) RelativeLayout reasonLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.addHandleImageView) ImageView addHandleImageView; @BindView(R.id.caseReasonView) @@ -102,8 +101,8 @@ TextView punishTypeView; @BindView(R.id.punishOpinionView) EditText punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.addPunishImageView) ImageView addPunishImageView; @BindView(R.id.punishDateView) @@ -120,7 +119,8 @@ private ArrayList punishRealPaths = new ArrayList<>();//真实图片路径 private List handleImageList = new ArrayList<>();//上传到服务器的数据集 private List punishImageList = new ArrayList<>();//上传到服务器的数据集 - private ImageRecycleViewAdapter punishImageAdapter, handleImageAdapter; + private ImageGridViewAdapter handleImageAdapter; + private ImageGridViewAdapter punishImageAdapter; private CaseNextNodePresenterImpl caseNextNodePresenter; private String changeState; private String approvalResult; @@ -155,17 +155,13 @@ .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); //处罚adapter - punishImageAdapter = new ImageRecycleViewAdapter(this); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(punishImageAdapter); + punishImageAdapter = new ImageGridViewAdapter(this); + punishGridView.setAdapter(punishImageAdapter); //下级结点 caseNextNodePresenter = new CaseNextNodePresenterImpl(this); - //案卷处理adapter - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); caseHandlePresenter = new CaseHandlePresenterImpl(this); packageHandlePresenter = new PackageHandlePresenterImpl(this); @@ -206,19 +202,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -231,19 +225,16 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + handleImageAdapter.setImageList(urls); + handleGridView.setAdapter(handleImageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + handleImageAdapter.isDeleteVisible(true); } } } @@ -382,7 +373,7 @@ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg if (isAddHandleImage) { //处理图片 - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); handleImageList.add(url); @@ -390,22 +381,22 @@ if (handleRealPaths.size() == 2) { addHandleImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, handleRealPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { handleImageList.remove(position); handleRealPaths.remove(position); - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); if (handleRealPaths.size() != 2) { addHandleImageView.setVisibility(View.VISIBLE); } @@ -416,7 +407,7 @@ } } else { //处罚图片 - int sumItemCount = punishImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = punishImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); punishImageList.add(url); @@ -424,21 +415,21 @@ if (punishRealPaths.size() == 2) { addPunishImageView.setVisibility(View.GONE); } - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); //九宫格点击事件 - punishImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, punishRealPaths); } }); //删除按钮点击事件 - punishImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + punishImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { punishImageList.remove(position); punishRealPaths.remove(position); - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); if (punishRealPaths.size() != 2) { addPunishImageView.setVisibility(View.VISIBLE); } @@ -506,7 +497,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index 7e3d47e..7c58e30 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -31,7 +31,6 @@ import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; @@ -50,8 +49,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; @@ -216,16 +213,14 @@ mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.obtainToiletIdLayout: - String toiletValue = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); - if (toiletValue.equals("")) { + List toiletBeanList = StringHelper.getToiletBeanList(); + if (toiletBeanList.size() == 0) { ToastHelper.showToast("获取公厕数据失败，请联系管理员", ToastHelper.ERROR); return; } - List dataBeans = new Gson().fromJson(toiletValue, new TypeToken>() { - }.getType()); QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("请选择您要打卡的公厕"); - for (ToiletListBean.DataBean it : dataBeans) { + for (ToiletListBean.DataBean it : toiletBeanList) { sheetBuilder.addItem(it.getName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -233,7 +228,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - toiletIdView.setText(dataBeans.get(position).getId()); + toiletIdView.setText(toiletBeanList.get(position).getId()); //TODO 是否需要将地图移到相应的公厕，待定 } }).build().show(); @@ -308,7 +303,7 @@ ToastHelper.showToast("保洁开始时间不能为空", ToastHelper.WARING); return; } - cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserId(), + cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, endTimeView.getText().toString(), imagePath, StringHelper.filterString(workContentView.getText().toString())); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 3a8ebc6..9f316a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -7,6 +7,7 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.utils.StringHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; @@ -47,9 +48,10 @@ @Override public void initData() { - userNameView.setText(StringHelper.getUserName()); - userPhoneView.setText(StringHelper.getUserPhone()); - userDeptView.setText(StringHelper.getUserDept()); + UserBean.DataBean userBean = StringHelper.getUserBean(); + userNameView.setText(userBean.getName()); + userPhoneView.setText(userBean.getPhone()); + userDeptView.setText(userBean.getDeptName()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index d9656aa..16bd2e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -39,6 +39,7 @@ import com.casic.dcms.ui.UrgentCaseActivity; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import butterknife.BindView; @@ -74,36 +75,38 @@ @Override protected void initData() { - userDataPresenter = new UserDataPresenterImpl(this); homePagePresenter = new HomePagePresenterImpl(this); + userDataPresenter = new UserDataPresenterImpl(this); + + //用户信息 + userDataPresenter.onReadyRetrofitRequest(); + //首页相关功能项 + homePagePresenter.onReadyRetrofitRequest("05"); } @Override protected void initEvent() { - userDataPresenter.onReadyRetrofitRequest(); - homePagePresenter.onReadyRetrofitRequest("05"); + //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 +// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); + Glide.with(this).load(R.mipmap.app_logo).into(userIconView); } @SuppressLint("SetTextI18n") @Override public void obtainUserData(UserBean userBean) { if (userBean.isSuccess()) { - //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 -// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); - Glide.with(this).load(R.mipmap.app_logo).into(userIconView); + UserBean.DataBean dataBean = userBean.getData(); + StringHelper.saveUserBean(new Gson().toJson(dataBean)); - UserBean.DataBean data = userBean.getData(); - userNameView.setText(data.getName()); - userDeptView.setText(data.getDeptName() + data.getRoleNames()); - - StringHelper.saveUserName(data.getName()); - StringHelper.saveUserPhone(data.getPhone()); - StringHelper.saveUserDept(data.getDeptName()); - StringHelper.saveUserDeptId(data.getDeptId()); - StringHelper.saveUserId(data.getId()); + userNameView.setText(dataBean.getName()); + userDeptView.setText(dataBean.getDeptName() + dataBean.getRoleNames()); } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); + } @Override public void obtainHomePageResult(HomePageBean resultBean) { @@ -183,11 +186,6 @@ } @Override - public void obtainDataFail() { - ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); - } - - @Override public void onDestroyView() { super.onDestroyView(); if (userDataPresenter != null) { @@ -197,4 +195,4 @@ homePagePresenter.disposeRetrofitRequest(); } } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 1657341..13aa09b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -76,7 +76,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserDeptId()); + phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 9e3437c..859d2ac 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -37,8 +37,9 @@ Color.rgb(120, 104, 230)}; public static final String IP_KEY = "ip"; - public static final String BRIDGE_LIST = "projectBridges"; - public static final String TOILET_LIST = "toilets"; + static final String USER_BEAN = "userBean"; + static final String BRIDGE_LIST = "projectBridges"; + static final String TOILET_LIST = "toilets"; public static final long HALF_YEAR = 180 * 60 * 60 * 24 * 1000L; public static final long ONE_YEAR = 365 * 60 * 60 * 24 * 1000L; diff --git a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java b/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java deleted file mode 100644 index 0286bb6..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.dcms.utils; - -import android.graphics.Rect; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -public class ItemDecorationSpace extends RecyclerView.ItemDecoration { - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (parent.getChildAdapterPosition(view) % 2 == 0) { - outRect.left = 0; - outRect.right = 5; - } else if (parent.getChildAdapterPosition(view) % 2 == 1) { - outRect.left = 5; - outRect.right = 0; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 4dd4dbd..cac58c5 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,7 +4,14 @@ import android.util.Log; import com.casic.dcms.R; +import com.casic.dcms.bean.HomePageBean; +import com.casic.dcms.bean.ProjectConfigBean; +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -21,44 +28,45 @@ return (String) SaveKeyValues.getValue("userAccount", ""); } - public static void saveUserId(String userId) { - SaveKeyValues.putValue("userId", userId); + public static void saveUserBean(String userBeanJson) { + SaveKeyValues.putValue(Constant.USER_BEAN, userBeanJson); } - public static String getUserId() { - return (String) SaveKeyValues.getValue("userId", ""); + public static UserBean.DataBean getUserBean() { + String userBeanJson = (String) SaveKeyValues.getValue(Constant.USER_BEAN, ""); + UserBean.DataBean dataBean = new UserBean.DataBean(); + if (userBeanJson.equals("")) { + return dataBean; + } + return new Gson().fromJson(userBeanJson, UserBean.DataBean.class); } - public static void saveUserName(String name) { - SaveKeyValues.putValue("userName", name); + public static void saveBridgeList(String bridgesJson) { + SaveKeyValues.putValue(Constant.BRIDGE_LIST, bridgesJson); } - public static String getUserName() { - return (String) SaveKeyValues.getValue("userName", ""); + public static List getBridgeBeanList() { + String bridgesJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); + List bridges = new ArrayList<>(); + if (bridgesJson.equals("")) { + return bridges; + } + return new Gson().fromJson(bridgesJson, new TypeToken>() { + }.getType()); } - public static void saveUserPhone(String phone) { - SaveKeyValues.putValue("userPhone", phone); + public static void saveToiletList(String toiletsJson) { + SaveKeyValues.putValue(Constant.TOILET_LIST, toiletsJson); } - public static String getUserPhone() { - return (String) SaveKeyValues.getValue("userPhone", ""); - } - - public static void saveUserDept(String dept) { - SaveKeyValues.putValue("userDept", dept); - } - - public static String getUserDept() { - return (String) SaveKeyValues.getValue("userDept", ""); - } - - public static void saveUserDeptId(String deptid) { - SaveKeyValues.putValue("userDeptId", deptid); - } - - public static String getUserDeptId() { - return (String) SaveKeyValues.getValue("userDeptId", ""); + public static List getToiletBeanList() { + String toiletsJson = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); + List toilets = new ArrayList<>(); + if (toiletsJson.equals("")) { + return toilets; + } + return new Gson().fromJson(toiletsJson, new TypeToken>() { + }.getType()); } public static boolean isLetterAndDigit(String str) { diff --git a/app/src/main/res/drawable/ic_package_holder.xml b/app/src/main/res/drawable/ic_package_holder.xml deleted file mode 100644 index 1f5ad5e..0000000 --- a/app/src/main/res/drawable/ic_package_holder.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 1d21c58..b376886 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -50,10 +50,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -95,10 +94,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -142,10 +140,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - @@ -38,10 +37,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -53,10 +51,9 @@ style="@style/noPointTextViewStyle" android:text="核查图片" /> - diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index e754c14..7d7a7c2 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -136,10 +136,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -151,10 +150,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -166,10 +164,9 @@ style="@style/noPointTextViewStyle" android:text="核查图片" /> - diff --git a/app/src/main/res/layout/activity_case_handle_detail.xml b/app/src/main/res/layout/activity_case_handle_detail.xml index 4cc674c..19a1a4a 100644 --- a/app/src/main/res/layout/activity_case_handle_detail.xml +++ b/app/src/main/res/layout/activity_case_handle_detail.xml @@ -22,16 +22,13 @@ - + @@ -132,10 +129,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - @@ -150,10 +149,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - diff --git a/app/src/main/res/layout/activity_case_todo_detail.xml b/app/src/main/res/layout/activity_case_todo_detail.xml index 345ca19..255a52e 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -97,10 +97,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_todo_handled_detail.xml b/app/src/main/res/layout/activity_case_todo_handled_detail.xml index a929b43..2bb8cf1 100644 --- a/app/src/main/res/layout/activity_case_todo_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_handled_detail.xml @@ -151,10 +151,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 91bf9f9..e3a2c99 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -11,7 +11,9 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -20,13 +22,11 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -104,8 +103,8 @@ JzvdStd videoPlayerView; @BindView(R.id.addImageView) ImageView addImageView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -125,7 +124,7 @@ private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; private UploadVideoPresenterImpl uploadVideoPresenter; private String audioUrl, videoUrl; @@ -164,10 +163,8 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @SuppressLint("ClickableViewAccessibility") @@ -534,7 +531,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); imageList.add(url); @@ -542,21 +539,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -618,7 +615,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index aa02a1c..b7b71f5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -62,8 +61,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -73,7 +72,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -97,10 +96,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -217,7 +214,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -273,7 +270,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -281,21 +278,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 964490e..f4f3501 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -29,7 +29,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -71,8 +70,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -90,7 +89,7 @@ private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; @Override @@ -115,10 +114,8 @@ .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -331,28 +328,28 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -401,7 +398,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b8f97ec..496edba 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -57,8 +56,8 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -121,19 +120,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index c3b3b66..5f6a3e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -39,7 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -87,16 +86,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseOpinionView) TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; - @BindView(R.id.caseVerifyRecyclerView) - RecyclerView caseVerifyRecyclerView; + @BindView(R.id.verifyGridView) + GridView verifyGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -139,7 +138,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private ImageRecycleViewAdapter verifyImageAdapter; + private ImageGridViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -168,10 +167,8 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); - verifyImageAdapter = new ImageRecycleViewAdapter(this); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(verifyImageAdapter); + verifyImageAdapter = new ImageGridViewAdapter(this); + verifyGridView.setAdapter(verifyImageAdapter); } @Override @@ -226,19 +223,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -386,7 +381,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -402,7 +397,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -533,7 +528,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = verifyImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -541,22 +536,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); //九宫格点击事件 - verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + verifyGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - verifyImageAdapter.setDeleteView(true); - verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + verifyImageAdapter.isDeleteVisible(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 3cedbfe..8b08041 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -57,8 +56,8 @@ EditText shopKeeperView; @BindView(R.id.phoneNumberView) EditText phoneNumberView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -67,7 +66,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopChangePresenterImpl shopChangePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; private ArrayList realPaths = new ArrayList<>();//真实图片路径 @@ -91,10 +90,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -153,7 +150,7 @@ ToastHelper.showToast("店主名还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -235,7 +232,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -243,21 +240,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 381b704..d371d17 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -80,7 +80,7 @@ @Override public void initEvent() { - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", "", "", pageIndex); + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); calendarView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -98,7 +98,7 @@ endGroup = endGroupPosition;//结束月份位置 endChild = endChildPosition;//结束对应月份中日的位置 dateView.setText(startDate + "~" + endDate); - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", startDate, endDate, pageIndex); } }).builder(); @@ -110,7 +110,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); @@ -119,7 +119,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0d7053a..3662274 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -3,17 +3,17 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -27,7 +27,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAdjustFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -66,14 +65,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.optionEditView) @@ -207,19 +206,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -250,19 +247,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index bd491c3..19b9039 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAuthorizeFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -70,14 +69,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -264,19 +263,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -307,19 +304,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java index f22a99d..797b130 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -32,7 +32,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -71,14 +70,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -157,19 +156,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -200,19 +197,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 1c1fcd0..e40d2cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -22,9 +22,11 @@ import com.casic.dcms.base.BaseApplication; import com.casic.dcms.base.DoubleClickExitActivity; import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.HomePageBean; import com.casic.dcms.bean.NoticeBean; import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.greendao.NoticeBeanDao; import com.casic.dcms.mvp.presenter.PushRegisterPresenterImpl; import com.casic.dcms.mvp.presenter.ToiletListPresenterImpl; @@ -44,6 +46,8 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StatusBarColorUtil; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.callback.IHttpRequestListener; import com.casic.dcms.widgets.NoScrollViewPager; import com.google.android.material.bottomnavigation.BottomNavigationView; @@ -59,7 +63,8 @@ import butterknife.BindView; import okhttp3.ResponseBody; -public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, IPushRegisterView, IToiletListView { +public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, + IPushRegisterView, IToiletListView { private static final String TAG = "MainActivity"; @BindView(R.id.pageTitleView) @@ -100,18 +105,17 @@ uploadPositionPresenter = new UploadPositionPresenterImpl(this); registerPresenter = new PushRegisterPresenterImpl(this); toiletListPresenter = new ToiletListPresenterImpl(this); - gson = new Gson(); + //获取配置项 + obtainProjectConfig(); + //配置页面 pageList = new ArrayList<>(); pageList.add(new HomePageFragment()); pageList.add(new PhonePageFragment()); pageList.add(new NoticePageFragment()); pageList.add(new MinePageFragment()); + imei = OtherUtils.obtainSimCardSerialNumber(this); - - //获取配置项 - obtainProjectConfig(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UploadLocationService.class)); } else { @@ -128,7 +132,7 @@ try { String resultStr = resultBean.string(); List bridges = gson.fromJson(resultStr, ProjectConfigBean.class).getBridges(); - SaveKeyValues.putValue(Constant.BRIDGE_LIST, gson.toJson(bridges)); + StringHelper.saveBridgeList(gson.toJson(bridges)); } catch (IOException e) { e.printStackTrace(); } @@ -310,7 +314,7 @@ @Override public void obtainToiletListData(ToiletListBean resultBean) { if (resultBean.isSuccess()) { - SaveKeyValues.putValue(Constant.TOILET_LIST, gson.toJson(resultBean.getData())); + StringHelper.saveToiletList(gson.toJson(resultBean.getData())); } } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 441625b..fe48830 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -3,18 +3,16 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -44,16 +42,16 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.punishTypeView) TextView punishTypeView; @BindView(R.id.punishOpinionView) TextView punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.punishDateView) TextView punishDateView; @@ -106,19 +104,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -131,19 +127,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处罚记录 @@ -158,19 +152,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + punishGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } punishDateView.setText(data.getPunishTime()); } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index 1dec74b..6711568 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -5,7 +5,9 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; @@ -13,11 +15,9 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; @@ -78,8 +77,8 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.line1) @@ -90,8 +89,8 @@ View line2; @BindView(R.id.reasonLayout) RelativeLayout reasonLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.addHandleImageView) ImageView addHandleImageView; @BindView(R.id.caseReasonView) @@ -102,8 +101,8 @@ TextView punishTypeView; @BindView(R.id.punishOpinionView) EditText punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.addPunishImageView) ImageView addPunishImageView; @BindView(R.id.punishDateView) @@ -120,7 +119,8 @@ private ArrayList punishRealPaths = new ArrayList<>();//真实图片路径 private List handleImageList = new ArrayList<>();//上传到服务器的数据集 private List punishImageList = new ArrayList<>();//上传到服务器的数据集 - private ImageRecycleViewAdapter punishImageAdapter, handleImageAdapter; + private ImageGridViewAdapter handleImageAdapter; + private ImageGridViewAdapter punishImageAdapter; private CaseNextNodePresenterImpl caseNextNodePresenter; private String changeState; private String approvalResult; @@ -155,17 +155,13 @@ .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); //处罚adapter - punishImageAdapter = new ImageRecycleViewAdapter(this); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(punishImageAdapter); + punishImageAdapter = new ImageGridViewAdapter(this); + punishGridView.setAdapter(punishImageAdapter); //下级结点 caseNextNodePresenter = new CaseNextNodePresenterImpl(this); - //案卷处理adapter - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); caseHandlePresenter = new CaseHandlePresenterImpl(this); packageHandlePresenter = new PackageHandlePresenterImpl(this); @@ -206,19 +202,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -231,19 +225,16 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + handleImageAdapter.setImageList(urls); + handleGridView.setAdapter(handleImageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + handleImageAdapter.isDeleteVisible(true); } } } @@ -382,7 +373,7 @@ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg if (isAddHandleImage) { //处理图片 - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); handleImageList.add(url); @@ -390,22 +381,22 @@ if (handleRealPaths.size() == 2) { addHandleImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, handleRealPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { handleImageList.remove(position); handleRealPaths.remove(position); - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); if (handleRealPaths.size() != 2) { addHandleImageView.setVisibility(View.VISIBLE); } @@ -416,7 +407,7 @@ } } else { //处罚图片 - int sumItemCount = punishImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = punishImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); punishImageList.add(url); @@ -424,21 +415,21 @@ if (punishRealPaths.size() == 2) { addPunishImageView.setVisibility(View.GONE); } - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); //九宫格点击事件 - punishImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, punishRealPaths); } }); //删除按钮点击事件 - punishImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + punishImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { punishImageList.remove(position); punishRealPaths.remove(position); - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); if (punishRealPaths.size() != 2) { addPunishImageView.setVisibility(View.VISIBLE); } @@ -506,7 +497,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index 7e3d47e..7c58e30 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -31,7 +31,6 @@ import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; @@ -50,8 +49,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; @@ -216,16 +213,14 @@ mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.obtainToiletIdLayout: - String toiletValue = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); - if (toiletValue.equals("")) { + List toiletBeanList = StringHelper.getToiletBeanList(); + if (toiletBeanList.size() == 0) { ToastHelper.showToast("获取公厕数据失败，请联系管理员", ToastHelper.ERROR); return; } - List dataBeans = new Gson().fromJson(toiletValue, new TypeToken>() { - }.getType()); QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("请选择您要打卡的公厕"); - for (ToiletListBean.DataBean it : dataBeans) { + for (ToiletListBean.DataBean it : toiletBeanList) { sheetBuilder.addItem(it.getName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -233,7 +228,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - toiletIdView.setText(dataBeans.get(position).getId()); + toiletIdView.setText(toiletBeanList.get(position).getId()); //TODO 是否需要将地图移到相应的公厕，待定 } }).build().show(); @@ -308,7 +303,7 @@ ToastHelper.showToast("保洁开始时间不能为空", ToastHelper.WARING); return; } - cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserId(), + cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, endTimeView.getText().toString(), imagePath, StringHelper.filterString(workContentView.getText().toString())); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 3a8ebc6..9f316a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -7,6 +7,7 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.utils.StringHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; @@ -47,9 +48,10 @@ @Override public void initData() { - userNameView.setText(StringHelper.getUserName()); - userPhoneView.setText(StringHelper.getUserPhone()); - userDeptView.setText(StringHelper.getUserDept()); + UserBean.DataBean userBean = StringHelper.getUserBean(); + userNameView.setText(userBean.getName()); + userPhoneView.setText(userBean.getPhone()); + userDeptView.setText(userBean.getDeptName()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index d9656aa..16bd2e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -39,6 +39,7 @@ import com.casic.dcms.ui.UrgentCaseActivity; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import butterknife.BindView; @@ -74,36 +75,38 @@ @Override protected void initData() { - userDataPresenter = new UserDataPresenterImpl(this); homePagePresenter = new HomePagePresenterImpl(this); + userDataPresenter = new UserDataPresenterImpl(this); + + //用户信息 + userDataPresenter.onReadyRetrofitRequest(); + //首页相关功能项 + homePagePresenter.onReadyRetrofitRequest("05"); } @Override protected void initEvent() { - userDataPresenter.onReadyRetrofitRequest(); - homePagePresenter.onReadyRetrofitRequest("05"); + //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 +// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); + Glide.with(this).load(R.mipmap.app_logo).into(userIconView); } @SuppressLint("SetTextI18n") @Override public void obtainUserData(UserBean userBean) { if (userBean.isSuccess()) { - //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 -// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); - Glide.with(this).load(R.mipmap.app_logo).into(userIconView); + UserBean.DataBean dataBean = userBean.getData(); + StringHelper.saveUserBean(new Gson().toJson(dataBean)); - UserBean.DataBean data = userBean.getData(); - userNameView.setText(data.getName()); - userDeptView.setText(data.getDeptName() + data.getRoleNames()); - - StringHelper.saveUserName(data.getName()); - StringHelper.saveUserPhone(data.getPhone()); - StringHelper.saveUserDept(data.getDeptName()); - StringHelper.saveUserDeptId(data.getDeptId()); - StringHelper.saveUserId(data.getId()); + userNameView.setText(dataBean.getName()); + userDeptView.setText(dataBean.getDeptName() + dataBean.getRoleNames()); } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); + } @Override public void obtainHomePageResult(HomePageBean resultBean) { @@ -183,11 +186,6 @@ } @Override - public void obtainDataFail() { - ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); - } - - @Override public void onDestroyView() { super.onDestroyView(); if (userDataPresenter != null) { @@ -197,4 +195,4 @@ homePagePresenter.disposeRetrofitRequest(); } } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 1657341..13aa09b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -76,7 +76,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserDeptId()); + phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 9e3437c..859d2ac 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -37,8 +37,9 @@ Color.rgb(120, 104, 230)}; public static final String IP_KEY = "ip"; - public static final String BRIDGE_LIST = "projectBridges"; - public static final String TOILET_LIST = "toilets"; + static final String USER_BEAN = "userBean"; + static final String BRIDGE_LIST = "projectBridges"; + static final String TOILET_LIST = "toilets"; public static final long HALF_YEAR = 180 * 60 * 60 * 24 * 1000L; public static final long ONE_YEAR = 365 * 60 * 60 * 24 * 1000L; diff --git a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java b/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java deleted file mode 100644 index 0286bb6..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.dcms.utils; - -import android.graphics.Rect; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -public class ItemDecorationSpace extends RecyclerView.ItemDecoration { - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (parent.getChildAdapterPosition(view) % 2 == 0) { - outRect.left = 0; - outRect.right = 5; - } else if (parent.getChildAdapterPosition(view) % 2 == 1) { - outRect.left = 5; - outRect.right = 0; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 4dd4dbd..cac58c5 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,7 +4,14 @@ import android.util.Log; import com.casic.dcms.R; +import com.casic.dcms.bean.HomePageBean; +import com.casic.dcms.bean.ProjectConfigBean; +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -21,44 +28,45 @@ return (String) SaveKeyValues.getValue("userAccount", ""); } - public static void saveUserId(String userId) { - SaveKeyValues.putValue("userId", userId); + public static void saveUserBean(String userBeanJson) { + SaveKeyValues.putValue(Constant.USER_BEAN, userBeanJson); } - public static String getUserId() { - return (String) SaveKeyValues.getValue("userId", ""); + public static UserBean.DataBean getUserBean() { + String userBeanJson = (String) SaveKeyValues.getValue(Constant.USER_BEAN, ""); + UserBean.DataBean dataBean = new UserBean.DataBean(); + if (userBeanJson.equals("")) { + return dataBean; + } + return new Gson().fromJson(userBeanJson, UserBean.DataBean.class); } - public static void saveUserName(String name) { - SaveKeyValues.putValue("userName", name); + public static void saveBridgeList(String bridgesJson) { + SaveKeyValues.putValue(Constant.BRIDGE_LIST, bridgesJson); } - public static String getUserName() { - return (String) SaveKeyValues.getValue("userName", ""); + public static List getBridgeBeanList() { + String bridgesJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); + List bridges = new ArrayList<>(); + if (bridgesJson.equals("")) { + return bridges; + } + return new Gson().fromJson(bridgesJson, new TypeToken>() { + }.getType()); } - public static void saveUserPhone(String phone) { - SaveKeyValues.putValue("userPhone", phone); + public static void saveToiletList(String toiletsJson) { + SaveKeyValues.putValue(Constant.TOILET_LIST, toiletsJson); } - public static String getUserPhone() { - return (String) SaveKeyValues.getValue("userPhone", ""); - } - - public static void saveUserDept(String dept) { - SaveKeyValues.putValue("userDept", dept); - } - - public static String getUserDept() { - return (String) SaveKeyValues.getValue("userDept", ""); - } - - public static void saveUserDeptId(String deptid) { - SaveKeyValues.putValue("userDeptId", deptid); - } - - public static String getUserDeptId() { - return (String) SaveKeyValues.getValue("userDeptId", ""); + public static List getToiletBeanList() { + String toiletsJson = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); + List toilets = new ArrayList<>(); + if (toiletsJson.equals("")) { + return toilets; + } + return new Gson().fromJson(toiletsJson, new TypeToken>() { + }.getType()); } public static boolean isLetterAndDigit(String str) { diff --git a/app/src/main/res/drawable/ic_package_holder.xml b/app/src/main/res/drawable/ic_package_holder.xml deleted file mode 100644 index 1f5ad5e..0000000 --- a/app/src/main/res/drawable/ic_package_holder.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 1d21c58..b376886 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -50,10 +50,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -95,10 +94,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -142,10 +140,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - @@ -38,10 +37,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -53,10 +51,9 @@ style="@style/noPointTextViewStyle" android:text="核查图片" /> - diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index e754c14..7d7a7c2 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -136,10 +136,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -151,10 +150,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -166,10 +164,9 @@ style="@style/noPointTextViewStyle" android:text="核查图片" /> - diff --git a/app/src/main/res/layout/activity_case_handle_detail.xml b/app/src/main/res/layout/activity_case_handle_detail.xml index 4cc674c..19a1a4a 100644 --- a/app/src/main/res/layout/activity_case_handle_detail.xml +++ b/app/src/main/res/layout/activity_case_handle_detail.xml @@ -22,16 +22,13 @@ - + @@ -132,10 +129,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - @@ -150,10 +149,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - diff --git a/app/src/main/res/layout/activity_case_todo_detail.xml b/app/src/main/res/layout/activity_case_todo_detail.xml index 345ca19..255a52e 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -97,10 +97,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_todo_handled_detail.xml b/app/src/main/res/layout/activity_case_todo_handled_detail.xml index a929b43..2bb8cf1 100644 --- a/app/src/main/res/layout/activity_case_todo_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_handled_detail.xml @@ -151,10 +151,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_verified_detail.xml b/app/src/main/res/layout/activity_case_verified_detail.xml index 394d248..a39e000 100644 --- a/app/src/main/res/layout/activity_case_verified_detail.xml +++ b/app/src/main/res/layout/activity_case_verified_detail.xml @@ -50,10 +50,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 91bf9f9..e3a2c99 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -11,7 +11,9 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -20,13 +22,11 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -104,8 +103,8 @@ JzvdStd videoPlayerView; @BindView(R.id.addImageView) ImageView addImageView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -125,7 +124,7 @@ private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; private UploadVideoPresenterImpl uploadVideoPresenter; private String audioUrl, videoUrl; @@ -164,10 +163,8 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @SuppressLint("ClickableViewAccessibility") @@ -534,7 +531,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); imageList.add(url); @@ -542,21 +539,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -618,7 +615,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index aa02a1c..b7b71f5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -62,8 +61,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -73,7 +72,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -97,10 +96,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -217,7 +214,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -273,7 +270,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -281,21 +278,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 964490e..f4f3501 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -29,7 +29,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -71,8 +70,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -90,7 +89,7 @@ private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; @Override @@ -115,10 +114,8 @@ .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -331,28 +328,28 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -401,7 +398,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b8f97ec..496edba 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -57,8 +56,8 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -121,19 +120,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index c3b3b66..5f6a3e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -39,7 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -87,16 +86,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseOpinionView) TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; - @BindView(R.id.caseVerifyRecyclerView) - RecyclerView caseVerifyRecyclerView; + @BindView(R.id.verifyGridView) + GridView verifyGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -139,7 +138,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private ImageRecycleViewAdapter verifyImageAdapter; + private ImageGridViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -168,10 +167,8 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); - verifyImageAdapter = new ImageRecycleViewAdapter(this); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(verifyImageAdapter); + verifyImageAdapter = new ImageGridViewAdapter(this); + verifyGridView.setAdapter(verifyImageAdapter); } @Override @@ -226,19 +223,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -386,7 +381,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -402,7 +397,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -533,7 +528,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = verifyImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -541,22 +536,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); //九宫格点击事件 - verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + verifyGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - verifyImageAdapter.setDeleteView(true); - verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + verifyImageAdapter.isDeleteVisible(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 3cedbfe..8b08041 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -57,8 +56,8 @@ EditText shopKeeperView; @BindView(R.id.phoneNumberView) EditText phoneNumberView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -67,7 +66,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopChangePresenterImpl shopChangePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; private ArrayList realPaths = new ArrayList<>();//真实图片路径 @@ -91,10 +90,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -153,7 +150,7 @@ ToastHelper.showToast("店主名还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -235,7 +232,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -243,21 +240,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 381b704..d371d17 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -80,7 +80,7 @@ @Override public void initEvent() { - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", "", "", pageIndex); + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); calendarView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -98,7 +98,7 @@ endGroup = endGroupPosition;//结束月份位置 endChild = endChildPosition;//结束对应月份中日的位置 dateView.setText(startDate + "~" + endDate); - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", startDate, endDate, pageIndex); } }).builder(); @@ -110,7 +110,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); @@ -119,7 +119,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0d7053a..3662274 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -3,17 +3,17 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -27,7 +27,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAdjustFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -66,14 +65,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.optionEditView) @@ -207,19 +206,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -250,19 +247,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index bd491c3..19b9039 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAuthorizeFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -70,14 +69,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -264,19 +263,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -307,19 +304,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java index f22a99d..797b130 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -32,7 +32,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -71,14 +70,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -157,19 +156,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -200,19 +197,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 1c1fcd0..e40d2cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -22,9 +22,11 @@ import com.casic.dcms.base.BaseApplication; import com.casic.dcms.base.DoubleClickExitActivity; import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.HomePageBean; import com.casic.dcms.bean.NoticeBean; import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.greendao.NoticeBeanDao; import com.casic.dcms.mvp.presenter.PushRegisterPresenterImpl; import com.casic.dcms.mvp.presenter.ToiletListPresenterImpl; @@ -44,6 +46,8 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StatusBarColorUtil; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.callback.IHttpRequestListener; import com.casic.dcms.widgets.NoScrollViewPager; import com.google.android.material.bottomnavigation.BottomNavigationView; @@ -59,7 +63,8 @@ import butterknife.BindView; import okhttp3.ResponseBody; -public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, IPushRegisterView, IToiletListView { +public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, + IPushRegisterView, IToiletListView { private static final String TAG = "MainActivity"; @BindView(R.id.pageTitleView) @@ -100,18 +105,17 @@ uploadPositionPresenter = new UploadPositionPresenterImpl(this); registerPresenter = new PushRegisterPresenterImpl(this); toiletListPresenter = new ToiletListPresenterImpl(this); - gson = new Gson(); + //获取配置项 + obtainProjectConfig(); + //配置页面 pageList = new ArrayList<>(); pageList.add(new HomePageFragment()); pageList.add(new PhonePageFragment()); pageList.add(new NoticePageFragment()); pageList.add(new MinePageFragment()); + imei = OtherUtils.obtainSimCardSerialNumber(this); - - //获取配置项 - obtainProjectConfig(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UploadLocationService.class)); } else { @@ -128,7 +132,7 @@ try { String resultStr = resultBean.string(); List bridges = gson.fromJson(resultStr, ProjectConfigBean.class).getBridges(); - SaveKeyValues.putValue(Constant.BRIDGE_LIST, gson.toJson(bridges)); + StringHelper.saveBridgeList(gson.toJson(bridges)); } catch (IOException e) { e.printStackTrace(); } @@ -310,7 +314,7 @@ @Override public void obtainToiletListData(ToiletListBean resultBean) { if (resultBean.isSuccess()) { - SaveKeyValues.putValue(Constant.TOILET_LIST, gson.toJson(resultBean.getData())); + StringHelper.saveToiletList(gson.toJson(resultBean.getData())); } } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 441625b..fe48830 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -3,18 +3,16 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -44,16 +42,16 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.punishTypeView) TextView punishTypeView; @BindView(R.id.punishOpinionView) TextView punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.punishDateView) TextView punishDateView; @@ -106,19 +104,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -131,19 +127,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处罚记录 @@ -158,19 +152,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + punishGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } punishDateView.setText(data.getPunishTime()); } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index 1dec74b..6711568 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -5,7 +5,9 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; @@ -13,11 +15,9 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; @@ -78,8 +77,8 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.line1) @@ -90,8 +89,8 @@ View line2; @BindView(R.id.reasonLayout) RelativeLayout reasonLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.addHandleImageView) ImageView addHandleImageView; @BindView(R.id.caseReasonView) @@ -102,8 +101,8 @@ TextView punishTypeView; @BindView(R.id.punishOpinionView) EditText punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.addPunishImageView) ImageView addPunishImageView; @BindView(R.id.punishDateView) @@ -120,7 +119,8 @@ private ArrayList punishRealPaths = new ArrayList<>();//真实图片路径 private List handleImageList = new ArrayList<>();//上传到服务器的数据集 private List punishImageList = new ArrayList<>();//上传到服务器的数据集 - private ImageRecycleViewAdapter punishImageAdapter, handleImageAdapter; + private ImageGridViewAdapter handleImageAdapter; + private ImageGridViewAdapter punishImageAdapter; private CaseNextNodePresenterImpl caseNextNodePresenter; private String changeState; private String approvalResult; @@ -155,17 +155,13 @@ .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); //处罚adapter - punishImageAdapter = new ImageRecycleViewAdapter(this); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(punishImageAdapter); + punishImageAdapter = new ImageGridViewAdapter(this); + punishGridView.setAdapter(punishImageAdapter); //下级结点 caseNextNodePresenter = new CaseNextNodePresenterImpl(this); - //案卷处理adapter - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); caseHandlePresenter = new CaseHandlePresenterImpl(this); packageHandlePresenter = new PackageHandlePresenterImpl(this); @@ -206,19 +202,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -231,19 +225,16 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + handleImageAdapter.setImageList(urls); + handleGridView.setAdapter(handleImageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + handleImageAdapter.isDeleteVisible(true); } } } @@ -382,7 +373,7 @@ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg if (isAddHandleImage) { //处理图片 - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); handleImageList.add(url); @@ -390,22 +381,22 @@ if (handleRealPaths.size() == 2) { addHandleImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, handleRealPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { handleImageList.remove(position); handleRealPaths.remove(position); - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); if (handleRealPaths.size() != 2) { addHandleImageView.setVisibility(View.VISIBLE); } @@ -416,7 +407,7 @@ } } else { //处罚图片 - int sumItemCount = punishImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = punishImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); punishImageList.add(url); @@ -424,21 +415,21 @@ if (punishRealPaths.size() == 2) { addPunishImageView.setVisibility(View.GONE); } - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); //九宫格点击事件 - punishImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, punishRealPaths); } }); //删除按钮点击事件 - punishImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + punishImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { punishImageList.remove(position); punishRealPaths.remove(position); - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); if (punishRealPaths.size() != 2) { addPunishImageView.setVisibility(View.VISIBLE); } @@ -506,7 +497,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index 7e3d47e..7c58e30 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -31,7 +31,6 @@ import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; @@ -50,8 +49,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; @@ -216,16 +213,14 @@ mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.obtainToiletIdLayout: - String toiletValue = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); - if (toiletValue.equals("")) { + List toiletBeanList = StringHelper.getToiletBeanList(); + if (toiletBeanList.size() == 0) { ToastHelper.showToast("获取公厕数据失败，请联系管理员", ToastHelper.ERROR); return; } - List dataBeans = new Gson().fromJson(toiletValue, new TypeToken>() { - }.getType()); QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("请选择您要打卡的公厕"); - for (ToiletListBean.DataBean it : dataBeans) { + for (ToiletListBean.DataBean it : toiletBeanList) { sheetBuilder.addItem(it.getName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -233,7 +228,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - toiletIdView.setText(dataBeans.get(position).getId()); + toiletIdView.setText(toiletBeanList.get(position).getId()); //TODO 是否需要将地图移到相应的公厕，待定 } }).build().show(); @@ -308,7 +303,7 @@ ToastHelper.showToast("保洁开始时间不能为空", ToastHelper.WARING); return; } - cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserId(), + cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, endTimeView.getText().toString(), imagePath, StringHelper.filterString(workContentView.getText().toString())); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 3a8ebc6..9f316a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -7,6 +7,7 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.utils.StringHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; @@ -47,9 +48,10 @@ @Override public void initData() { - userNameView.setText(StringHelper.getUserName()); - userPhoneView.setText(StringHelper.getUserPhone()); - userDeptView.setText(StringHelper.getUserDept()); + UserBean.DataBean userBean = StringHelper.getUserBean(); + userNameView.setText(userBean.getName()); + userPhoneView.setText(userBean.getPhone()); + userDeptView.setText(userBean.getDeptName()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index d9656aa..16bd2e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -39,6 +39,7 @@ import com.casic.dcms.ui.UrgentCaseActivity; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import butterknife.BindView; @@ -74,36 +75,38 @@ @Override protected void initData() { - userDataPresenter = new UserDataPresenterImpl(this); homePagePresenter = new HomePagePresenterImpl(this); + userDataPresenter = new UserDataPresenterImpl(this); + + //用户信息 + userDataPresenter.onReadyRetrofitRequest(); + //首页相关功能项 + homePagePresenter.onReadyRetrofitRequest("05"); } @Override protected void initEvent() { - userDataPresenter.onReadyRetrofitRequest(); - homePagePresenter.onReadyRetrofitRequest("05"); + //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 +// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); + Glide.with(this).load(R.mipmap.app_logo).into(userIconView); } @SuppressLint("SetTextI18n") @Override public void obtainUserData(UserBean userBean) { if (userBean.isSuccess()) { - //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 -// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); - Glide.with(this).load(R.mipmap.app_logo).into(userIconView); + UserBean.DataBean dataBean = userBean.getData(); + StringHelper.saveUserBean(new Gson().toJson(dataBean)); - UserBean.DataBean data = userBean.getData(); - userNameView.setText(data.getName()); - userDeptView.setText(data.getDeptName() + data.getRoleNames()); - - StringHelper.saveUserName(data.getName()); - StringHelper.saveUserPhone(data.getPhone()); - StringHelper.saveUserDept(data.getDeptName()); - StringHelper.saveUserDeptId(data.getDeptId()); - StringHelper.saveUserId(data.getId()); + userNameView.setText(dataBean.getName()); + userDeptView.setText(dataBean.getDeptName() + dataBean.getRoleNames()); } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); + } @Override public void obtainHomePageResult(HomePageBean resultBean) { @@ -183,11 +186,6 @@ } @Override - public void obtainDataFail() { - ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); - } - - @Override public void onDestroyView() { super.onDestroyView(); if (userDataPresenter != null) { @@ -197,4 +195,4 @@ homePagePresenter.disposeRetrofitRequest(); } } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 1657341..13aa09b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -76,7 +76,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserDeptId()); + phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 9e3437c..859d2ac 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -37,8 +37,9 @@ Color.rgb(120, 104, 230)}; public static final String IP_KEY = "ip"; - public static final String BRIDGE_LIST = "projectBridges"; - public static final String TOILET_LIST = "toilets"; + static final String USER_BEAN = "userBean"; + static final String BRIDGE_LIST = "projectBridges"; + static final String TOILET_LIST = "toilets"; public static final long HALF_YEAR = 180 * 60 * 60 * 24 * 1000L; public static final long ONE_YEAR = 365 * 60 * 60 * 24 * 1000L; diff --git a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java b/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java deleted file mode 100644 index 0286bb6..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.dcms.utils; - -import android.graphics.Rect; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -public class ItemDecorationSpace extends RecyclerView.ItemDecoration { - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (parent.getChildAdapterPosition(view) % 2 == 0) { - outRect.left = 0; - outRect.right = 5; - } else if (parent.getChildAdapterPosition(view) % 2 == 1) { - outRect.left = 5; - outRect.right = 0; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 4dd4dbd..cac58c5 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,7 +4,14 @@ import android.util.Log; import com.casic.dcms.R; +import com.casic.dcms.bean.HomePageBean; +import com.casic.dcms.bean.ProjectConfigBean; +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -21,44 +28,45 @@ return (String) SaveKeyValues.getValue("userAccount", ""); } - public static void saveUserId(String userId) { - SaveKeyValues.putValue("userId", userId); + public static void saveUserBean(String userBeanJson) { + SaveKeyValues.putValue(Constant.USER_BEAN, userBeanJson); } - public static String getUserId() { - return (String) SaveKeyValues.getValue("userId", ""); + public static UserBean.DataBean getUserBean() { + String userBeanJson = (String) SaveKeyValues.getValue(Constant.USER_BEAN, ""); + UserBean.DataBean dataBean = new UserBean.DataBean(); + if (userBeanJson.equals("")) { + return dataBean; + } + return new Gson().fromJson(userBeanJson, UserBean.DataBean.class); } - public static void saveUserName(String name) { - SaveKeyValues.putValue("userName", name); + public static void saveBridgeList(String bridgesJson) { + SaveKeyValues.putValue(Constant.BRIDGE_LIST, bridgesJson); } - public static String getUserName() { - return (String) SaveKeyValues.getValue("userName", ""); + public static List getBridgeBeanList() { + String bridgesJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); + List bridges = new ArrayList<>(); + if (bridgesJson.equals("")) { + return bridges; + } + return new Gson().fromJson(bridgesJson, new TypeToken>() { + }.getType()); } - public static void saveUserPhone(String phone) { - SaveKeyValues.putValue("userPhone", phone); + public static void saveToiletList(String toiletsJson) { + SaveKeyValues.putValue(Constant.TOILET_LIST, toiletsJson); } - public static String getUserPhone() { - return (String) SaveKeyValues.getValue("userPhone", ""); - } - - public static void saveUserDept(String dept) { - SaveKeyValues.putValue("userDept", dept); - } - - public static String getUserDept() { - return (String) SaveKeyValues.getValue("userDept", ""); - } - - public static void saveUserDeptId(String deptid) { - SaveKeyValues.putValue("userDeptId", deptid); - } - - public static String getUserDeptId() { - return (String) SaveKeyValues.getValue("userDeptId", ""); + public static List getToiletBeanList() { + String toiletsJson = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); + List toilets = new ArrayList<>(); + if (toiletsJson.equals("")) { + return toilets; + } + return new Gson().fromJson(toiletsJson, new TypeToken>() { + }.getType()); } public static boolean isLetterAndDigit(String str) { diff --git a/app/src/main/res/drawable/ic_package_holder.xml b/app/src/main/res/drawable/ic_package_holder.xml deleted file mode 100644 index 1f5ad5e..0000000 --- a/app/src/main/res/drawable/ic_package_holder.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 1d21c58..b376886 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -50,10 +50,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -95,10 +94,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -142,10 +140,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - @@ -38,10 +37,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -53,10 +51,9 @@ style="@style/noPointTextViewStyle" android:text="核查图片" /> - diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index e754c14..7d7a7c2 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -136,10 +136,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -151,10 +150,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -166,10 +164,9 @@ style="@style/noPointTextViewStyle" android:text="核查图片" /> - diff --git a/app/src/main/res/layout/activity_case_handle_detail.xml b/app/src/main/res/layout/activity_case_handle_detail.xml index 4cc674c..19a1a4a 100644 --- a/app/src/main/res/layout/activity_case_handle_detail.xml +++ b/app/src/main/res/layout/activity_case_handle_detail.xml @@ -22,16 +22,13 @@ - + @@ -132,10 +129,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - @@ -150,10 +149,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - diff --git a/app/src/main/res/layout/activity_case_todo_detail.xml b/app/src/main/res/layout/activity_case_todo_detail.xml index 345ca19..255a52e 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -97,10 +97,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_todo_handled_detail.xml b/app/src/main/res/layout/activity_case_todo_handled_detail.xml index a929b43..2bb8cf1 100644 --- a/app/src/main/res/layout/activity_case_todo_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_handled_detail.xml @@ -151,10 +151,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_verified_detail.xml b/app/src/main/res/layout/activity_case_verified_detail.xml index 394d248..a39e000 100644 --- a/app/src/main/res/layout/activity_case_verified_detail.xml +++ b/app/src/main/res/layout/activity_case_verified_detail.xml @@ -50,10 +50,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_verify_detail.xml b/app/src/main/res/layout/activity_case_verify_detail.xml index 0c90a09..1220507 100644 --- a/app/src/main/res/layout/activity_case_verify_detail.xml +++ b/app/src/main/res/layout/activity_case_verify_detail.xml @@ -76,10 +76,9 @@ style="@style/tagTextViewStyle" android:text="案卷图片" /> - - + images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 91bf9f9..e3a2c99 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -11,7 +11,9 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -20,13 +22,11 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -104,8 +103,8 @@ JzvdStd videoPlayerView; @BindView(R.id.addImageView) ImageView addImageView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -125,7 +124,7 @@ private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; private UploadVideoPresenterImpl uploadVideoPresenter; private String audioUrl, videoUrl; @@ -164,10 +163,8 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @SuppressLint("ClickableViewAccessibility") @@ -534,7 +531,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); imageList.add(url); @@ -542,21 +539,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -618,7 +615,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index aa02a1c..b7b71f5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -62,8 +61,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -73,7 +72,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -97,10 +96,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -217,7 +214,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -273,7 +270,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -281,21 +278,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 964490e..f4f3501 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -29,7 +29,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -71,8 +70,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -90,7 +89,7 @@ private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; @Override @@ -115,10 +114,8 @@ .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -331,28 +328,28 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -401,7 +398,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b8f97ec..496edba 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -57,8 +56,8 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -121,19 +120,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index c3b3b66..5f6a3e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -39,7 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -87,16 +86,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseOpinionView) TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; - @BindView(R.id.caseVerifyRecyclerView) - RecyclerView caseVerifyRecyclerView; + @BindView(R.id.verifyGridView) + GridView verifyGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -139,7 +138,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private ImageRecycleViewAdapter verifyImageAdapter; + private ImageGridViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -168,10 +167,8 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); - verifyImageAdapter = new ImageRecycleViewAdapter(this); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(verifyImageAdapter); + verifyImageAdapter = new ImageGridViewAdapter(this); + verifyGridView.setAdapter(verifyImageAdapter); } @Override @@ -226,19 +223,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -386,7 +381,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -402,7 +397,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -533,7 +528,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = verifyImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -541,22 +536,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); //九宫格点击事件 - verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + verifyGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - verifyImageAdapter.setDeleteView(true); - verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + verifyImageAdapter.isDeleteVisible(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 3cedbfe..8b08041 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -57,8 +56,8 @@ EditText shopKeeperView; @BindView(R.id.phoneNumberView) EditText phoneNumberView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -67,7 +66,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopChangePresenterImpl shopChangePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; private ArrayList realPaths = new ArrayList<>();//真实图片路径 @@ -91,10 +90,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -153,7 +150,7 @@ ToastHelper.showToast("店主名还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -235,7 +232,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -243,21 +240,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 381b704..d371d17 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -80,7 +80,7 @@ @Override public void initEvent() { - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", "", "", pageIndex); + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); calendarView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -98,7 +98,7 @@ endGroup = endGroupPosition;//结束月份位置 endChild = endChildPosition;//结束对应月份中日的位置 dateView.setText(startDate + "~" + endDate); - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", startDate, endDate, pageIndex); } }).builder(); @@ -110,7 +110,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); @@ -119,7 +119,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0d7053a..3662274 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -3,17 +3,17 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -27,7 +27,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAdjustFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -66,14 +65,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.optionEditView) @@ -207,19 +206,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -250,19 +247,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index bd491c3..19b9039 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAuthorizeFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -70,14 +69,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -264,19 +263,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -307,19 +304,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java index f22a99d..797b130 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -32,7 +32,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -71,14 +70,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -157,19 +156,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -200,19 +197,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 1c1fcd0..e40d2cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -22,9 +22,11 @@ import com.casic.dcms.base.BaseApplication; import com.casic.dcms.base.DoubleClickExitActivity; import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.HomePageBean; import com.casic.dcms.bean.NoticeBean; import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.greendao.NoticeBeanDao; import com.casic.dcms.mvp.presenter.PushRegisterPresenterImpl; import com.casic.dcms.mvp.presenter.ToiletListPresenterImpl; @@ -44,6 +46,8 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StatusBarColorUtil; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.callback.IHttpRequestListener; import com.casic.dcms.widgets.NoScrollViewPager; import com.google.android.material.bottomnavigation.BottomNavigationView; @@ -59,7 +63,8 @@ import butterknife.BindView; import okhttp3.ResponseBody; -public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, IPushRegisterView, IToiletListView { +public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, + IPushRegisterView, IToiletListView { private static final String TAG = "MainActivity"; @BindView(R.id.pageTitleView) @@ -100,18 +105,17 @@ uploadPositionPresenter = new UploadPositionPresenterImpl(this); registerPresenter = new PushRegisterPresenterImpl(this); toiletListPresenter = new ToiletListPresenterImpl(this); - gson = new Gson(); + //获取配置项 + obtainProjectConfig(); + //配置页面 pageList = new ArrayList<>(); pageList.add(new HomePageFragment()); pageList.add(new PhonePageFragment()); pageList.add(new NoticePageFragment()); pageList.add(new MinePageFragment()); + imei = OtherUtils.obtainSimCardSerialNumber(this); - - //获取配置项 - obtainProjectConfig(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UploadLocationService.class)); } else { @@ -128,7 +132,7 @@ try { String resultStr = resultBean.string(); List bridges = gson.fromJson(resultStr, ProjectConfigBean.class).getBridges(); - SaveKeyValues.putValue(Constant.BRIDGE_LIST, gson.toJson(bridges)); + StringHelper.saveBridgeList(gson.toJson(bridges)); } catch (IOException e) { e.printStackTrace(); } @@ -310,7 +314,7 @@ @Override public void obtainToiletListData(ToiletListBean resultBean) { if (resultBean.isSuccess()) { - SaveKeyValues.putValue(Constant.TOILET_LIST, gson.toJson(resultBean.getData())); + StringHelper.saveToiletList(gson.toJson(resultBean.getData())); } } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 441625b..fe48830 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -3,18 +3,16 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -44,16 +42,16 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.punishTypeView) TextView punishTypeView; @BindView(R.id.punishOpinionView) TextView punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.punishDateView) TextView punishDateView; @@ -106,19 +104,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -131,19 +127,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处罚记录 @@ -158,19 +152,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + punishGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } punishDateView.setText(data.getPunishTime()); } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index 1dec74b..6711568 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -5,7 +5,9 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; @@ -13,11 +15,9 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; @@ -78,8 +77,8 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.line1) @@ -90,8 +89,8 @@ View line2; @BindView(R.id.reasonLayout) RelativeLayout reasonLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.addHandleImageView) ImageView addHandleImageView; @BindView(R.id.caseReasonView) @@ -102,8 +101,8 @@ TextView punishTypeView; @BindView(R.id.punishOpinionView) EditText punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.addPunishImageView) ImageView addPunishImageView; @BindView(R.id.punishDateView) @@ -120,7 +119,8 @@ private ArrayList punishRealPaths = new ArrayList<>();//真实图片路径 private List handleImageList = new ArrayList<>();//上传到服务器的数据集 private List punishImageList = new ArrayList<>();//上传到服务器的数据集 - private ImageRecycleViewAdapter punishImageAdapter, handleImageAdapter; + private ImageGridViewAdapter handleImageAdapter; + private ImageGridViewAdapter punishImageAdapter; private CaseNextNodePresenterImpl caseNextNodePresenter; private String changeState; private String approvalResult; @@ -155,17 +155,13 @@ .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); //处罚adapter - punishImageAdapter = new ImageRecycleViewAdapter(this); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(punishImageAdapter); + punishImageAdapter = new ImageGridViewAdapter(this); + punishGridView.setAdapter(punishImageAdapter); //下级结点 caseNextNodePresenter = new CaseNextNodePresenterImpl(this); - //案卷处理adapter - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); caseHandlePresenter = new CaseHandlePresenterImpl(this); packageHandlePresenter = new PackageHandlePresenterImpl(this); @@ -206,19 +202,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -231,19 +225,16 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + handleImageAdapter.setImageList(urls); + handleGridView.setAdapter(handleImageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + handleImageAdapter.isDeleteVisible(true); } } } @@ -382,7 +373,7 @@ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg if (isAddHandleImage) { //处理图片 - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); handleImageList.add(url); @@ -390,22 +381,22 @@ if (handleRealPaths.size() == 2) { addHandleImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, handleRealPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { handleImageList.remove(position); handleRealPaths.remove(position); - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); if (handleRealPaths.size() != 2) { addHandleImageView.setVisibility(View.VISIBLE); } @@ -416,7 +407,7 @@ } } else { //处罚图片 - int sumItemCount = punishImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = punishImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); punishImageList.add(url); @@ -424,21 +415,21 @@ if (punishRealPaths.size() == 2) { addPunishImageView.setVisibility(View.GONE); } - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); //九宫格点击事件 - punishImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, punishRealPaths); } }); //删除按钮点击事件 - punishImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + punishImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { punishImageList.remove(position); punishRealPaths.remove(position); - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); if (punishRealPaths.size() != 2) { addPunishImageView.setVisibility(View.VISIBLE); } @@ -506,7 +497,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index 7e3d47e..7c58e30 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -31,7 +31,6 @@ import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; @@ -50,8 +49,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; @@ -216,16 +213,14 @@ mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.obtainToiletIdLayout: - String toiletValue = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); - if (toiletValue.equals("")) { + List toiletBeanList = StringHelper.getToiletBeanList(); + if (toiletBeanList.size() == 0) { ToastHelper.showToast("获取公厕数据失败，请联系管理员", ToastHelper.ERROR); return; } - List dataBeans = new Gson().fromJson(toiletValue, new TypeToken>() { - }.getType()); QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("请选择您要打卡的公厕"); - for (ToiletListBean.DataBean it : dataBeans) { + for (ToiletListBean.DataBean it : toiletBeanList) { sheetBuilder.addItem(it.getName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -233,7 +228,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - toiletIdView.setText(dataBeans.get(position).getId()); + toiletIdView.setText(toiletBeanList.get(position).getId()); //TODO 是否需要将地图移到相应的公厕，待定 } }).build().show(); @@ -308,7 +303,7 @@ ToastHelper.showToast("保洁开始时间不能为空", ToastHelper.WARING); return; } - cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserId(), + cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, endTimeView.getText().toString(), imagePath, StringHelper.filterString(workContentView.getText().toString())); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 3a8ebc6..9f316a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -7,6 +7,7 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.utils.StringHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; @@ -47,9 +48,10 @@ @Override public void initData() { - userNameView.setText(StringHelper.getUserName()); - userPhoneView.setText(StringHelper.getUserPhone()); - userDeptView.setText(StringHelper.getUserDept()); + UserBean.DataBean userBean = StringHelper.getUserBean(); + userNameView.setText(userBean.getName()); + userPhoneView.setText(userBean.getPhone()); + userDeptView.setText(userBean.getDeptName()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index d9656aa..16bd2e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -39,6 +39,7 @@ import com.casic.dcms.ui.UrgentCaseActivity; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import butterknife.BindView; @@ -74,36 +75,38 @@ @Override protected void initData() { - userDataPresenter = new UserDataPresenterImpl(this); homePagePresenter = new HomePagePresenterImpl(this); + userDataPresenter = new UserDataPresenterImpl(this); + + //用户信息 + userDataPresenter.onReadyRetrofitRequest(); + //首页相关功能项 + homePagePresenter.onReadyRetrofitRequest("05"); } @Override protected void initEvent() { - userDataPresenter.onReadyRetrofitRequest(); - homePagePresenter.onReadyRetrofitRequest("05"); + //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 +// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); + Glide.with(this).load(R.mipmap.app_logo).into(userIconView); } @SuppressLint("SetTextI18n") @Override public void obtainUserData(UserBean userBean) { if (userBean.isSuccess()) { - //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 -// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); - Glide.with(this).load(R.mipmap.app_logo).into(userIconView); + UserBean.DataBean dataBean = userBean.getData(); + StringHelper.saveUserBean(new Gson().toJson(dataBean)); - UserBean.DataBean data = userBean.getData(); - userNameView.setText(data.getName()); - userDeptView.setText(data.getDeptName() + data.getRoleNames()); - - StringHelper.saveUserName(data.getName()); - StringHelper.saveUserPhone(data.getPhone()); - StringHelper.saveUserDept(data.getDeptName()); - StringHelper.saveUserDeptId(data.getDeptId()); - StringHelper.saveUserId(data.getId()); + userNameView.setText(dataBean.getName()); + userDeptView.setText(dataBean.getDeptName() + dataBean.getRoleNames()); } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); + } @Override public void obtainHomePageResult(HomePageBean resultBean) { @@ -183,11 +186,6 @@ } @Override - public void obtainDataFail() { - ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); - } - - @Override public void onDestroyView() { super.onDestroyView(); if (userDataPresenter != null) { @@ -197,4 +195,4 @@ homePagePresenter.disposeRetrofitRequest(); } } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 1657341..13aa09b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -76,7 +76,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserDeptId()); + phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 9e3437c..859d2ac 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -37,8 +37,9 @@ Color.rgb(120, 104, 230)}; public static final String IP_KEY = "ip"; - public static final String BRIDGE_LIST = "projectBridges"; - public static final String TOILET_LIST = "toilets"; + static final String USER_BEAN = "userBean"; + static final String BRIDGE_LIST = "projectBridges"; + static final String TOILET_LIST = "toilets"; public static final long HALF_YEAR = 180 * 60 * 60 * 24 * 1000L; public static final long ONE_YEAR = 365 * 60 * 60 * 24 * 1000L; diff --git a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java b/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java deleted file mode 100644 index 0286bb6..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.dcms.utils; - -import android.graphics.Rect; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -public class ItemDecorationSpace extends RecyclerView.ItemDecoration { - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (parent.getChildAdapterPosition(view) % 2 == 0) { - outRect.left = 0; - outRect.right = 5; - } else if (parent.getChildAdapterPosition(view) % 2 == 1) { - outRect.left = 5; - outRect.right = 0; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 4dd4dbd..cac58c5 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,7 +4,14 @@ import android.util.Log; import com.casic.dcms.R; +import com.casic.dcms.bean.HomePageBean; +import com.casic.dcms.bean.ProjectConfigBean; +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -21,44 +28,45 @@ return (String) SaveKeyValues.getValue("userAccount", ""); } - public static void saveUserId(String userId) { - SaveKeyValues.putValue("userId", userId); + public static void saveUserBean(String userBeanJson) { + SaveKeyValues.putValue(Constant.USER_BEAN, userBeanJson); } - public static String getUserId() { - return (String) SaveKeyValues.getValue("userId", ""); + public static UserBean.DataBean getUserBean() { + String userBeanJson = (String) SaveKeyValues.getValue(Constant.USER_BEAN, ""); + UserBean.DataBean dataBean = new UserBean.DataBean(); + if (userBeanJson.equals("")) { + return dataBean; + } + return new Gson().fromJson(userBeanJson, UserBean.DataBean.class); } - public static void saveUserName(String name) { - SaveKeyValues.putValue("userName", name); + public static void saveBridgeList(String bridgesJson) { + SaveKeyValues.putValue(Constant.BRIDGE_LIST, bridgesJson); } - public static String getUserName() { - return (String) SaveKeyValues.getValue("userName", ""); + public static List getBridgeBeanList() { + String bridgesJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); + List bridges = new ArrayList<>(); + if (bridgesJson.equals("")) { + return bridges; + } + return new Gson().fromJson(bridgesJson, new TypeToken>() { + }.getType()); } - public static void saveUserPhone(String phone) { - SaveKeyValues.putValue("userPhone", phone); + public static void saveToiletList(String toiletsJson) { + SaveKeyValues.putValue(Constant.TOILET_LIST, toiletsJson); } - public static String getUserPhone() { - return (String) SaveKeyValues.getValue("userPhone", ""); - } - - public static void saveUserDept(String dept) { - SaveKeyValues.putValue("userDept", dept); - } - - public static String getUserDept() { - return (String) SaveKeyValues.getValue("userDept", ""); - } - - public static void saveUserDeptId(String deptid) { - SaveKeyValues.putValue("userDeptId", deptid); - } - - public static String getUserDeptId() { - return (String) SaveKeyValues.getValue("userDeptId", ""); + public static List getToiletBeanList() { + String toiletsJson = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); + List toilets = new ArrayList<>(); + if (toiletsJson.equals("")) { + return toilets; + } + return new Gson().fromJson(toiletsJson, new TypeToken>() { + }.getType()); } public static boolean isLetterAndDigit(String str) { diff --git a/app/src/main/res/drawable/ic_package_holder.xml b/app/src/main/res/drawable/ic_package_holder.xml deleted file mode 100644 index 1f5ad5e..0000000 --- a/app/src/main/res/drawable/ic_package_holder.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 1d21c58..b376886 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -50,10 +50,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -95,10 +94,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -142,10 +140,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - @@ -38,10 +37,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -53,10 +51,9 @@ style="@style/noPointTextViewStyle" android:text="核查图片" /> - diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index e754c14..7d7a7c2 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -136,10 +136,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -151,10 +150,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -166,10 +164,9 @@ style="@style/noPointTextViewStyle" android:text="核查图片" /> - diff --git a/app/src/main/res/layout/activity_case_handle_detail.xml b/app/src/main/res/layout/activity_case_handle_detail.xml index 4cc674c..19a1a4a 100644 --- a/app/src/main/res/layout/activity_case_handle_detail.xml +++ b/app/src/main/res/layout/activity_case_handle_detail.xml @@ -22,16 +22,13 @@ - + @@ -132,10 +129,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - @@ -150,10 +149,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - diff --git a/app/src/main/res/layout/activity_case_todo_detail.xml b/app/src/main/res/layout/activity_case_todo_detail.xml index 345ca19..255a52e 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -97,10 +97,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_todo_handled_detail.xml b/app/src/main/res/layout/activity_case_todo_handled_detail.xml index a929b43..2bb8cf1 100644 --- a/app/src/main/res/layout/activity_case_todo_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_handled_detail.xml @@ -151,10 +151,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_verified_detail.xml b/app/src/main/res/layout/activity_case_verified_detail.xml index 394d248..a39e000 100644 --- a/app/src/main/res/layout/activity_case_verified_detail.xml +++ b/app/src/main/res/layout/activity_case_verified_detail.xml @@ -50,10 +50,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_verify_detail.xml b/app/src/main/res/layout/activity_case_verify_detail.xml index 0c90a09..1220507 100644 --- a/app/src/main/res/layout/activity_case_verify_detail.xml +++ b/app/src/main/res/layout/activity_case_verify_detail.xml @@ -76,10 +76,9 @@ style="@style/tagTextViewStyle" android:text="案卷图片" /> - - + @@ -130,7 +127,6 @@ android:id="@+id/phoneNumberView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="@dimen/margin_10dp" android:background="@null" android:hint="请输入店主手机号码" android:inputType="phone" @@ -145,6 +141,7 @@ @@ -153,14 +150,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:orientation="vertical"> - + images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 91bf9f9..e3a2c99 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -11,7 +11,9 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -20,13 +22,11 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -104,8 +103,8 @@ JzvdStd videoPlayerView; @BindView(R.id.addImageView) ImageView addImageView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -125,7 +124,7 @@ private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; private UploadVideoPresenterImpl uploadVideoPresenter; private String audioUrl, videoUrl; @@ -164,10 +163,8 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @SuppressLint("ClickableViewAccessibility") @@ -534,7 +531,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); imageList.add(url); @@ -542,21 +539,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -618,7 +615,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index aa02a1c..b7b71f5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -62,8 +61,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -73,7 +72,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -97,10 +96,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -217,7 +214,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -273,7 +270,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -281,21 +278,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 964490e..f4f3501 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -29,7 +29,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -71,8 +70,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -90,7 +89,7 @@ private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; @Override @@ -115,10 +114,8 @@ .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -331,28 +328,28 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -401,7 +398,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b8f97ec..496edba 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -57,8 +56,8 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -121,19 +120,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index c3b3b66..5f6a3e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -39,7 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -87,16 +86,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseOpinionView) TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; - @BindView(R.id.caseVerifyRecyclerView) - RecyclerView caseVerifyRecyclerView; + @BindView(R.id.verifyGridView) + GridView verifyGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -139,7 +138,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private ImageRecycleViewAdapter verifyImageAdapter; + private ImageGridViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -168,10 +167,8 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); - verifyImageAdapter = new ImageRecycleViewAdapter(this); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(verifyImageAdapter); + verifyImageAdapter = new ImageGridViewAdapter(this); + verifyGridView.setAdapter(verifyImageAdapter); } @Override @@ -226,19 +223,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -386,7 +381,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -402,7 +397,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -533,7 +528,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = verifyImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -541,22 +536,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); //九宫格点击事件 - verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + verifyGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - verifyImageAdapter.setDeleteView(true); - verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + verifyImageAdapter.isDeleteVisible(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 3cedbfe..8b08041 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -57,8 +56,8 @@ EditText shopKeeperView; @BindView(R.id.phoneNumberView) EditText phoneNumberView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -67,7 +66,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopChangePresenterImpl shopChangePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; private ArrayList realPaths = new ArrayList<>();//真实图片路径 @@ -91,10 +90,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -153,7 +150,7 @@ ToastHelper.showToast("店主名还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -235,7 +232,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -243,21 +240,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 381b704..d371d17 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -80,7 +80,7 @@ @Override public void initEvent() { - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", "", "", pageIndex); + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); calendarView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -98,7 +98,7 @@ endGroup = endGroupPosition;//结束月份位置 endChild = endChildPosition;//结束对应月份中日的位置 dateView.setText(startDate + "~" + endDate); - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", startDate, endDate, pageIndex); } }).builder(); @@ -110,7 +110,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); @@ -119,7 +119,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0d7053a..3662274 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -3,17 +3,17 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -27,7 +27,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAdjustFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -66,14 +65,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.optionEditView) @@ -207,19 +206,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -250,19 +247,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index bd491c3..19b9039 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAuthorizeFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -70,14 +69,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -264,19 +263,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -307,19 +304,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java index f22a99d..797b130 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -32,7 +32,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -71,14 +70,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -157,19 +156,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -200,19 +197,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 1c1fcd0..e40d2cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -22,9 +22,11 @@ import com.casic.dcms.base.BaseApplication; import com.casic.dcms.base.DoubleClickExitActivity; import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.HomePageBean; import com.casic.dcms.bean.NoticeBean; import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.greendao.NoticeBeanDao; import com.casic.dcms.mvp.presenter.PushRegisterPresenterImpl; import com.casic.dcms.mvp.presenter.ToiletListPresenterImpl; @@ -44,6 +46,8 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StatusBarColorUtil; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.callback.IHttpRequestListener; import com.casic.dcms.widgets.NoScrollViewPager; import com.google.android.material.bottomnavigation.BottomNavigationView; @@ -59,7 +63,8 @@ import butterknife.BindView; import okhttp3.ResponseBody; -public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, IPushRegisterView, IToiletListView { +public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, + IPushRegisterView, IToiletListView { private static final String TAG = "MainActivity"; @BindView(R.id.pageTitleView) @@ -100,18 +105,17 @@ uploadPositionPresenter = new UploadPositionPresenterImpl(this); registerPresenter = new PushRegisterPresenterImpl(this); toiletListPresenter = new ToiletListPresenterImpl(this); - gson = new Gson(); + //获取配置项 + obtainProjectConfig(); + //配置页面 pageList = new ArrayList<>(); pageList.add(new HomePageFragment()); pageList.add(new PhonePageFragment()); pageList.add(new NoticePageFragment()); pageList.add(new MinePageFragment()); + imei = OtherUtils.obtainSimCardSerialNumber(this); - - //获取配置项 - obtainProjectConfig(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UploadLocationService.class)); } else { @@ -128,7 +132,7 @@ try { String resultStr = resultBean.string(); List bridges = gson.fromJson(resultStr, ProjectConfigBean.class).getBridges(); - SaveKeyValues.putValue(Constant.BRIDGE_LIST, gson.toJson(bridges)); + StringHelper.saveBridgeList(gson.toJson(bridges)); } catch (IOException e) { e.printStackTrace(); } @@ -310,7 +314,7 @@ @Override public void obtainToiletListData(ToiletListBean resultBean) { if (resultBean.isSuccess()) { - SaveKeyValues.putValue(Constant.TOILET_LIST, gson.toJson(resultBean.getData())); + StringHelper.saveToiletList(gson.toJson(resultBean.getData())); } } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 441625b..fe48830 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -3,18 +3,16 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -44,16 +42,16 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.punishTypeView) TextView punishTypeView; @BindView(R.id.punishOpinionView) TextView punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.punishDateView) TextView punishDateView; @@ -106,19 +104,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -131,19 +127,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处罚记录 @@ -158,19 +152,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + punishGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } punishDateView.setText(data.getPunishTime()); } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index 1dec74b..6711568 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -5,7 +5,9 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; @@ -13,11 +15,9 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; @@ -78,8 +77,8 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.line1) @@ -90,8 +89,8 @@ View line2; @BindView(R.id.reasonLayout) RelativeLayout reasonLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.addHandleImageView) ImageView addHandleImageView; @BindView(R.id.caseReasonView) @@ -102,8 +101,8 @@ TextView punishTypeView; @BindView(R.id.punishOpinionView) EditText punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.addPunishImageView) ImageView addPunishImageView; @BindView(R.id.punishDateView) @@ -120,7 +119,8 @@ private ArrayList punishRealPaths = new ArrayList<>();//真实图片路径 private List handleImageList = new ArrayList<>();//上传到服务器的数据集 private List punishImageList = new ArrayList<>();//上传到服务器的数据集 - private ImageRecycleViewAdapter punishImageAdapter, handleImageAdapter; + private ImageGridViewAdapter handleImageAdapter; + private ImageGridViewAdapter punishImageAdapter; private CaseNextNodePresenterImpl caseNextNodePresenter; private String changeState; private String approvalResult; @@ -155,17 +155,13 @@ .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); //处罚adapter - punishImageAdapter = new ImageRecycleViewAdapter(this); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(punishImageAdapter); + punishImageAdapter = new ImageGridViewAdapter(this); + punishGridView.setAdapter(punishImageAdapter); //下级结点 caseNextNodePresenter = new CaseNextNodePresenterImpl(this); - //案卷处理adapter - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); caseHandlePresenter = new CaseHandlePresenterImpl(this); packageHandlePresenter = new PackageHandlePresenterImpl(this); @@ -206,19 +202,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -231,19 +225,16 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + handleImageAdapter.setImageList(urls); + handleGridView.setAdapter(handleImageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + handleImageAdapter.isDeleteVisible(true); } } } @@ -382,7 +373,7 @@ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg if (isAddHandleImage) { //处理图片 - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); handleImageList.add(url); @@ -390,22 +381,22 @@ if (handleRealPaths.size() == 2) { addHandleImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, handleRealPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { handleImageList.remove(position); handleRealPaths.remove(position); - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); if (handleRealPaths.size() != 2) { addHandleImageView.setVisibility(View.VISIBLE); } @@ -416,7 +407,7 @@ } } else { //处罚图片 - int sumItemCount = punishImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = punishImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); punishImageList.add(url); @@ -424,21 +415,21 @@ if (punishRealPaths.size() == 2) { addPunishImageView.setVisibility(View.GONE); } - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); //九宫格点击事件 - punishImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, punishRealPaths); } }); //删除按钮点击事件 - punishImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + punishImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { punishImageList.remove(position); punishRealPaths.remove(position); - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); if (punishRealPaths.size() != 2) { addPunishImageView.setVisibility(View.VISIBLE); } @@ -506,7 +497,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index 7e3d47e..7c58e30 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -31,7 +31,6 @@ import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; @@ -50,8 +49,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; @@ -216,16 +213,14 @@ mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.obtainToiletIdLayout: - String toiletValue = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); - if (toiletValue.equals("")) { + List toiletBeanList = StringHelper.getToiletBeanList(); + if (toiletBeanList.size() == 0) { ToastHelper.showToast("获取公厕数据失败，请联系管理员", ToastHelper.ERROR); return; } - List dataBeans = new Gson().fromJson(toiletValue, new TypeToken>() { - }.getType()); QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("请选择您要打卡的公厕"); - for (ToiletListBean.DataBean it : dataBeans) { + for (ToiletListBean.DataBean it : toiletBeanList) { sheetBuilder.addItem(it.getName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -233,7 +228,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - toiletIdView.setText(dataBeans.get(position).getId()); + toiletIdView.setText(toiletBeanList.get(position).getId()); //TODO 是否需要将地图移到相应的公厕，待定 } }).build().show(); @@ -308,7 +303,7 @@ ToastHelper.showToast("保洁开始时间不能为空", ToastHelper.WARING); return; } - cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserId(), + cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, endTimeView.getText().toString(), imagePath, StringHelper.filterString(workContentView.getText().toString())); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 3a8ebc6..9f316a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -7,6 +7,7 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.utils.StringHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; @@ -47,9 +48,10 @@ @Override public void initData() { - userNameView.setText(StringHelper.getUserName()); - userPhoneView.setText(StringHelper.getUserPhone()); - userDeptView.setText(StringHelper.getUserDept()); + UserBean.DataBean userBean = StringHelper.getUserBean(); + userNameView.setText(userBean.getName()); + userPhoneView.setText(userBean.getPhone()); + userDeptView.setText(userBean.getDeptName()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index d9656aa..16bd2e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -39,6 +39,7 @@ import com.casic.dcms.ui.UrgentCaseActivity; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import butterknife.BindView; @@ -74,36 +75,38 @@ @Override protected void initData() { - userDataPresenter = new UserDataPresenterImpl(this); homePagePresenter = new HomePagePresenterImpl(this); + userDataPresenter = new UserDataPresenterImpl(this); + + //用户信息 + userDataPresenter.onReadyRetrofitRequest(); + //首页相关功能项 + homePagePresenter.onReadyRetrofitRequest("05"); } @Override protected void initEvent() { - userDataPresenter.onReadyRetrofitRequest(); - homePagePresenter.onReadyRetrofitRequest("05"); + //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 +// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); + Glide.with(this).load(R.mipmap.app_logo).into(userIconView); } @SuppressLint("SetTextI18n") @Override public void obtainUserData(UserBean userBean) { if (userBean.isSuccess()) { - //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 -// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); - Glide.with(this).load(R.mipmap.app_logo).into(userIconView); + UserBean.DataBean dataBean = userBean.getData(); + StringHelper.saveUserBean(new Gson().toJson(dataBean)); - UserBean.DataBean data = userBean.getData(); - userNameView.setText(data.getName()); - userDeptView.setText(data.getDeptName() + data.getRoleNames()); - - StringHelper.saveUserName(data.getName()); - StringHelper.saveUserPhone(data.getPhone()); - StringHelper.saveUserDept(data.getDeptName()); - StringHelper.saveUserDeptId(data.getDeptId()); - StringHelper.saveUserId(data.getId()); + userNameView.setText(dataBean.getName()); + userDeptView.setText(dataBean.getDeptName() + dataBean.getRoleNames()); } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); + } @Override public void obtainHomePageResult(HomePageBean resultBean) { @@ -183,11 +186,6 @@ } @Override - public void obtainDataFail() { - ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); - } - - @Override public void onDestroyView() { super.onDestroyView(); if (userDataPresenter != null) { @@ -197,4 +195,4 @@ homePagePresenter.disposeRetrofitRequest(); } } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 1657341..13aa09b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -76,7 +76,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserDeptId()); + phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 9e3437c..859d2ac 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -37,8 +37,9 @@ Color.rgb(120, 104, 230)}; public static final String IP_KEY = "ip"; - public static final String BRIDGE_LIST = "projectBridges"; - public static final String TOILET_LIST = "toilets"; + static final String USER_BEAN = "userBean"; + static final String BRIDGE_LIST = "projectBridges"; + static final String TOILET_LIST = "toilets"; public static final long HALF_YEAR = 180 * 60 * 60 * 24 * 1000L; public static final long ONE_YEAR = 365 * 60 * 60 * 24 * 1000L; diff --git a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java b/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java deleted file mode 100644 index 0286bb6..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.dcms.utils; - -import android.graphics.Rect; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -public class ItemDecorationSpace extends RecyclerView.ItemDecoration { - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (parent.getChildAdapterPosition(view) % 2 == 0) { - outRect.left = 0; - outRect.right = 5; - } else if (parent.getChildAdapterPosition(view) % 2 == 1) { - outRect.left = 5; - outRect.right = 0; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 4dd4dbd..cac58c5 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,7 +4,14 @@ import android.util.Log; import com.casic.dcms.R; +import com.casic.dcms.bean.HomePageBean; +import com.casic.dcms.bean.ProjectConfigBean; +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -21,44 +28,45 @@ return (String) SaveKeyValues.getValue("userAccount", ""); } - public static void saveUserId(String userId) { - SaveKeyValues.putValue("userId", userId); + public static void saveUserBean(String userBeanJson) { + SaveKeyValues.putValue(Constant.USER_BEAN, userBeanJson); } - public static String getUserId() { - return (String) SaveKeyValues.getValue("userId", ""); + public static UserBean.DataBean getUserBean() { + String userBeanJson = (String) SaveKeyValues.getValue(Constant.USER_BEAN, ""); + UserBean.DataBean dataBean = new UserBean.DataBean(); + if (userBeanJson.equals("")) { + return dataBean; + } + return new Gson().fromJson(userBeanJson, UserBean.DataBean.class); } - public static void saveUserName(String name) { - SaveKeyValues.putValue("userName", name); + public static void saveBridgeList(String bridgesJson) { + SaveKeyValues.putValue(Constant.BRIDGE_LIST, bridgesJson); } - public static String getUserName() { - return (String) SaveKeyValues.getValue("userName", ""); + public static List getBridgeBeanList() { + String bridgesJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); + List bridges = new ArrayList<>(); + if (bridgesJson.equals("")) { + return bridges; + } + return new Gson().fromJson(bridgesJson, new TypeToken>() { + }.getType()); } - public static void saveUserPhone(String phone) { - SaveKeyValues.putValue("userPhone", phone); + public static void saveToiletList(String toiletsJson) { + SaveKeyValues.putValue(Constant.TOILET_LIST, toiletsJson); } - public static String getUserPhone() { - return (String) SaveKeyValues.getValue("userPhone", ""); - } - - public static void saveUserDept(String dept) { - SaveKeyValues.putValue("userDept", dept); - } - - public static String getUserDept() { - return (String) SaveKeyValues.getValue("userDept", ""); - } - - public static void saveUserDeptId(String deptid) { - SaveKeyValues.putValue("userDeptId", deptid); - } - - public static String getUserDeptId() { - return (String) SaveKeyValues.getValue("userDeptId", ""); + public static List getToiletBeanList() { + String toiletsJson = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); + List toilets = new ArrayList<>(); + if (toiletsJson.equals("")) { + return toilets; + } + return new Gson().fromJson(toiletsJson, new TypeToken>() { + }.getType()); } public static boolean isLetterAndDigit(String str) { diff --git a/app/src/main/res/drawable/ic_package_holder.xml b/app/src/main/res/drawable/ic_package_holder.xml deleted file mode 100644 index 1f5ad5e..0000000 --- a/app/src/main/res/drawable/ic_package_holder.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 1d21c58..b376886 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -50,10 +50,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -95,10 +94,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -142,10 +140,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - @@ -38,10 +37,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -53,10 +51,9 @@ style="@style/noPointTextViewStyle" android:text="核查图片" /> - diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index e754c14..7d7a7c2 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -136,10 +136,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -151,10 +150,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -166,10 +164,9 @@ style="@style/noPointTextViewStyle" android:text="核查图片" /> - diff --git a/app/src/main/res/layout/activity_case_handle_detail.xml b/app/src/main/res/layout/activity_case_handle_detail.xml index 4cc674c..19a1a4a 100644 --- a/app/src/main/res/layout/activity_case_handle_detail.xml +++ b/app/src/main/res/layout/activity_case_handle_detail.xml @@ -22,16 +22,13 @@ - + @@ -132,10 +129,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - @@ -150,10 +149,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - diff --git a/app/src/main/res/layout/activity_case_todo_detail.xml b/app/src/main/res/layout/activity_case_todo_detail.xml index 345ca19..255a52e 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -97,10 +97,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_todo_handled_detail.xml b/app/src/main/res/layout/activity_case_todo_handled_detail.xml index a929b43..2bb8cf1 100644 --- a/app/src/main/res/layout/activity_case_todo_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_handled_detail.xml @@ -151,10 +151,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_verified_detail.xml b/app/src/main/res/layout/activity_case_verified_detail.xml index 394d248..a39e000 100644 --- a/app/src/main/res/layout/activity_case_verified_detail.xml +++ b/app/src/main/res/layout/activity_case_verified_detail.xml @@ -50,10 +50,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_verify_detail.xml b/app/src/main/res/layout/activity_case_verify_detail.xml index 0c90a09..1220507 100644 --- a/app/src/main/res/layout/activity_case_verify_detail.xml +++ b/app/src/main/res/layout/activity_case_verify_detail.xml @@ -76,10 +76,9 @@ style="@style/tagTextViewStyle" android:text="案卷图片" /> - - + @@ -130,7 +127,6 @@ android:id="@+id/phoneNumberView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="@dimen/margin_10dp" android:background="@null" android:hint="请输入店主手机号码" android:inputType="phone" @@ -145,6 +141,7 @@ @@ -153,14 +150,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:orientation="vertical"> - + diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 91bf9f9..e3a2c99 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -11,7 +11,9 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -20,13 +22,11 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -104,8 +103,8 @@ JzvdStd videoPlayerView; @BindView(R.id.addImageView) ImageView addImageView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -125,7 +124,7 @@ private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; private UploadVideoPresenterImpl uploadVideoPresenter; private String audioUrl, videoUrl; @@ -164,10 +163,8 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @SuppressLint("ClickableViewAccessibility") @@ -534,7 +531,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); imageList.add(url); @@ -542,21 +539,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -618,7 +615,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index aa02a1c..b7b71f5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -62,8 +61,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -73,7 +72,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -97,10 +96,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -217,7 +214,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -273,7 +270,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -281,21 +278,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 964490e..f4f3501 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -29,7 +29,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -71,8 +70,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -90,7 +89,7 @@ private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; @Override @@ -115,10 +114,8 @@ .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -331,28 +328,28 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -401,7 +398,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b8f97ec..496edba 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -57,8 +56,8 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -121,19 +120,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index c3b3b66..5f6a3e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -39,7 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -87,16 +86,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseOpinionView) TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; - @BindView(R.id.caseVerifyRecyclerView) - RecyclerView caseVerifyRecyclerView; + @BindView(R.id.verifyGridView) + GridView verifyGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -139,7 +138,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private ImageRecycleViewAdapter verifyImageAdapter; + private ImageGridViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -168,10 +167,8 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); - verifyImageAdapter = new ImageRecycleViewAdapter(this); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(verifyImageAdapter); + verifyImageAdapter = new ImageGridViewAdapter(this); + verifyGridView.setAdapter(verifyImageAdapter); } @Override @@ -226,19 +223,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -386,7 +381,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -402,7 +397,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -533,7 +528,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = verifyImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -541,22 +536,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); //九宫格点击事件 - verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + verifyGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - verifyImageAdapter.setDeleteView(true); - verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + verifyImageAdapter.isDeleteVisible(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 3cedbfe..8b08041 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -57,8 +56,8 @@ EditText shopKeeperView; @BindView(R.id.phoneNumberView) EditText phoneNumberView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -67,7 +66,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopChangePresenterImpl shopChangePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; private ArrayList realPaths = new ArrayList<>();//真实图片路径 @@ -91,10 +90,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -153,7 +150,7 @@ ToastHelper.showToast("店主名还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -235,7 +232,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -243,21 +240,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 381b704..d371d17 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -80,7 +80,7 @@ @Override public void initEvent() { - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", "", "", pageIndex); + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); calendarView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -98,7 +98,7 @@ endGroup = endGroupPosition;//结束月份位置 endChild = endChildPosition;//结束对应月份中日的位置 dateView.setText(startDate + "~" + endDate); - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", startDate, endDate, pageIndex); } }).builder(); @@ -110,7 +110,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); @@ -119,7 +119,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0d7053a..3662274 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -3,17 +3,17 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -27,7 +27,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAdjustFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -66,14 +65,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.optionEditView) @@ -207,19 +206,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -250,19 +247,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index bd491c3..19b9039 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAuthorizeFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -70,14 +69,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -264,19 +263,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -307,19 +304,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java index f22a99d..797b130 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -32,7 +32,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -71,14 +70,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -157,19 +156,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -200,19 +197,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 1c1fcd0..e40d2cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -22,9 +22,11 @@ import com.casic.dcms.base.BaseApplication; import com.casic.dcms.base.DoubleClickExitActivity; import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.HomePageBean; import com.casic.dcms.bean.NoticeBean; import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.greendao.NoticeBeanDao; import com.casic.dcms.mvp.presenter.PushRegisterPresenterImpl; import com.casic.dcms.mvp.presenter.ToiletListPresenterImpl; @@ -44,6 +46,8 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StatusBarColorUtil; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.callback.IHttpRequestListener; import com.casic.dcms.widgets.NoScrollViewPager; import com.google.android.material.bottomnavigation.BottomNavigationView; @@ -59,7 +63,8 @@ import butterknife.BindView; import okhttp3.ResponseBody; -public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, IPushRegisterView, IToiletListView { +public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, + IPushRegisterView, IToiletListView { private static final String TAG = "MainActivity"; @BindView(R.id.pageTitleView) @@ -100,18 +105,17 @@ uploadPositionPresenter = new UploadPositionPresenterImpl(this); registerPresenter = new PushRegisterPresenterImpl(this); toiletListPresenter = new ToiletListPresenterImpl(this); - gson = new Gson(); + //获取配置项 + obtainProjectConfig(); + //配置页面 pageList = new ArrayList<>(); pageList.add(new HomePageFragment()); pageList.add(new PhonePageFragment()); pageList.add(new NoticePageFragment()); pageList.add(new MinePageFragment()); + imei = OtherUtils.obtainSimCardSerialNumber(this); - - //获取配置项 - obtainProjectConfig(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UploadLocationService.class)); } else { @@ -128,7 +132,7 @@ try { String resultStr = resultBean.string(); List bridges = gson.fromJson(resultStr, ProjectConfigBean.class).getBridges(); - SaveKeyValues.putValue(Constant.BRIDGE_LIST, gson.toJson(bridges)); + StringHelper.saveBridgeList(gson.toJson(bridges)); } catch (IOException e) { e.printStackTrace(); } @@ -310,7 +314,7 @@ @Override public void obtainToiletListData(ToiletListBean resultBean) { if (resultBean.isSuccess()) { - SaveKeyValues.putValue(Constant.TOILET_LIST, gson.toJson(resultBean.getData())); + StringHelper.saveToiletList(gson.toJson(resultBean.getData())); } } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 441625b..fe48830 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -3,18 +3,16 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -44,16 +42,16 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.punishTypeView) TextView punishTypeView; @BindView(R.id.punishOpinionView) TextView punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.punishDateView) TextView punishDateView; @@ -106,19 +104,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -131,19 +127,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处罚记录 @@ -158,19 +152,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + punishGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } punishDateView.setText(data.getPunishTime()); } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index 1dec74b..6711568 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -5,7 +5,9 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; @@ -13,11 +15,9 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; @@ -78,8 +77,8 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.line1) @@ -90,8 +89,8 @@ View line2; @BindView(R.id.reasonLayout) RelativeLayout reasonLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.addHandleImageView) ImageView addHandleImageView; @BindView(R.id.caseReasonView) @@ -102,8 +101,8 @@ TextView punishTypeView; @BindView(R.id.punishOpinionView) EditText punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.addPunishImageView) ImageView addPunishImageView; @BindView(R.id.punishDateView) @@ -120,7 +119,8 @@ private ArrayList punishRealPaths = new ArrayList<>();//真实图片路径 private List handleImageList = new ArrayList<>();//上传到服务器的数据集 private List punishImageList = new ArrayList<>();//上传到服务器的数据集 - private ImageRecycleViewAdapter punishImageAdapter, handleImageAdapter; + private ImageGridViewAdapter handleImageAdapter; + private ImageGridViewAdapter punishImageAdapter; private CaseNextNodePresenterImpl caseNextNodePresenter; private String changeState; private String approvalResult; @@ -155,17 +155,13 @@ .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); //处罚adapter - punishImageAdapter = new ImageRecycleViewAdapter(this); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(punishImageAdapter); + punishImageAdapter = new ImageGridViewAdapter(this); + punishGridView.setAdapter(punishImageAdapter); //下级结点 caseNextNodePresenter = new CaseNextNodePresenterImpl(this); - //案卷处理adapter - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); caseHandlePresenter = new CaseHandlePresenterImpl(this); packageHandlePresenter = new PackageHandlePresenterImpl(this); @@ -206,19 +202,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -231,19 +225,16 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + handleImageAdapter.setImageList(urls); + handleGridView.setAdapter(handleImageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + handleImageAdapter.isDeleteVisible(true); } } } @@ -382,7 +373,7 @@ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg if (isAddHandleImage) { //处理图片 - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); handleImageList.add(url); @@ -390,22 +381,22 @@ if (handleRealPaths.size() == 2) { addHandleImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, handleRealPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { handleImageList.remove(position); handleRealPaths.remove(position); - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); if (handleRealPaths.size() != 2) { addHandleImageView.setVisibility(View.VISIBLE); } @@ -416,7 +407,7 @@ } } else { //处罚图片 - int sumItemCount = punishImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = punishImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); punishImageList.add(url); @@ -424,21 +415,21 @@ if (punishRealPaths.size() == 2) { addPunishImageView.setVisibility(View.GONE); } - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); //九宫格点击事件 - punishImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, punishRealPaths); } }); //删除按钮点击事件 - punishImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + punishImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { punishImageList.remove(position); punishRealPaths.remove(position); - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); if (punishRealPaths.size() != 2) { addPunishImageView.setVisibility(View.VISIBLE); } @@ -506,7 +497,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index 7e3d47e..7c58e30 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -31,7 +31,6 @@ import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; @@ -50,8 +49,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; @@ -216,16 +213,14 @@ mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.obtainToiletIdLayout: - String toiletValue = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); - if (toiletValue.equals("")) { + List toiletBeanList = StringHelper.getToiletBeanList(); + if (toiletBeanList.size() == 0) { ToastHelper.showToast("获取公厕数据失败，请联系管理员", ToastHelper.ERROR); return; } - List dataBeans = new Gson().fromJson(toiletValue, new TypeToken>() { - }.getType()); QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("请选择您要打卡的公厕"); - for (ToiletListBean.DataBean it : dataBeans) { + for (ToiletListBean.DataBean it : toiletBeanList) { sheetBuilder.addItem(it.getName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -233,7 +228,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - toiletIdView.setText(dataBeans.get(position).getId()); + toiletIdView.setText(toiletBeanList.get(position).getId()); //TODO 是否需要将地图移到相应的公厕，待定 } }).build().show(); @@ -308,7 +303,7 @@ ToastHelper.showToast("保洁开始时间不能为空", ToastHelper.WARING); return; } - cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserId(), + cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, endTimeView.getText().toString(), imagePath, StringHelper.filterString(workContentView.getText().toString())); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 3a8ebc6..9f316a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -7,6 +7,7 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.utils.StringHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; @@ -47,9 +48,10 @@ @Override public void initData() { - userNameView.setText(StringHelper.getUserName()); - userPhoneView.setText(StringHelper.getUserPhone()); - userDeptView.setText(StringHelper.getUserDept()); + UserBean.DataBean userBean = StringHelper.getUserBean(); + userNameView.setText(userBean.getName()); + userPhoneView.setText(userBean.getPhone()); + userDeptView.setText(userBean.getDeptName()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index d9656aa..16bd2e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -39,6 +39,7 @@ import com.casic.dcms.ui.UrgentCaseActivity; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import butterknife.BindView; @@ -74,36 +75,38 @@ @Override protected void initData() { - userDataPresenter = new UserDataPresenterImpl(this); homePagePresenter = new HomePagePresenterImpl(this); + userDataPresenter = new UserDataPresenterImpl(this); + + //用户信息 + userDataPresenter.onReadyRetrofitRequest(); + //首页相关功能项 + homePagePresenter.onReadyRetrofitRequest("05"); } @Override protected void initEvent() { - userDataPresenter.onReadyRetrofitRequest(); - homePagePresenter.onReadyRetrofitRequest("05"); + //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 +// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); + Glide.with(this).load(R.mipmap.app_logo).into(userIconView); } @SuppressLint("SetTextI18n") @Override public void obtainUserData(UserBean userBean) { if (userBean.isSuccess()) { - //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 -// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); - Glide.with(this).load(R.mipmap.app_logo).into(userIconView); + UserBean.DataBean dataBean = userBean.getData(); + StringHelper.saveUserBean(new Gson().toJson(dataBean)); - UserBean.DataBean data = userBean.getData(); - userNameView.setText(data.getName()); - userDeptView.setText(data.getDeptName() + data.getRoleNames()); - - StringHelper.saveUserName(data.getName()); - StringHelper.saveUserPhone(data.getPhone()); - StringHelper.saveUserDept(data.getDeptName()); - StringHelper.saveUserDeptId(data.getDeptId()); - StringHelper.saveUserId(data.getId()); + userNameView.setText(dataBean.getName()); + userDeptView.setText(dataBean.getDeptName() + dataBean.getRoleNames()); } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); + } @Override public void obtainHomePageResult(HomePageBean resultBean) { @@ -183,11 +186,6 @@ } @Override - public void obtainDataFail() { - ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); - } - - @Override public void onDestroyView() { super.onDestroyView(); if (userDataPresenter != null) { @@ -197,4 +195,4 @@ homePagePresenter.disposeRetrofitRequest(); } } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 1657341..13aa09b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -76,7 +76,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserDeptId()); + phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 9e3437c..859d2ac 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -37,8 +37,9 @@ Color.rgb(120, 104, 230)}; public static final String IP_KEY = "ip"; - public static final String BRIDGE_LIST = "projectBridges"; - public static final String TOILET_LIST = "toilets"; + static final String USER_BEAN = "userBean"; + static final String BRIDGE_LIST = "projectBridges"; + static final String TOILET_LIST = "toilets"; public static final long HALF_YEAR = 180 * 60 * 60 * 24 * 1000L; public static final long ONE_YEAR = 365 * 60 * 60 * 24 * 1000L; diff --git a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java b/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java deleted file mode 100644 index 0286bb6..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.dcms.utils; - -import android.graphics.Rect; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -public class ItemDecorationSpace extends RecyclerView.ItemDecoration { - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (parent.getChildAdapterPosition(view) % 2 == 0) { - outRect.left = 0; - outRect.right = 5; - } else if (parent.getChildAdapterPosition(view) % 2 == 1) { - outRect.left = 5; - outRect.right = 0; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 4dd4dbd..cac58c5 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,7 +4,14 @@ import android.util.Log; import com.casic.dcms.R; +import com.casic.dcms.bean.HomePageBean; +import com.casic.dcms.bean.ProjectConfigBean; +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -21,44 +28,45 @@ return (String) SaveKeyValues.getValue("userAccount", ""); } - public static void saveUserId(String userId) { - SaveKeyValues.putValue("userId", userId); + public static void saveUserBean(String userBeanJson) { + SaveKeyValues.putValue(Constant.USER_BEAN, userBeanJson); } - public static String getUserId() { - return (String) SaveKeyValues.getValue("userId", ""); + public static UserBean.DataBean getUserBean() { + String userBeanJson = (String) SaveKeyValues.getValue(Constant.USER_BEAN, ""); + UserBean.DataBean dataBean = new UserBean.DataBean(); + if (userBeanJson.equals("")) { + return dataBean; + } + return new Gson().fromJson(userBeanJson, UserBean.DataBean.class); } - public static void saveUserName(String name) { - SaveKeyValues.putValue("userName", name); + public static void saveBridgeList(String bridgesJson) { + SaveKeyValues.putValue(Constant.BRIDGE_LIST, bridgesJson); } - public static String getUserName() { - return (String) SaveKeyValues.getValue("userName", ""); + public static List getBridgeBeanList() { + String bridgesJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); + List bridges = new ArrayList<>(); + if (bridgesJson.equals("")) { + return bridges; + } + return new Gson().fromJson(bridgesJson, new TypeToken>() { + }.getType()); } - public static void saveUserPhone(String phone) { - SaveKeyValues.putValue("userPhone", phone); + public static void saveToiletList(String toiletsJson) { + SaveKeyValues.putValue(Constant.TOILET_LIST, toiletsJson); } - public static String getUserPhone() { - return (String) SaveKeyValues.getValue("userPhone", ""); - } - - public static void saveUserDept(String dept) { - SaveKeyValues.putValue("userDept", dept); - } - - public static String getUserDept() { - return (String) SaveKeyValues.getValue("userDept", ""); - } - - public static void saveUserDeptId(String deptid) { - SaveKeyValues.putValue("userDeptId", deptid); - } - - public static String getUserDeptId() { - return (String) SaveKeyValues.getValue("userDeptId", ""); + public static List getToiletBeanList() { + String toiletsJson = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); + List toilets = new ArrayList<>(); + if (toiletsJson.equals("")) { + return toilets; + } + return new Gson().fromJson(toiletsJson, new TypeToken>() { + }.getType()); } public static boolean isLetterAndDigit(String str) { diff --git a/app/src/main/res/drawable/ic_package_holder.xml b/app/src/main/res/drawable/ic_package_holder.xml deleted file mode 100644 index 1f5ad5e..0000000 --- a/app/src/main/res/drawable/ic_package_holder.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 1d21c58..b376886 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -50,10 +50,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -95,10 +94,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -142,10 +140,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - @@ -38,10 +37,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -53,10 +51,9 @@ style="@style/noPointTextViewStyle" android:text="核查图片" /> - diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index e754c14..7d7a7c2 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -136,10 +136,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -151,10 +150,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -166,10 +164,9 @@ style="@style/noPointTextViewStyle" android:text="核查图片" /> - diff --git a/app/src/main/res/layout/activity_case_handle_detail.xml b/app/src/main/res/layout/activity_case_handle_detail.xml index 4cc674c..19a1a4a 100644 --- a/app/src/main/res/layout/activity_case_handle_detail.xml +++ b/app/src/main/res/layout/activity_case_handle_detail.xml @@ -22,16 +22,13 @@ - + @@ -132,10 +129,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - @@ -150,10 +149,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - diff --git a/app/src/main/res/layout/activity_case_todo_detail.xml b/app/src/main/res/layout/activity_case_todo_detail.xml index 345ca19..255a52e 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -97,10 +97,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_todo_handled_detail.xml b/app/src/main/res/layout/activity_case_todo_handled_detail.xml index a929b43..2bb8cf1 100644 --- a/app/src/main/res/layout/activity_case_todo_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_handled_detail.xml @@ -151,10 +151,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_verified_detail.xml b/app/src/main/res/layout/activity_case_verified_detail.xml index 394d248..a39e000 100644 --- a/app/src/main/res/layout/activity_case_verified_detail.xml +++ b/app/src/main/res/layout/activity_case_verified_detail.xml @@ -50,10 +50,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_verify_detail.xml b/app/src/main/res/layout/activity_case_verify_detail.xml index 0c90a09..1220507 100644 --- a/app/src/main/res/layout/activity_case_verify_detail.xml +++ b/app/src/main/res/layout/activity_case_verify_detail.xml @@ -76,10 +76,9 @@ style="@style/tagTextViewStyle" android:text="案卷图片" /> - - + @@ -130,7 +127,6 @@ android:id="@+id/phoneNumberView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="@dimen/margin_10dp" android:background="@null" android:hint="请输入店主手机号码" android:inputType="phone" @@ -145,6 +141,7 @@ @@ -153,14 +150,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:orientation="vertical"> - + diff --git a/app/src/main/res/layout/activity_dept_authorize.xml b/app/src/main/res/layout/activity_dept_authorize.xml index b097a6e..22934d5 100644 --- a/app/src/main/res/layout/activity_dept_authorize.xml +++ b/app/src/main/res/layout/activity_dept_authorize.xml @@ -76,7 +76,6 @@ android:id="@+id/optionEditView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:background="@null" android:hint="请输入少于50个字的处理意见" android:maxLength="50" /> diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 91bf9f9..e3a2c99 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -11,7 +11,9 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -20,13 +22,11 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -104,8 +103,8 @@ JzvdStd videoPlayerView; @BindView(R.id.addImageView) ImageView addImageView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -125,7 +124,7 @@ private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; private UploadVideoPresenterImpl uploadVideoPresenter; private String audioUrl, videoUrl; @@ -164,10 +163,8 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @SuppressLint("ClickableViewAccessibility") @@ -534,7 +531,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); imageList.add(url); @@ -542,21 +539,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -618,7 +615,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index aa02a1c..b7b71f5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -62,8 +61,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -73,7 +72,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -97,10 +96,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -217,7 +214,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -273,7 +270,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -281,21 +278,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 964490e..f4f3501 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -29,7 +29,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -71,8 +70,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -90,7 +89,7 @@ private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; @Override @@ -115,10 +114,8 @@ .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -331,28 +328,28 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -401,7 +398,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b8f97ec..496edba 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -57,8 +56,8 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -121,19 +120,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index c3b3b66..5f6a3e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -39,7 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -87,16 +86,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseOpinionView) TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; - @BindView(R.id.caseVerifyRecyclerView) - RecyclerView caseVerifyRecyclerView; + @BindView(R.id.verifyGridView) + GridView verifyGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -139,7 +138,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private ImageRecycleViewAdapter verifyImageAdapter; + private ImageGridViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -168,10 +167,8 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); - verifyImageAdapter = new ImageRecycleViewAdapter(this); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(verifyImageAdapter); + verifyImageAdapter = new ImageGridViewAdapter(this); + verifyGridView.setAdapter(verifyImageAdapter); } @Override @@ -226,19 +223,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -386,7 +381,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -402,7 +397,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -533,7 +528,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = verifyImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -541,22 +536,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); //九宫格点击事件 - verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + verifyGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - verifyImageAdapter.setDeleteView(true); - verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + verifyImageAdapter.isDeleteVisible(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 3cedbfe..8b08041 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -57,8 +56,8 @@ EditText shopKeeperView; @BindView(R.id.phoneNumberView) EditText phoneNumberView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -67,7 +66,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopChangePresenterImpl shopChangePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; private ArrayList realPaths = new ArrayList<>();//真实图片路径 @@ -91,10 +90,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -153,7 +150,7 @@ ToastHelper.showToast("店主名还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -235,7 +232,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -243,21 +240,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 381b704..d371d17 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -80,7 +80,7 @@ @Override public void initEvent() { - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", "", "", pageIndex); + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); calendarView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -98,7 +98,7 @@ endGroup = endGroupPosition;//结束月份位置 endChild = endChildPosition;//结束对应月份中日的位置 dateView.setText(startDate + "~" + endDate); - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", startDate, endDate, pageIndex); } }).builder(); @@ -110,7 +110,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); @@ -119,7 +119,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0d7053a..3662274 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -3,17 +3,17 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -27,7 +27,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAdjustFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -66,14 +65,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.optionEditView) @@ -207,19 +206,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -250,19 +247,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index bd491c3..19b9039 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAuthorizeFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -70,14 +69,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -264,19 +263,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -307,19 +304,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java index f22a99d..797b130 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -32,7 +32,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -71,14 +70,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -157,19 +156,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -200,19 +197,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 1c1fcd0..e40d2cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -22,9 +22,11 @@ import com.casic.dcms.base.BaseApplication; import com.casic.dcms.base.DoubleClickExitActivity; import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.HomePageBean; import com.casic.dcms.bean.NoticeBean; import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.greendao.NoticeBeanDao; import com.casic.dcms.mvp.presenter.PushRegisterPresenterImpl; import com.casic.dcms.mvp.presenter.ToiletListPresenterImpl; @@ -44,6 +46,8 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StatusBarColorUtil; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.callback.IHttpRequestListener; import com.casic.dcms.widgets.NoScrollViewPager; import com.google.android.material.bottomnavigation.BottomNavigationView; @@ -59,7 +63,8 @@ import butterknife.BindView; import okhttp3.ResponseBody; -public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, IPushRegisterView, IToiletListView { +public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, + IPushRegisterView, IToiletListView { private static final String TAG = "MainActivity"; @BindView(R.id.pageTitleView) @@ -100,18 +105,17 @@ uploadPositionPresenter = new UploadPositionPresenterImpl(this); registerPresenter = new PushRegisterPresenterImpl(this); toiletListPresenter = new ToiletListPresenterImpl(this); - gson = new Gson(); + //获取配置项 + obtainProjectConfig(); + //配置页面 pageList = new ArrayList<>(); pageList.add(new HomePageFragment()); pageList.add(new PhonePageFragment()); pageList.add(new NoticePageFragment()); pageList.add(new MinePageFragment()); + imei = OtherUtils.obtainSimCardSerialNumber(this); - - //获取配置项 - obtainProjectConfig(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UploadLocationService.class)); } else { @@ -128,7 +132,7 @@ try { String resultStr = resultBean.string(); List bridges = gson.fromJson(resultStr, ProjectConfigBean.class).getBridges(); - SaveKeyValues.putValue(Constant.BRIDGE_LIST, gson.toJson(bridges)); + StringHelper.saveBridgeList(gson.toJson(bridges)); } catch (IOException e) { e.printStackTrace(); } @@ -310,7 +314,7 @@ @Override public void obtainToiletListData(ToiletListBean resultBean) { if (resultBean.isSuccess()) { - SaveKeyValues.putValue(Constant.TOILET_LIST, gson.toJson(resultBean.getData())); + StringHelper.saveToiletList(gson.toJson(resultBean.getData())); } } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 441625b..fe48830 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -3,18 +3,16 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -44,16 +42,16 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.punishTypeView) TextView punishTypeView; @BindView(R.id.punishOpinionView) TextView punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.punishDateView) TextView punishDateView; @@ -106,19 +104,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -131,19 +127,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处罚记录 @@ -158,19 +152,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + punishGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } punishDateView.setText(data.getPunishTime()); } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index 1dec74b..6711568 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -5,7 +5,9 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; @@ -13,11 +15,9 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; @@ -78,8 +77,8 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.line1) @@ -90,8 +89,8 @@ View line2; @BindView(R.id.reasonLayout) RelativeLayout reasonLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.addHandleImageView) ImageView addHandleImageView; @BindView(R.id.caseReasonView) @@ -102,8 +101,8 @@ TextView punishTypeView; @BindView(R.id.punishOpinionView) EditText punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.addPunishImageView) ImageView addPunishImageView; @BindView(R.id.punishDateView) @@ -120,7 +119,8 @@ private ArrayList punishRealPaths = new ArrayList<>();//真实图片路径 private List handleImageList = new ArrayList<>();//上传到服务器的数据集 private List punishImageList = new ArrayList<>();//上传到服务器的数据集 - private ImageRecycleViewAdapter punishImageAdapter, handleImageAdapter; + private ImageGridViewAdapter handleImageAdapter; + private ImageGridViewAdapter punishImageAdapter; private CaseNextNodePresenterImpl caseNextNodePresenter; private String changeState; private String approvalResult; @@ -155,17 +155,13 @@ .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); //处罚adapter - punishImageAdapter = new ImageRecycleViewAdapter(this); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(punishImageAdapter); + punishImageAdapter = new ImageGridViewAdapter(this); + punishGridView.setAdapter(punishImageAdapter); //下级结点 caseNextNodePresenter = new CaseNextNodePresenterImpl(this); - //案卷处理adapter - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); caseHandlePresenter = new CaseHandlePresenterImpl(this); packageHandlePresenter = new PackageHandlePresenterImpl(this); @@ -206,19 +202,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -231,19 +225,16 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + handleImageAdapter.setImageList(urls); + handleGridView.setAdapter(handleImageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + handleImageAdapter.isDeleteVisible(true); } } } @@ -382,7 +373,7 @@ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg if (isAddHandleImage) { //处理图片 - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); handleImageList.add(url); @@ -390,22 +381,22 @@ if (handleRealPaths.size() == 2) { addHandleImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, handleRealPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { handleImageList.remove(position); handleRealPaths.remove(position); - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); if (handleRealPaths.size() != 2) { addHandleImageView.setVisibility(View.VISIBLE); } @@ -416,7 +407,7 @@ } } else { //处罚图片 - int sumItemCount = punishImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = punishImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); punishImageList.add(url); @@ -424,21 +415,21 @@ if (punishRealPaths.size() == 2) { addPunishImageView.setVisibility(View.GONE); } - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); //九宫格点击事件 - punishImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, punishRealPaths); } }); //删除按钮点击事件 - punishImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + punishImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { punishImageList.remove(position); punishRealPaths.remove(position); - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); if (punishRealPaths.size() != 2) { addPunishImageView.setVisibility(View.VISIBLE); } @@ -506,7 +497,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index 7e3d47e..7c58e30 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -31,7 +31,6 @@ import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; @@ -50,8 +49,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; @@ -216,16 +213,14 @@ mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.obtainToiletIdLayout: - String toiletValue = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); - if (toiletValue.equals("")) { + List toiletBeanList = StringHelper.getToiletBeanList(); + if (toiletBeanList.size() == 0) { ToastHelper.showToast("获取公厕数据失败，请联系管理员", ToastHelper.ERROR); return; } - List dataBeans = new Gson().fromJson(toiletValue, new TypeToken>() { - }.getType()); QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("请选择您要打卡的公厕"); - for (ToiletListBean.DataBean it : dataBeans) { + for (ToiletListBean.DataBean it : toiletBeanList) { sheetBuilder.addItem(it.getName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -233,7 +228,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - toiletIdView.setText(dataBeans.get(position).getId()); + toiletIdView.setText(toiletBeanList.get(position).getId()); //TODO 是否需要将地图移到相应的公厕，待定 } }).build().show(); @@ -308,7 +303,7 @@ ToastHelper.showToast("保洁开始时间不能为空", ToastHelper.WARING); return; } - cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserId(), + cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, endTimeView.getText().toString(), imagePath, StringHelper.filterString(workContentView.getText().toString())); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 3a8ebc6..9f316a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -7,6 +7,7 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.utils.StringHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; @@ -47,9 +48,10 @@ @Override public void initData() { - userNameView.setText(StringHelper.getUserName()); - userPhoneView.setText(StringHelper.getUserPhone()); - userDeptView.setText(StringHelper.getUserDept()); + UserBean.DataBean userBean = StringHelper.getUserBean(); + userNameView.setText(userBean.getName()); + userPhoneView.setText(userBean.getPhone()); + userDeptView.setText(userBean.getDeptName()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index d9656aa..16bd2e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -39,6 +39,7 @@ import com.casic.dcms.ui.UrgentCaseActivity; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import butterknife.BindView; @@ -74,36 +75,38 @@ @Override protected void initData() { - userDataPresenter = new UserDataPresenterImpl(this); homePagePresenter = new HomePagePresenterImpl(this); + userDataPresenter = new UserDataPresenterImpl(this); + + //用户信息 + userDataPresenter.onReadyRetrofitRequest(); + //首页相关功能项 + homePagePresenter.onReadyRetrofitRequest("05"); } @Override protected void initEvent() { - userDataPresenter.onReadyRetrofitRequest(); - homePagePresenter.onReadyRetrofitRequest("05"); + //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 +// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); + Glide.with(this).load(R.mipmap.app_logo).into(userIconView); } @SuppressLint("SetTextI18n") @Override public void obtainUserData(UserBean userBean) { if (userBean.isSuccess()) { - //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 -// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); - Glide.with(this).load(R.mipmap.app_logo).into(userIconView); + UserBean.DataBean dataBean = userBean.getData(); + StringHelper.saveUserBean(new Gson().toJson(dataBean)); - UserBean.DataBean data = userBean.getData(); - userNameView.setText(data.getName()); - userDeptView.setText(data.getDeptName() + data.getRoleNames()); - - StringHelper.saveUserName(data.getName()); - StringHelper.saveUserPhone(data.getPhone()); - StringHelper.saveUserDept(data.getDeptName()); - StringHelper.saveUserDeptId(data.getDeptId()); - StringHelper.saveUserId(data.getId()); + userNameView.setText(dataBean.getName()); + userDeptView.setText(dataBean.getDeptName() + dataBean.getRoleNames()); } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); + } @Override public void obtainHomePageResult(HomePageBean resultBean) { @@ -183,11 +186,6 @@ } @Override - public void obtainDataFail() { - ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); - } - - @Override public void onDestroyView() { super.onDestroyView(); if (userDataPresenter != null) { @@ -197,4 +195,4 @@ homePagePresenter.disposeRetrofitRequest(); } } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 1657341..13aa09b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -76,7 +76,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserDeptId()); + phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 9e3437c..859d2ac 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -37,8 +37,9 @@ Color.rgb(120, 104, 230)}; public static final String IP_KEY = "ip"; - public static final String BRIDGE_LIST = "projectBridges"; - public static final String TOILET_LIST = "toilets"; + static final String USER_BEAN = "userBean"; + static final String BRIDGE_LIST = "projectBridges"; + static final String TOILET_LIST = "toilets"; public static final long HALF_YEAR = 180 * 60 * 60 * 24 * 1000L; public static final long ONE_YEAR = 365 * 60 * 60 * 24 * 1000L; diff --git a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java b/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java deleted file mode 100644 index 0286bb6..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.dcms.utils; - -import android.graphics.Rect; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -public class ItemDecorationSpace extends RecyclerView.ItemDecoration { - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (parent.getChildAdapterPosition(view) % 2 == 0) { - outRect.left = 0; - outRect.right = 5; - } else if (parent.getChildAdapterPosition(view) % 2 == 1) { - outRect.left = 5; - outRect.right = 0; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 4dd4dbd..cac58c5 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,7 +4,14 @@ import android.util.Log; import com.casic.dcms.R; +import com.casic.dcms.bean.HomePageBean; +import com.casic.dcms.bean.ProjectConfigBean; +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -21,44 +28,45 @@ return (String) SaveKeyValues.getValue("userAccount", ""); } - public static void saveUserId(String userId) { - SaveKeyValues.putValue("userId", userId); + public static void saveUserBean(String userBeanJson) { + SaveKeyValues.putValue(Constant.USER_BEAN, userBeanJson); } - public static String getUserId() { - return (String) SaveKeyValues.getValue("userId", ""); + public static UserBean.DataBean getUserBean() { + String userBeanJson = (String) SaveKeyValues.getValue(Constant.USER_BEAN, ""); + UserBean.DataBean dataBean = new UserBean.DataBean(); + if (userBeanJson.equals("")) { + return dataBean; + } + return new Gson().fromJson(userBeanJson, UserBean.DataBean.class); } - public static void saveUserName(String name) { - SaveKeyValues.putValue("userName", name); + public static void saveBridgeList(String bridgesJson) { + SaveKeyValues.putValue(Constant.BRIDGE_LIST, bridgesJson); } - public static String getUserName() { - return (String) SaveKeyValues.getValue("userName", ""); + public static List getBridgeBeanList() { + String bridgesJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); + List bridges = new ArrayList<>(); + if (bridgesJson.equals("")) { + return bridges; + } + return new Gson().fromJson(bridgesJson, new TypeToken>() { + }.getType()); } - public static void saveUserPhone(String phone) { - SaveKeyValues.putValue("userPhone", phone); + public static void saveToiletList(String toiletsJson) { + SaveKeyValues.putValue(Constant.TOILET_LIST, toiletsJson); } - public static String getUserPhone() { - return (String) SaveKeyValues.getValue("userPhone", ""); - } - - public static void saveUserDept(String dept) { - SaveKeyValues.putValue("userDept", dept); - } - - public static String getUserDept() { - return (String) SaveKeyValues.getValue("userDept", ""); - } - - public static void saveUserDeptId(String deptid) { - SaveKeyValues.putValue("userDeptId", deptid); - } - - public static String getUserDeptId() { - return (String) SaveKeyValues.getValue("userDeptId", ""); + public static List getToiletBeanList() { + String toiletsJson = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); + List toilets = new ArrayList<>(); + if (toiletsJson.equals("")) { + return toilets; + } + return new Gson().fromJson(toiletsJson, new TypeToken>() { + }.getType()); } public static boolean isLetterAndDigit(String str) { diff --git a/app/src/main/res/drawable/ic_package_holder.xml b/app/src/main/res/drawable/ic_package_holder.xml deleted file mode 100644 index 1f5ad5e..0000000 --- a/app/src/main/res/drawable/ic_package_holder.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 1d21c58..b376886 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -50,10 +50,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -95,10 +94,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -142,10 +140,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - @@ -38,10 +37,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -53,10 +51,9 @@ style="@style/noPointTextViewStyle" android:text="核查图片" /> - diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index e754c14..7d7a7c2 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -136,10 +136,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -151,10 +150,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -166,10 +164,9 @@ style="@style/noPointTextViewStyle" android:text="核查图片" /> - diff --git a/app/src/main/res/layout/activity_case_handle_detail.xml b/app/src/main/res/layout/activity_case_handle_detail.xml index 4cc674c..19a1a4a 100644 --- a/app/src/main/res/layout/activity_case_handle_detail.xml +++ b/app/src/main/res/layout/activity_case_handle_detail.xml @@ -22,16 +22,13 @@ - + @@ -132,10 +129,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - @@ -150,10 +149,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - diff --git a/app/src/main/res/layout/activity_case_todo_detail.xml b/app/src/main/res/layout/activity_case_todo_detail.xml index 345ca19..255a52e 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -97,10 +97,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_todo_handled_detail.xml b/app/src/main/res/layout/activity_case_todo_handled_detail.xml index a929b43..2bb8cf1 100644 --- a/app/src/main/res/layout/activity_case_todo_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_handled_detail.xml @@ -151,10 +151,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_verified_detail.xml b/app/src/main/res/layout/activity_case_verified_detail.xml index 394d248..a39e000 100644 --- a/app/src/main/res/layout/activity_case_verified_detail.xml +++ b/app/src/main/res/layout/activity_case_verified_detail.xml @@ -50,10 +50,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_verify_detail.xml b/app/src/main/res/layout/activity_case_verify_detail.xml index 0c90a09..1220507 100644 --- a/app/src/main/res/layout/activity_case_verify_detail.xml +++ b/app/src/main/res/layout/activity_case_verify_detail.xml @@ -76,10 +76,9 @@ style="@style/tagTextViewStyle" android:text="案卷图片" /> - - + @@ -130,7 +127,6 @@ android:id="@+id/phoneNumberView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="@dimen/margin_10dp" android:background="@null" android:hint="请输入店主手机号码" android:inputType="phone" @@ -145,6 +141,7 @@ @@ -153,14 +150,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:orientation="vertical"> - + diff --git a/app/src/main/res/layout/activity_dept_authorize.xml b/app/src/main/res/layout/activity_dept_authorize.xml index b097a6e..22934d5 100644 --- a/app/src/main/res/layout/activity_dept_authorize.xml +++ b/app/src/main/res/layout/activity_dept_authorize.xml @@ -76,7 +76,6 @@ android:id="@+id/optionEditView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:background="@null" android:hint="请输入少于50个字的处理意见" android:maxLength="50" /> diff --git a/app/src/main/res/layout/activity_dept_todo.xml b/app/src/main/res/layout/activity_dept_todo.xml index b097a6e..22934d5 100644 --- a/app/src/main/res/layout/activity_dept_todo.xml +++ b/app/src/main/res/layout/activity_dept_todo.xml @@ -76,7 +76,6 @@ android:id="@+id/optionEditView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:background="@null" android:hint="请输入少于50个字的处理意见" android:maxLength="50" /> diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 91bf9f9..e3a2c99 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -11,7 +11,9 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -20,13 +22,11 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -104,8 +103,8 @@ JzvdStd videoPlayerView; @BindView(R.id.addImageView) ImageView addImageView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -125,7 +124,7 @@ private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; private UploadVideoPresenterImpl uploadVideoPresenter; private String audioUrl, videoUrl; @@ -164,10 +163,8 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @SuppressLint("ClickableViewAccessibility") @@ -534,7 +531,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); imageList.add(url); @@ -542,21 +539,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -618,7 +615,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index aa02a1c..b7b71f5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -62,8 +61,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -73,7 +72,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -97,10 +96,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -217,7 +214,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -273,7 +270,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -281,21 +278,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 964490e..f4f3501 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -29,7 +29,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -71,8 +70,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -90,7 +89,7 @@ private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; @Override @@ -115,10 +114,8 @@ .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -331,28 +328,28 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -401,7 +398,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b8f97ec..496edba 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -57,8 +56,8 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -121,19 +120,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index c3b3b66..5f6a3e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -39,7 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -87,16 +86,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseOpinionView) TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; - @BindView(R.id.caseVerifyRecyclerView) - RecyclerView caseVerifyRecyclerView; + @BindView(R.id.verifyGridView) + GridView verifyGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -139,7 +138,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private ImageRecycleViewAdapter verifyImageAdapter; + private ImageGridViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -168,10 +167,8 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); - verifyImageAdapter = new ImageRecycleViewAdapter(this); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(verifyImageAdapter); + verifyImageAdapter = new ImageGridViewAdapter(this); + verifyGridView.setAdapter(verifyImageAdapter); } @Override @@ -226,19 +223,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -386,7 +381,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -402,7 +397,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -533,7 +528,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = verifyImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -541,22 +536,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); //九宫格点击事件 - verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + verifyGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - verifyImageAdapter.setDeleteView(true); - verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + verifyImageAdapter.isDeleteVisible(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 3cedbfe..8b08041 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -57,8 +56,8 @@ EditText shopKeeperView; @BindView(R.id.phoneNumberView) EditText phoneNumberView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -67,7 +66,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopChangePresenterImpl shopChangePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; private ArrayList realPaths = new ArrayList<>();//真实图片路径 @@ -91,10 +90,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -153,7 +150,7 @@ ToastHelper.showToast("店主名还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -235,7 +232,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -243,21 +240,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 381b704..d371d17 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -80,7 +80,7 @@ @Override public void initEvent() { - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", "", "", pageIndex); + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); calendarView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -98,7 +98,7 @@ endGroup = endGroupPosition;//结束月份位置 endChild = endChildPosition;//结束对应月份中日的位置 dateView.setText(startDate + "~" + endDate); - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", startDate, endDate, pageIndex); } }).builder(); @@ -110,7 +110,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); @@ -119,7 +119,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0d7053a..3662274 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -3,17 +3,17 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -27,7 +27,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAdjustFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -66,14 +65,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.optionEditView) @@ -207,19 +206,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -250,19 +247,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index bd491c3..19b9039 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAuthorizeFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -70,14 +69,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -264,19 +263,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -307,19 +304,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java index f22a99d..797b130 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -32,7 +32,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -71,14 +70,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -157,19 +156,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -200,19 +197,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 1c1fcd0..e40d2cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -22,9 +22,11 @@ import com.casic.dcms.base.BaseApplication; import com.casic.dcms.base.DoubleClickExitActivity; import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.HomePageBean; import com.casic.dcms.bean.NoticeBean; import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.greendao.NoticeBeanDao; import com.casic.dcms.mvp.presenter.PushRegisterPresenterImpl; import com.casic.dcms.mvp.presenter.ToiletListPresenterImpl; @@ -44,6 +46,8 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StatusBarColorUtil; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.callback.IHttpRequestListener; import com.casic.dcms.widgets.NoScrollViewPager; import com.google.android.material.bottomnavigation.BottomNavigationView; @@ -59,7 +63,8 @@ import butterknife.BindView; import okhttp3.ResponseBody; -public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, IPushRegisterView, IToiletListView { +public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, + IPushRegisterView, IToiletListView { private static final String TAG = "MainActivity"; @BindView(R.id.pageTitleView) @@ -100,18 +105,17 @@ uploadPositionPresenter = new UploadPositionPresenterImpl(this); registerPresenter = new PushRegisterPresenterImpl(this); toiletListPresenter = new ToiletListPresenterImpl(this); - gson = new Gson(); + //获取配置项 + obtainProjectConfig(); + //配置页面 pageList = new ArrayList<>(); pageList.add(new HomePageFragment()); pageList.add(new PhonePageFragment()); pageList.add(new NoticePageFragment()); pageList.add(new MinePageFragment()); + imei = OtherUtils.obtainSimCardSerialNumber(this); - - //获取配置项 - obtainProjectConfig(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UploadLocationService.class)); } else { @@ -128,7 +132,7 @@ try { String resultStr = resultBean.string(); List bridges = gson.fromJson(resultStr, ProjectConfigBean.class).getBridges(); - SaveKeyValues.putValue(Constant.BRIDGE_LIST, gson.toJson(bridges)); + StringHelper.saveBridgeList(gson.toJson(bridges)); } catch (IOException e) { e.printStackTrace(); } @@ -310,7 +314,7 @@ @Override public void obtainToiletListData(ToiletListBean resultBean) { if (resultBean.isSuccess()) { - SaveKeyValues.putValue(Constant.TOILET_LIST, gson.toJson(resultBean.getData())); + StringHelper.saveToiletList(gson.toJson(resultBean.getData())); } } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 441625b..fe48830 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -3,18 +3,16 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -44,16 +42,16 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.punishTypeView) TextView punishTypeView; @BindView(R.id.punishOpinionView) TextView punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.punishDateView) TextView punishDateView; @@ -106,19 +104,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -131,19 +127,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处罚记录 @@ -158,19 +152,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + punishGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } punishDateView.setText(data.getPunishTime()); } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index 1dec74b..6711568 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -5,7 +5,9 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; @@ -13,11 +15,9 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; @@ -78,8 +77,8 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.line1) @@ -90,8 +89,8 @@ View line2; @BindView(R.id.reasonLayout) RelativeLayout reasonLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.addHandleImageView) ImageView addHandleImageView; @BindView(R.id.caseReasonView) @@ -102,8 +101,8 @@ TextView punishTypeView; @BindView(R.id.punishOpinionView) EditText punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.addPunishImageView) ImageView addPunishImageView; @BindView(R.id.punishDateView) @@ -120,7 +119,8 @@ private ArrayList punishRealPaths = new ArrayList<>();//真实图片路径 private List handleImageList = new ArrayList<>();//上传到服务器的数据集 private List punishImageList = new ArrayList<>();//上传到服务器的数据集 - private ImageRecycleViewAdapter punishImageAdapter, handleImageAdapter; + private ImageGridViewAdapter handleImageAdapter; + private ImageGridViewAdapter punishImageAdapter; private CaseNextNodePresenterImpl caseNextNodePresenter; private String changeState; private String approvalResult; @@ -155,17 +155,13 @@ .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); //处罚adapter - punishImageAdapter = new ImageRecycleViewAdapter(this); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(punishImageAdapter); + punishImageAdapter = new ImageGridViewAdapter(this); + punishGridView.setAdapter(punishImageAdapter); //下级结点 caseNextNodePresenter = new CaseNextNodePresenterImpl(this); - //案卷处理adapter - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); caseHandlePresenter = new CaseHandlePresenterImpl(this); packageHandlePresenter = new PackageHandlePresenterImpl(this); @@ -206,19 +202,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -231,19 +225,16 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + handleImageAdapter.setImageList(urls); + handleGridView.setAdapter(handleImageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + handleImageAdapter.isDeleteVisible(true); } } } @@ -382,7 +373,7 @@ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg if (isAddHandleImage) { //处理图片 - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); handleImageList.add(url); @@ -390,22 +381,22 @@ if (handleRealPaths.size() == 2) { addHandleImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, handleRealPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { handleImageList.remove(position); handleRealPaths.remove(position); - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); if (handleRealPaths.size() != 2) { addHandleImageView.setVisibility(View.VISIBLE); } @@ -416,7 +407,7 @@ } } else { //处罚图片 - int sumItemCount = punishImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = punishImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); punishImageList.add(url); @@ -424,21 +415,21 @@ if (punishRealPaths.size() == 2) { addPunishImageView.setVisibility(View.GONE); } - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); //九宫格点击事件 - punishImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, punishRealPaths); } }); //删除按钮点击事件 - punishImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + punishImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { punishImageList.remove(position); punishRealPaths.remove(position); - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); if (punishRealPaths.size() != 2) { addPunishImageView.setVisibility(View.VISIBLE); } @@ -506,7 +497,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index 7e3d47e..7c58e30 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -31,7 +31,6 @@ import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; @@ -50,8 +49,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; @@ -216,16 +213,14 @@ mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.obtainToiletIdLayout: - String toiletValue = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); - if (toiletValue.equals("")) { + List toiletBeanList = StringHelper.getToiletBeanList(); + if (toiletBeanList.size() == 0) { ToastHelper.showToast("获取公厕数据失败，请联系管理员", ToastHelper.ERROR); return; } - List dataBeans = new Gson().fromJson(toiletValue, new TypeToken>() { - }.getType()); QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("请选择您要打卡的公厕"); - for (ToiletListBean.DataBean it : dataBeans) { + for (ToiletListBean.DataBean it : toiletBeanList) { sheetBuilder.addItem(it.getName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -233,7 +228,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - toiletIdView.setText(dataBeans.get(position).getId()); + toiletIdView.setText(toiletBeanList.get(position).getId()); //TODO 是否需要将地图移到相应的公厕，待定 } }).build().show(); @@ -308,7 +303,7 @@ ToastHelper.showToast("保洁开始时间不能为空", ToastHelper.WARING); return; } - cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserId(), + cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, endTimeView.getText().toString(), imagePath, StringHelper.filterString(workContentView.getText().toString())); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 3a8ebc6..9f316a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -7,6 +7,7 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.utils.StringHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; @@ -47,9 +48,10 @@ @Override public void initData() { - userNameView.setText(StringHelper.getUserName()); - userPhoneView.setText(StringHelper.getUserPhone()); - userDeptView.setText(StringHelper.getUserDept()); + UserBean.DataBean userBean = StringHelper.getUserBean(); + userNameView.setText(userBean.getName()); + userPhoneView.setText(userBean.getPhone()); + userDeptView.setText(userBean.getDeptName()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index d9656aa..16bd2e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -39,6 +39,7 @@ import com.casic.dcms.ui.UrgentCaseActivity; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import butterknife.BindView; @@ -74,36 +75,38 @@ @Override protected void initData() { - userDataPresenter = new UserDataPresenterImpl(this); homePagePresenter = new HomePagePresenterImpl(this); + userDataPresenter = new UserDataPresenterImpl(this); + + //用户信息 + userDataPresenter.onReadyRetrofitRequest(); + //首页相关功能项 + homePagePresenter.onReadyRetrofitRequest("05"); } @Override protected void initEvent() { - userDataPresenter.onReadyRetrofitRequest(); - homePagePresenter.onReadyRetrofitRequest("05"); + //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 +// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); + Glide.with(this).load(R.mipmap.app_logo).into(userIconView); } @SuppressLint("SetTextI18n") @Override public void obtainUserData(UserBean userBean) { if (userBean.isSuccess()) { - //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 -// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); - Glide.with(this).load(R.mipmap.app_logo).into(userIconView); + UserBean.DataBean dataBean = userBean.getData(); + StringHelper.saveUserBean(new Gson().toJson(dataBean)); - UserBean.DataBean data = userBean.getData(); - userNameView.setText(data.getName()); - userDeptView.setText(data.getDeptName() + data.getRoleNames()); - - StringHelper.saveUserName(data.getName()); - StringHelper.saveUserPhone(data.getPhone()); - StringHelper.saveUserDept(data.getDeptName()); - StringHelper.saveUserDeptId(data.getDeptId()); - StringHelper.saveUserId(data.getId()); + userNameView.setText(dataBean.getName()); + userDeptView.setText(dataBean.getDeptName() + dataBean.getRoleNames()); } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); + } @Override public void obtainHomePageResult(HomePageBean resultBean) { @@ -183,11 +186,6 @@ } @Override - public void obtainDataFail() { - ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); - } - - @Override public void onDestroyView() { super.onDestroyView(); if (userDataPresenter != null) { @@ -197,4 +195,4 @@ homePagePresenter.disposeRetrofitRequest(); } } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 1657341..13aa09b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -76,7 +76,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserDeptId()); + phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 9e3437c..859d2ac 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -37,8 +37,9 @@ Color.rgb(120, 104, 230)}; public static final String IP_KEY = "ip"; - public static final String BRIDGE_LIST = "projectBridges"; - public static final String TOILET_LIST = "toilets"; + static final String USER_BEAN = "userBean"; + static final String BRIDGE_LIST = "projectBridges"; + static final String TOILET_LIST = "toilets"; public static final long HALF_YEAR = 180 * 60 * 60 * 24 * 1000L; public static final long ONE_YEAR = 365 * 60 * 60 * 24 * 1000L; diff --git a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java b/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java deleted file mode 100644 index 0286bb6..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.dcms.utils; - -import android.graphics.Rect; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -public class ItemDecorationSpace extends RecyclerView.ItemDecoration { - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (parent.getChildAdapterPosition(view) % 2 == 0) { - outRect.left = 0; - outRect.right = 5; - } else if (parent.getChildAdapterPosition(view) % 2 == 1) { - outRect.left = 5; - outRect.right = 0; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 4dd4dbd..cac58c5 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,7 +4,14 @@ import android.util.Log; import com.casic.dcms.R; +import com.casic.dcms.bean.HomePageBean; +import com.casic.dcms.bean.ProjectConfigBean; +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -21,44 +28,45 @@ return (String) SaveKeyValues.getValue("userAccount", ""); } - public static void saveUserId(String userId) { - SaveKeyValues.putValue("userId", userId); + public static void saveUserBean(String userBeanJson) { + SaveKeyValues.putValue(Constant.USER_BEAN, userBeanJson); } - public static String getUserId() { - return (String) SaveKeyValues.getValue("userId", ""); + public static UserBean.DataBean getUserBean() { + String userBeanJson = (String) SaveKeyValues.getValue(Constant.USER_BEAN, ""); + UserBean.DataBean dataBean = new UserBean.DataBean(); + if (userBeanJson.equals("")) { + return dataBean; + } + return new Gson().fromJson(userBeanJson, UserBean.DataBean.class); } - public static void saveUserName(String name) { - SaveKeyValues.putValue("userName", name); + public static void saveBridgeList(String bridgesJson) { + SaveKeyValues.putValue(Constant.BRIDGE_LIST, bridgesJson); } - public static String getUserName() { - return (String) SaveKeyValues.getValue("userName", ""); + public static List getBridgeBeanList() { + String bridgesJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); + List bridges = new ArrayList<>(); + if (bridgesJson.equals("")) { + return bridges; + } + return new Gson().fromJson(bridgesJson, new TypeToken>() { + }.getType()); } - public static void saveUserPhone(String phone) { - SaveKeyValues.putValue("userPhone", phone); + public static void saveToiletList(String toiletsJson) { + SaveKeyValues.putValue(Constant.TOILET_LIST, toiletsJson); } - public static String getUserPhone() { - return (String) SaveKeyValues.getValue("userPhone", ""); - } - - public static void saveUserDept(String dept) { - SaveKeyValues.putValue("userDept", dept); - } - - public static String getUserDept() { - return (String) SaveKeyValues.getValue("userDept", ""); - } - - public static void saveUserDeptId(String deptid) { - SaveKeyValues.putValue("userDeptId", deptid); - } - - public static String getUserDeptId() { - return (String) SaveKeyValues.getValue("userDeptId", ""); + public static List getToiletBeanList() { + String toiletsJson = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); + List toilets = new ArrayList<>(); + if (toiletsJson.equals("")) { + return toilets; + } + return new Gson().fromJson(toiletsJson, new TypeToken>() { + }.getType()); } public static boolean isLetterAndDigit(String str) { diff --git a/app/src/main/res/drawable/ic_package_holder.xml b/app/src/main/res/drawable/ic_package_holder.xml deleted file mode 100644 index 1f5ad5e..0000000 --- a/app/src/main/res/drawable/ic_package_holder.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 1d21c58..b376886 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -50,10 +50,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -95,10 +94,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -142,10 +140,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - @@ -38,10 +37,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -53,10 +51,9 @@ style="@style/noPointTextViewStyle" android:text="核查图片" /> - diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index e754c14..7d7a7c2 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -136,10 +136,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -151,10 +150,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -166,10 +164,9 @@ style="@style/noPointTextViewStyle" android:text="核查图片" /> - diff --git a/app/src/main/res/layout/activity_case_handle_detail.xml b/app/src/main/res/layout/activity_case_handle_detail.xml index 4cc674c..19a1a4a 100644 --- a/app/src/main/res/layout/activity_case_handle_detail.xml +++ b/app/src/main/res/layout/activity_case_handle_detail.xml @@ -22,16 +22,13 @@ - + @@ -132,10 +129,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - @@ -150,10 +149,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - diff --git a/app/src/main/res/layout/activity_case_todo_detail.xml b/app/src/main/res/layout/activity_case_todo_detail.xml index 345ca19..255a52e 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -97,10 +97,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_todo_handled_detail.xml b/app/src/main/res/layout/activity_case_todo_handled_detail.xml index a929b43..2bb8cf1 100644 --- a/app/src/main/res/layout/activity_case_todo_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_handled_detail.xml @@ -151,10 +151,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_verified_detail.xml b/app/src/main/res/layout/activity_case_verified_detail.xml index 394d248..a39e000 100644 --- a/app/src/main/res/layout/activity_case_verified_detail.xml +++ b/app/src/main/res/layout/activity_case_verified_detail.xml @@ -50,10 +50,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_verify_detail.xml b/app/src/main/res/layout/activity_case_verify_detail.xml index 0c90a09..1220507 100644 --- a/app/src/main/res/layout/activity_case_verify_detail.xml +++ b/app/src/main/res/layout/activity_case_verify_detail.xml @@ -76,10 +76,9 @@ style="@style/tagTextViewStyle" android:text="案卷图片" /> - - + @@ -130,7 +127,6 @@ android:id="@+id/phoneNumberView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="@dimen/margin_10dp" android:background="@null" android:hint="请输入店主手机号码" android:inputType="phone" @@ -145,6 +141,7 @@ @@ -153,14 +150,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:orientation="vertical"> - + diff --git a/app/src/main/res/layout/activity_dept_authorize.xml b/app/src/main/res/layout/activity_dept_authorize.xml index b097a6e..22934d5 100644 --- a/app/src/main/res/layout/activity_dept_authorize.xml +++ b/app/src/main/res/layout/activity_dept_authorize.xml @@ -76,7 +76,6 @@ android:id="@+id/optionEditView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:background="@null" android:hint="请输入少于50个字的处理意见" android:maxLength="50" /> diff --git a/app/src/main/res/layout/activity_dept_todo.xml b/app/src/main/res/layout/activity_dept_todo.xml index b097a6e..22934d5 100644 --- a/app/src/main/res/layout/activity_dept_todo.xml +++ b/app/src/main/res/layout/activity_dept_todo.xml @@ -76,7 +76,6 @@ android:id="@+id/optionEditView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:background="@null" android:hint="请输入少于50个字的处理意见" android:maxLength="50" /> diff --git a/app/src/main/res/layout/activity_package_handled.xml b/app/src/main/res/layout/activity_package_handled.xml index 5298ba1..8791216 100644 --- a/app/src/main/res/layout/activity_package_handled.xml +++ b/app/src/main/res/layout/activity_package_handled.xml @@ -23,10 +23,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -66,10 +65,9 @@ style="@style/noPointTextViewStyle" android:text="处罚图片" /> - diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 91bf9f9..e3a2c99 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -11,7 +11,9 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -20,13 +22,11 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -104,8 +103,8 @@ JzvdStd videoPlayerView; @BindView(R.id.addImageView) ImageView addImageView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -125,7 +124,7 @@ private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; private UploadVideoPresenterImpl uploadVideoPresenter; private String audioUrl, videoUrl; @@ -164,10 +163,8 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @SuppressLint("ClickableViewAccessibility") @@ -534,7 +531,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); imageList.add(url); @@ -542,21 +539,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -618,7 +615,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index aa02a1c..b7b71f5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -62,8 +61,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -73,7 +72,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -97,10 +96,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -217,7 +214,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -273,7 +270,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -281,21 +278,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 964490e..f4f3501 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -29,7 +29,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -71,8 +70,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -90,7 +89,7 @@ private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; @Override @@ -115,10 +114,8 @@ .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -331,28 +328,28 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -401,7 +398,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b8f97ec..496edba 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -57,8 +56,8 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -121,19 +120,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index c3b3b66..5f6a3e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -39,7 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -87,16 +86,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseOpinionView) TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; - @BindView(R.id.caseVerifyRecyclerView) - RecyclerView caseVerifyRecyclerView; + @BindView(R.id.verifyGridView) + GridView verifyGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -139,7 +138,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private ImageRecycleViewAdapter verifyImageAdapter; + private ImageGridViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -168,10 +167,8 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); - verifyImageAdapter = new ImageRecycleViewAdapter(this); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(verifyImageAdapter); + verifyImageAdapter = new ImageGridViewAdapter(this); + verifyGridView.setAdapter(verifyImageAdapter); } @Override @@ -226,19 +223,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -386,7 +381,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -402,7 +397,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -533,7 +528,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = verifyImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -541,22 +536,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); //九宫格点击事件 - verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + verifyGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - verifyImageAdapter.setDeleteView(true); - verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + verifyImageAdapter.isDeleteVisible(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 3cedbfe..8b08041 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -57,8 +56,8 @@ EditText shopKeeperView; @BindView(R.id.phoneNumberView) EditText phoneNumberView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -67,7 +66,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopChangePresenterImpl shopChangePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; private ArrayList realPaths = new ArrayList<>();//真实图片路径 @@ -91,10 +90,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -153,7 +150,7 @@ ToastHelper.showToast("店主名还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -235,7 +232,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -243,21 +240,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 381b704..d371d17 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -80,7 +80,7 @@ @Override public void initEvent() { - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", "", "", pageIndex); + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); calendarView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -98,7 +98,7 @@ endGroup = endGroupPosition;//结束月份位置 endChild = endChildPosition;//结束对应月份中日的位置 dateView.setText(startDate + "~" + endDate); - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", startDate, endDate, pageIndex); } }).builder(); @@ -110,7 +110,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); @@ -119,7 +119,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0d7053a..3662274 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -3,17 +3,17 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -27,7 +27,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAdjustFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -66,14 +65,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.optionEditView) @@ -207,19 +206,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -250,19 +247,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index bd491c3..19b9039 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAuthorizeFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -70,14 +69,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -264,19 +263,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -307,19 +304,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java index f22a99d..797b130 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -32,7 +32,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -71,14 +70,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -157,19 +156,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -200,19 +197,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 1c1fcd0..e40d2cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -22,9 +22,11 @@ import com.casic.dcms.base.BaseApplication; import com.casic.dcms.base.DoubleClickExitActivity; import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.HomePageBean; import com.casic.dcms.bean.NoticeBean; import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.greendao.NoticeBeanDao; import com.casic.dcms.mvp.presenter.PushRegisterPresenterImpl; import com.casic.dcms.mvp.presenter.ToiletListPresenterImpl; @@ -44,6 +46,8 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StatusBarColorUtil; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.callback.IHttpRequestListener; import com.casic.dcms.widgets.NoScrollViewPager; import com.google.android.material.bottomnavigation.BottomNavigationView; @@ -59,7 +63,8 @@ import butterknife.BindView; import okhttp3.ResponseBody; -public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, IPushRegisterView, IToiletListView { +public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, + IPushRegisterView, IToiletListView { private static final String TAG = "MainActivity"; @BindView(R.id.pageTitleView) @@ -100,18 +105,17 @@ uploadPositionPresenter = new UploadPositionPresenterImpl(this); registerPresenter = new PushRegisterPresenterImpl(this); toiletListPresenter = new ToiletListPresenterImpl(this); - gson = new Gson(); + //获取配置项 + obtainProjectConfig(); + //配置页面 pageList = new ArrayList<>(); pageList.add(new HomePageFragment()); pageList.add(new PhonePageFragment()); pageList.add(new NoticePageFragment()); pageList.add(new MinePageFragment()); + imei = OtherUtils.obtainSimCardSerialNumber(this); - - //获取配置项 - obtainProjectConfig(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UploadLocationService.class)); } else { @@ -128,7 +132,7 @@ try { String resultStr = resultBean.string(); List bridges = gson.fromJson(resultStr, ProjectConfigBean.class).getBridges(); - SaveKeyValues.putValue(Constant.BRIDGE_LIST, gson.toJson(bridges)); + StringHelper.saveBridgeList(gson.toJson(bridges)); } catch (IOException e) { e.printStackTrace(); } @@ -310,7 +314,7 @@ @Override public void obtainToiletListData(ToiletListBean resultBean) { if (resultBean.isSuccess()) { - SaveKeyValues.putValue(Constant.TOILET_LIST, gson.toJson(resultBean.getData())); + StringHelper.saveToiletList(gson.toJson(resultBean.getData())); } } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 441625b..fe48830 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -3,18 +3,16 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -44,16 +42,16 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.punishTypeView) TextView punishTypeView; @BindView(R.id.punishOpinionView) TextView punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.punishDateView) TextView punishDateView; @@ -106,19 +104,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -131,19 +127,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处罚记录 @@ -158,19 +152,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + punishGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } punishDateView.setText(data.getPunishTime()); } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index 1dec74b..6711568 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -5,7 +5,9 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; @@ -13,11 +15,9 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; @@ -78,8 +77,8 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.line1) @@ -90,8 +89,8 @@ View line2; @BindView(R.id.reasonLayout) RelativeLayout reasonLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.addHandleImageView) ImageView addHandleImageView; @BindView(R.id.caseReasonView) @@ -102,8 +101,8 @@ TextView punishTypeView; @BindView(R.id.punishOpinionView) EditText punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.addPunishImageView) ImageView addPunishImageView; @BindView(R.id.punishDateView) @@ -120,7 +119,8 @@ private ArrayList punishRealPaths = new ArrayList<>();//真实图片路径 private List handleImageList = new ArrayList<>();//上传到服务器的数据集 private List punishImageList = new ArrayList<>();//上传到服务器的数据集 - private ImageRecycleViewAdapter punishImageAdapter, handleImageAdapter; + private ImageGridViewAdapter handleImageAdapter; + private ImageGridViewAdapter punishImageAdapter; private CaseNextNodePresenterImpl caseNextNodePresenter; private String changeState; private String approvalResult; @@ -155,17 +155,13 @@ .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); //处罚adapter - punishImageAdapter = new ImageRecycleViewAdapter(this); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(punishImageAdapter); + punishImageAdapter = new ImageGridViewAdapter(this); + punishGridView.setAdapter(punishImageAdapter); //下级结点 caseNextNodePresenter = new CaseNextNodePresenterImpl(this); - //案卷处理adapter - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); caseHandlePresenter = new CaseHandlePresenterImpl(this); packageHandlePresenter = new PackageHandlePresenterImpl(this); @@ -206,19 +202,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -231,19 +225,16 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + handleImageAdapter.setImageList(urls); + handleGridView.setAdapter(handleImageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + handleImageAdapter.isDeleteVisible(true); } } } @@ -382,7 +373,7 @@ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg if (isAddHandleImage) { //处理图片 - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); handleImageList.add(url); @@ -390,22 +381,22 @@ if (handleRealPaths.size() == 2) { addHandleImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, handleRealPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { handleImageList.remove(position); handleRealPaths.remove(position); - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); if (handleRealPaths.size() != 2) { addHandleImageView.setVisibility(View.VISIBLE); } @@ -416,7 +407,7 @@ } } else { //处罚图片 - int sumItemCount = punishImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = punishImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); punishImageList.add(url); @@ -424,21 +415,21 @@ if (punishRealPaths.size() == 2) { addPunishImageView.setVisibility(View.GONE); } - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); //九宫格点击事件 - punishImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, punishRealPaths); } }); //删除按钮点击事件 - punishImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + punishImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { punishImageList.remove(position); punishRealPaths.remove(position); - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); if (punishRealPaths.size() != 2) { addPunishImageView.setVisibility(View.VISIBLE); } @@ -506,7 +497,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index 7e3d47e..7c58e30 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -31,7 +31,6 @@ import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; @@ -50,8 +49,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; @@ -216,16 +213,14 @@ mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.obtainToiletIdLayout: - String toiletValue = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); - if (toiletValue.equals("")) { + List toiletBeanList = StringHelper.getToiletBeanList(); + if (toiletBeanList.size() == 0) { ToastHelper.showToast("获取公厕数据失败，请联系管理员", ToastHelper.ERROR); return; } - List dataBeans = new Gson().fromJson(toiletValue, new TypeToken>() { - }.getType()); QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("请选择您要打卡的公厕"); - for (ToiletListBean.DataBean it : dataBeans) { + for (ToiletListBean.DataBean it : toiletBeanList) { sheetBuilder.addItem(it.getName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -233,7 +228,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - toiletIdView.setText(dataBeans.get(position).getId()); + toiletIdView.setText(toiletBeanList.get(position).getId()); //TODO 是否需要将地图移到相应的公厕，待定 } }).build().show(); @@ -308,7 +303,7 @@ ToastHelper.showToast("保洁开始时间不能为空", ToastHelper.WARING); return; } - cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserId(), + cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, endTimeView.getText().toString(), imagePath, StringHelper.filterString(workContentView.getText().toString())); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 3a8ebc6..9f316a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -7,6 +7,7 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.utils.StringHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; @@ -47,9 +48,10 @@ @Override public void initData() { - userNameView.setText(StringHelper.getUserName()); - userPhoneView.setText(StringHelper.getUserPhone()); - userDeptView.setText(StringHelper.getUserDept()); + UserBean.DataBean userBean = StringHelper.getUserBean(); + userNameView.setText(userBean.getName()); + userPhoneView.setText(userBean.getPhone()); + userDeptView.setText(userBean.getDeptName()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index d9656aa..16bd2e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -39,6 +39,7 @@ import com.casic.dcms.ui.UrgentCaseActivity; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import butterknife.BindView; @@ -74,36 +75,38 @@ @Override protected void initData() { - userDataPresenter = new UserDataPresenterImpl(this); homePagePresenter = new HomePagePresenterImpl(this); + userDataPresenter = new UserDataPresenterImpl(this); + + //用户信息 + userDataPresenter.onReadyRetrofitRequest(); + //首页相关功能项 + homePagePresenter.onReadyRetrofitRequest("05"); } @Override protected void initEvent() { - userDataPresenter.onReadyRetrofitRequest(); - homePagePresenter.onReadyRetrofitRequest("05"); + //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 +// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); + Glide.with(this).load(R.mipmap.app_logo).into(userIconView); } @SuppressLint("SetTextI18n") @Override public void obtainUserData(UserBean userBean) { if (userBean.isSuccess()) { - //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 -// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); - Glide.with(this).load(R.mipmap.app_logo).into(userIconView); + UserBean.DataBean dataBean = userBean.getData(); + StringHelper.saveUserBean(new Gson().toJson(dataBean)); - UserBean.DataBean data = userBean.getData(); - userNameView.setText(data.getName()); - userDeptView.setText(data.getDeptName() + data.getRoleNames()); - - StringHelper.saveUserName(data.getName()); - StringHelper.saveUserPhone(data.getPhone()); - StringHelper.saveUserDept(data.getDeptName()); - StringHelper.saveUserDeptId(data.getDeptId()); - StringHelper.saveUserId(data.getId()); + userNameView.setText(dataBean.getName()); + userDeptView.setText(dataBean.getDeptName() + dataBean.getRoleNames()); } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); + } @Override public void obtainHomePageResult(HomePageBean resultBean) { @@ -183,11 +186,6 @@ } @Override - public void obtainDataFail() { - ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); - } - - @Override public void onDestroyView() { super.onDestroyView(); if (userDataPresenter != null) { @@ -197,4 +195,4 @@ homePagePresenter.disposeRetrofitRequest(); } } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 1657341..13aa09b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -76,7 +76,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserDeptId()); + phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 9e3437c..859d2ac 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -37,8 +37,9 @@ Color.rgb(120, 104, 230)}; public static final String IP_KEY = "ip"; - public static final String BRIDGE_LIST = "projectBridges"; - public static final String TOILET_LIST = "toilets"; + static final String USER_BEAN = "userBean"; + static final String BRIDGE_LIST = "projectBridges"; + static final String TOILET_LIST = "toilets"; public static final long HALF_YEAR = 180 * 60 * 60 * 24 * 1000L; public static final long ONE_YEAR = 365 * 60 * 60 * 24 * 1000L; diff --git a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java b/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java deleted file mode 100644 index 0286bb6..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.dcms.utils; - -import android.graphics.Rect; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -public class ItemDecorationSpace extends RecyclerView.ItemDecoration { - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (parent.getChildAdapterPosition(view) % 2 == 0) { - outRect.left = 0; - outRect.right = 5; - } else if (parent.getChildAdapterPosition(view) % 2 == 1) { - outRect.left = 5; - outRect.right = 0; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 4dd4dbd..cac58c5 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,7 +4,14 @@ import android.util.Log; import com.casic.dcms.R; +import com.casic.dcms.bean.HomePageBean; +import com.casic.dcms.bean.ProjectConfigBean; +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -21,44 +28,45 @@ return (String) SaveKeyValues.getValue("userAccount", ""); } - public static void saveUserId(String userId) { - SaveKeyValues.putValue("userId", userId); + public static void saveUserBean(String userBeanJson) { + SaveKeyValues.putValue(Constant.USER_BEAN, userBeanJson); } - public static String getUserId() { - return (String) SaveKeyValues.getValue("userId", ""); + public static UserBean.DataBean getUserBean() { + String userBeanJson = (String) SaveKeyValues.getValue(Constant.USER_BEAN, ""); + UserBean.DataBean dataBean = new UserBean.DataBean(); + if (userBeanJson.equals("")) { + return dataBean; + } + return new Gson().fromJson(userBeanJson, UserBean.DataBean.class); } - public static void saveUserName(String name) { - SaveKeyValues.putValue("userName", name); + public static void saveBridgeList(String bridgesJson) { + SaveKeyValues.putValue(Constant.BRIDGE_LIST, bridgesJson); } - public static String getUserName() { - return (String) SaveKeyValues.getValue("userName", ""); + public static List getBridgeBeanList() { + String bridgesJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); + List bridges = new ArrayList<>(); + if (bridgesJson.equals("")) { + return bridges; + } + return new Gson().fromJson(bridgesJson, new TypeToken>() { + }.getType()); } - public static void saveUserPhone(String phone) { - SaveKeyValues.putValue("userPhone", phone); + public static void saveToiletList(String toiletsJson) { + SaveKeyValues.putValue(Constant.TOILET_LIST, toiletsJson); } - public static String getUserPhone() { - return (String) SaveKeyValues.getValue("userPhone", ""); - } - - public static void saveUserDept(String dept) { - SaveKeyValues.putValue("userDept", dept); - } - - public static String getUserDept() { - return (String) SaveKeyValues.getValue("userDept", ""); - } - - public static void saveUserDeptId(String deptid) { - SaveKeyValues.putValue("userDeptId", deptid); - } - - public static String getUserDeptId() { - return (String) SaveKeyValues.getValue("userDeptId", ""); + public static List getToiletBeanList() { + String toiletsJson = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); + List toilets = new ArrayList<>(); + if (toiletsJson.equals("")) { + return toilets; + } + return new Gson().fromJson(toiletsJson, new TypeToken>() { + }.getType()); } public static boolean isLetterAndDigit(String str) { diff --git a/app/src/main/res/drawable/ic_package_holder.xml b/app/src/main/res/drawable/ic_package_holder.xml deleted file mode 100644 index 1f5ad5e..0000000 --- a/app/src/main/res/drawable/ic_package_holder.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 1d21c58..b376886 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -50,10 +50,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -95,10 +94,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -142,10 +140,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - @@ -38,10 +37,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -53,10 +51,9 @@ style="@style/noPointTextViewStyle" android:text="核查图片" /> - diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index e754c14..7d7a7c2 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -136,10 +136,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -151,10 +150,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -166,10 +164,9 @@ style="@style/noPointTextViewStyle" android:text="核查图片" /> - diff --git a/app/src/main/res/layout/activity_case_handle_detail.xml b/app/src/main/res/layout/activity_case_handle_detail.xml index 4cc674c..19a1a4a 100644 --- a/app/src/main/res/layout/activity_case_handle_detail.xml +++ b/app/src/main/res/layout/activity_case_handle_detail.xml @@ -22,16 +22,13 @@ - + @@ -132,10 +129,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - @@ -150,10 +149,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - diff --git a/app/src/main/res/layout/activity_case_todo_detail.xml b/app/src/main/res/layout/activity_case_todo_detail.xml index 345ca19..255a52e 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -97,10 +97,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_todo_handled_detail.xml b/app/src/main/res/layout/activity_case_todo_handled_detail.xml index a929b43..2bb8cf1 100644 --- a/app/src/main/res/layout/activity_case_todo_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_handled_detail.xml @@ -151,10 +151,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_verified_detail.xml b/app/src/main/res/layout/activity_case_verified_detail.xml index 394d248..a39e000 100644 --- a/app/src/main/res/layout/activity_case_verified_detail.xml +++ b/app/src/main/res/layout/activity_case_verified_detail.xml @@ -50,10 +50,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_verify_detail.xml b/app/src/main/res/layout/activity_case_verify_detail.xml index 0c90a09..1220507 100644 --- a/app/src/main/res/layout/activity_case_verify_detail.xml +++ b/app/src/main/res/layout/activity_case_verify_detail.xml @@ -76,10 +76,9 @@ style="@style/tagTextViewStyle" android:text="案卷图片" /> - - + @@ -130,7 +127,6 @@ android:id="@+id/phoneNumberView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="@dimen/margin_10dp" android:background="@null" android:hint="请输入店主手机号码" android:inputType="phone" @@ -145,6 +141,7 @@ @@ -153,14 +150,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:orientation="vertical"> - + diff --git a/app/src/main/res/layout/activity_dept_authorize.xml b/app/src/main/res/layout/activity_dept_authorize.xml index b097a6e..22934d5 100644 --- a/app/src/main/res/layout/activity_dept_authorize.xml +++ b/app/src/main/res/layout/activity_dept_authorize.xml @@ -76,7 +76,6 @@ android:id="@+id/optionEditView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:background="@null" android:hint="请输入少于50个字的处理意见" android:maxLength="50" /> diff --git a/app/src/main/res/layout/activity_dept_todo.xml b/app/src/main/res/layout/activity_dept_todo.xml index b097a6e..22934d5 100644 --- a/app/src/main/res/layout/activity_dept_todo.xml +++ b/app/src/main/res/layout/activity_dept_todo.xml @@ -76,7 +76,6 @@ android:id="@+id/optionEditView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:background="@null" android:hint="请输入少于50个字的处理意见" android:maxLength="50" /> diff --git a/app/src/main/res/layout/activity_package_handled.xml b/app/src/main/res/layout/activity_package_handled.xml index 5298ba1..8791216 100644 --- a/app/src/main/res/layout/activity_package_handled.xml +++ b/app/src/main/res/layout/activity_package_handled.xml @@ -23,10 +23,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -66,10 +65,9 @@ style="@style/noPointTextViewStyle" android:text="处罚图片" /> - diff --git a/app/src/main/res/layout/activity_package_todo.xml b/app/src/main/res/layout/activity_package_todo.xml index c20b869..fa5dae0 100644 --- a/app/src/main/res/layout/activity_package_todo.xml +++ b/app/src/main/res/layout/activity_package_todo.xml @@ -56,10 +56,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 91bf9f9..e3a2c99 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -11,7 +11,9 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -20,13 +22,11 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -104,8 +103,8 @@ JzvdStd videoPlayerView; @BindView(R.id.addImageView) ImageView addImageView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -125,7 +124,7 @@ private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; private UploadVideoPresenterImpl uploadVideoPresenter; private String audioUrl, videoUrl; @@ -164,10 +163,8 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @SuppressLint("ClickableViewAccessibility") @@ -534,7 +531,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); imageList.add(url); @@ -542,21 +539,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -618,7 +615,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index aa02a1c..b7b71f5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -62,8 +61,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -73,7 +72,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -97,10 +96,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -217,7 +214,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -273,7 +270,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -281,21 +278,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 964490e..f4f3501 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -29,7 +29,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -71,8 +70,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -90,7 +89,7 @@ private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; @Override @@ -115,10 +114,8 @@ .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -331,28 +328,28 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -401,7 +398,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b8f97ec..496edba 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -57,8 +56,8 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -121,19 +120,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index c3b3b66..5f6a3e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -39,7 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -87,16 +86,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseOpinionView) TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; - @BindView(R.id.caseVerifyRecyclerView) - RecyclerView caseVerifyRecyclerView; + @BindView(R.id.verifyGridView) + GridView verifyGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -139,7 +138,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private ImageRecycleViewAdapter verifyImageAdapter; + private ImageGridViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -168,10 +167,8 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); - verifyImageAdapter = new ImageRecycleViewAdapter(this); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(verifyImageAdapter); + verifyImageAdapter = new ImageGridViewAdapter(this); + verifyGridView.setAdapter(verifyImageAdapter); } @Override @@ -226,19 +223,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -386,7 +381,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -402,7 +397,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -533,7 +528,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = verifyImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -541,22 +536,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); //九宫格点击事件 - verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + verifyGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - verifyImageAdapter.setDeleteView(true); - verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + verifyImageAdapter.isDeleteVisible(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 3cedbfe..8b08041 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -57,8 +56,8 @@ EditText shopKeeperView; @BindView(R.id.phoneNumberView) EditText phoneNumberView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -67,7 +66,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopChangePresenterImpl shopChangePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; private ArrayList realPaths = new ArrayList<>();//真实图片路径 @@ -91,10 +90,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -153,7 +150,7 @@ ToastHelper.showToast("店主名还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -235,7 +232,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -243,21 +240,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 381b704..d371d17 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -80,7 +80,7 @@ @Override public void initEvent() { - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", "", "", pageIndex); + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); calendarView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -98,7 +98,7 @@ endGroup = endGroupPosition;//结束月份位置 endChild = endChildPosition;//结束对应月份中日的位置 dateView.setText(startDate + "~" + endDate); - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", startDate, endDate, pageIndex); } }).builder(); @@ -110,7 +110,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); @@ -119,7 +119,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0d7053a..3662274 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -3,17 +3,17 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -27,7 +27,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAdjustFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -66,14 +65,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.optionEditView) @@ -207,19 +206,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -250,19 +247,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index bd491c3..19b9039 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAuthorizeFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -70,14 +69,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -264,19 +263,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -307,19 +304,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java index f22a99d..797b130 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -32,7 +32,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -71,14 +70,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -157,19 +156,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -200,19 +197,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 1c1fcd0..e40d2cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -22,9 +22,11 @@ import com.casic.dcms.base.BaseApplication; import com.casic.dcms.base.DoubleClickExitActivity; import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.HomePageBean; import com.casic.dcms.bean.NoticeBean; import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.greendao.NoticeBeanDao; import com.casic.dcms.mvp.presenter.PushRegisterPresenterImpl; import com.casic.dcms.mvp.presenter.ToiletListPresenterImpl; @@ -44,6 +46,8 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StatusBarColorUtil; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.callback.IHttpRequestListener; import com.casic.dcms.widgets.NoScrollViewPager; import com.google.android.material.bottomnavigation.BottomNavigationView; @@ -59,7 +63,8 @@ import butterknife.BindView; import okhttp3.ResponseBody; -public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, IPushRegisterView, IToiletListView { +public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, + IPushRegisterView, IToiletListView { private static final String TAG = "MainActivity"; @BindView(R.id.pageTitleView) @@ -100,18 +105,17 @@ uploadPositionPresenter = new UploadPositionPresenterImpl(this); registerPresenter = new PushRegisterPresenterImpl(this); toiletListPresenter = new ToiletListPresenterImpl(this); - gson = new Gson(); + //获取配置项 + obtainProjectConfig(); + //配置页面 pageList = new ArrayList<>(); pageList.add(new HomePageFragment()); pageList.add(new PhonePageFragment()); pageList.add(new NoticePageFragment()); pageList.add(new MinePageFragment()); + imei = OtherUtils.obtainSimCardSerialNumber(this); - - //获取配置项 - obtainProjectConfig(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UploadLocationService.class)); } else { @@ -128,7 +132,7 @@ try { String resultStr = resultBean.string(); List bridges = gson.fromJson(resultStr, ProjectConfigBean.class).getBridges(); - SaveKeyValues.putValue(Constant.BRIDGE_LIST, gson.toJson(bridges)); + StringHelper.saveBridgeList(gson.toJson(bridges)); } catch (IOException e) { e.printStackTrace(); } @@ -310,7 +314,7 @@ @Override public void obtainToiletListData(ToiletListBean resultBean) { if (resultBean.isSuccess()) { - SaveKeyValues.putValue(Constant.TOILET_LIST, gson.toJson(resultBean.getData())); + StringHelper.saveToiletList(gson.toJson(resultBean.getData())); } } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 441625b..fe48830 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -3,18 +3,16 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -44,16 +42,16 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.punishTypeView) TextView punishTypeView; @BindView(R.id.punishOpinionView) TextView punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.punishDateView) TextView punishDateView; @@ -106,19 +104,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -131,19 +127,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处罚记录 @@ -158,19 +152,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + punishGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } punishDateView.setText(data.getPunishTime()); } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index 1dec74b..6711568 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -5,7 +5,9 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; @@ -13,11 +15,9 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; @@ -78,8 +77,8 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.line1) @@ -90,8 +89,8 @@ View line2; @BindView(R.id.reasonLayout) RelativeLayout reasonLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.addHandleImageView) ImageView addHandleImageView; @BindView(R.id.caseReasonView) @@ -102,8 +101,8 @@ TextView punishTypeView; @BindView(R.id.punishOpinionView) EditText punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.addPunishImageView) ImageView addPunishImageView; @BindView(R.id.punishDateView) @@ -120,7 +119,8 @@ private ArrayList punishRealPaths = new ArrayList<>();//真实图片路径 private List handleImageList = new ArrayList<>();//上传到服务器的数据集 private List punishImageList = new ArrayList<>();//上传到服务器的数据集 - private ImageRecycleViewAdapter punishImageAdapter, handleImageAdapter; + private ImageGridViewAdapter handleImageAdapter; + private ImageGridViewAdapter punishImageAdapter; private CaseNextNodePresenterImpl caseNextNodePresenter; private String changeState; private String approvalResult; @@ -155,17 +155,13 @@ .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); //处罚adapter - punishImageAdapter = new ImageRecycleViewAdapter(this); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(punishImageAdapter); + punishImageAdapter = new ImageGridViewAdapter(this); + punishGridView.setAdapter(punishImageAdapter); //下级结点 caseNextNodePresenter = new CaseNextNodePresenterImpl(this); - //案卷处理adapter - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); caseHandlePresenter = new CaseHandlePresenterImpl(this); packageHandlePresenter = new PackageHandlePresenterImpl(this); @@ -206,19 +202,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -231,19 +225,16 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + handleImageAdapter.setImageList(urls); + handleGridView.setAdapter(handleImageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + handleImageAdapter.isDeleteVisible(true); } } } @@ -382,7 +373,7 @@ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg if (isAddHandleImage) { //处理图片 - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); handleImageList.add(url); @@ -390,22 +381,22 @@ if (handleRealPaths.size() == 2) { addHandleImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, handleRealPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { handleImageList.remove(position); handleRealPaths.remove(position); - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); if (handleRealPaths.size() != 2) { addHandleImageView.setVisibility(View.VISIBLE); } @@ -416,7 +407,7 @@ } } else { //处罚图片 - int sumItemCount = punishImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = punishImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); punishImageList.add(url); @@ -424,21 +415,21 @@ if (punishRealPaths.size() == 2) { addPunishImageView.setVisibility(View.GONE); } - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); //九宫格点击事件 - punishImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, punishRealPaths); } }); //删除按钮点击事件 - punishImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + punishImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { punishImageList.remove(position); punishRealPaths.remove(position); - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); if (punishRealPaths.size() != 2) { addPunishImageView.setVisibility(View.VISIBLE); } @@ -506,7 +497,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index 7e3d47e..7c58e30 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -31,7 +31,6 @@ import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; @@ -50,8 +49,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; @@ -216,16 +213,14 @@ mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.obtainToiletIdLayout: - String toiletValue = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); - if (toiletValue.equals("")) { + List toiletBeanList = StringHelper.getToiletBeanList(); + if (toiletBeanList.size() == 0) { ToastHelper.showToast("获取公厕数据失败，请联系管理员", ToastHelper.ERROR); return; } - List dataBeans = new Gson().fromJson(toiletValue, new TypeToken>() { - }.getType()); QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("请选择您要打卡的公厕"); - for (ToiletListBean.DataBean it : dataBeans) { + for (ToiletListBean.DataBean it : toiletBeanList) { sheetBuilder.addItem(it.getName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -233,7 +228,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - toiletIdView.setText(dataBeans.get(position).getId()); + toiletIdView.setText(toiletBeanList.get(position).getId()); //TODO 是否需要将地图移到相应的公厕，待定 } }).build().show(); @@ -308,7 +303,7 @@ ToastHelper.showToast("保洁开始时间不能为空", ToastHelper.WARING); return; } - cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserId(), + cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, endTimeView.getText().toString(), imagePath, StringHelper.filterString(workContentView.getText().toString())); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 3a8ebc6..9f316a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -7,6 +7,7 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.utils.StringHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; @@ -47,9 +48,10 @@ @Override public void initData() { - userNameView.setText(StringHelper.getUserName()); - userPhoneView.setText(StringHelper.getUserPhone()); - userDeptView.setText(StringHelper.getUserDept()); + UserBean.DataBean userBean = StringHelper.getUserBean(); + userNameView.setText(userBean.getName()); + userPhoneView.setText(userBean.getPhone()); + userDeptView.setText(userBean.getDeptName()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index d9656aa..16bd2e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -39,6 +39,7 @@ import com.casic.dcms.ui.UrgentCaseActivity; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import butterknife.BindView; @@ -74,36 +75,38 @@ @Override protected void initData() { - userDataPresenter = new UserDataPresenterImpl(this); homePagePresenter = new HomePagePresenterImpl(this); + userDataPresenter = new UserDataPresenterImpl(this); + + //用户信息 + userDataPresenter.onReadyRetrofitRequest(); + //首页相关功能项 + homePagePresenter.onReadyRetrofitRequest("05"); } @Override protected void initEvent() { - userDataPresenter.onReadyRetrofitRequest(); - homePagePresenter.onReadyRetrofitRequest("05"); + //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 +// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); + Glide.with(this).load(R.mipmap.app_logo).into(userIconView); } @SuppressLint("SetTextI18n") @Override public void obtainUserData(UserBean userBean) { if (userBean.isSuccess()) { - //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 -// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); - Glide.with(this).load(R.mipmap.app_logo).into(userIconView); + UserBean.DataBean dataBean = userBean.getData(); + StringHelper.saveUserBean(new Gson().toJson(dataBean)); - UserBean.DataBean data = userBean.getData(); - userNameView.setText(data.getName()); - userDeptView.setText(data.getDeptName() + data.getRoleNames()); - - StringHelper.saveUserName(data.getName()); - StringHelper.saveUserPhone(data.getPhone()); - StringHelper.saveUserDept(data.getDeptName()); - StringHelper.saveUserDeptId(data.getDeptId()); - StringHelper.saveUserId(data.getId()); + userNameView.setText(dataBean.getName()); + userDeptView.setText(dataBean.getDeptName() + dataBean.getRoleNames()); } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); + } @Override public void obtainHomePageResult(HomePageBean resultBean) { @@ -183,11 +186,6 @@ } @Override - public void obtainDataFail() { - ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); - } - - @Override public void onDestroyView() { super.onDestroyView(); if (userDataPresenter != null) { @@ -197,4 +195,4 @@ homePagePresenter.disposeRetrofitRequest(); } } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 1657341..13aa09b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -76,7 +76,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserDeptId()); + phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 9e3437c..859d2ac 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -37,8 +37,9 @@ Color.rgb(120, 104, 230)}; public static final String IP_KEY = "ip"; - public static final String BRIDGE_LIST = "projectBridges"; - public static final String TOILET_LIST = "toilets"; + static final String USER_BEAN = "userBean"; + static final String BRIDGE_LIST = "projectBridges"; + static final String TOILET_LIST = "toilets"; public static final long HALF_YEAR = 180 * 60 * 60 * 24 * 1000L; public static final long ONE_YEAR = 365 * 60 * 60 * 24 * 1000L; diff --git a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java b/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java deleted file mode 100644 index 0286bb6..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.dcms.utils; - -import android.graphics.Rect; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -public class ItemDecorationSpace extends RecyclerView.ItemDecoration { - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (parent.getChildAdapterPosition(view) % 2 == 0) { - outRect.left = 0; - outRect.right = 5; - } else if (parent.getChildAdapterPosition(view) % 2 == 1) { - outRect.left = 5; - outRect.right = 0; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 4dd4dbd..cac58c5 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,7 +4,14 @@ import android.util.Log; import com.casic.dcms.R; +import com.casic.dcms.bean.HomePageBean; +import com.casic.dcms.bean.ProjectConfigBean; +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -21,44 +28,45 @@ return (String) SaveKeyValues.getValue("userAccount", ""); } - public static void saveUserId(String userId) { - SaveKeyValues.putValue("userId", userId); + public static void saveUserBean(String userBeanJson) { + SaveKeyValues.putValue(Constant.USER_BEAN, userBeanJson); } - public static String getUserId() { - return (String) SaveKeyValues.getValue("userId", ""); + public static UserBean.DataBean getUserBean() { + String userBeanJson = (String) SaveKeyValues.getValue(Constant.USER_BEAN, ""); + UserBean.DataBean dataBean = new UserBean.DataBean(); + if (userBeanJson.equals("")) { + return dataBean; + } + return new Gson().fromJson(userBeanJson, UserBean.DataBean.class); } - public static void saveUserName(String name) { - SaveKeyValues.putValue("userName", name); + public static void saveBridgeList(String bridgesJson) { + SaveKeyValues.putValue(Constant.BRIDGE_LIST, bridgesJson); } - public static String getUserName() { - return (String) SaveKeyValues.getValue("userName", ""); + public static List getBridgeBeanList() { + String bridgesJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); + List bridges = new ArrayList<>(); + if (bridgesJson.equals("")) { + return bridges; + } + return new Gson().fromJson(bridgesJson, new TypeToken>() { + }.getType()); } - public static void saveUserPhone(String phone) { - SaveKeyValues.putValue("userPhone", phone); + public static void saveToiletList(String toiletsJson) { + SaveKeyValues.putValue(Constant.TOILET_LIST, toiletsJson); } - public static String getUserPhone() { - return (String) SaveKeyValues.getValue("userPhone", ""); - } - - public static void saveUserDept(String dept) { - SaveKeyValues.putValue("userDept", dept); - } - - public static String getUserDept() { - return (String) SaveKeyValues.getValue("userDept", ""); - } - - public static void saveUserDeptId(String deptid) { - SaveKeyValues.putValue("userDeptId", deptid); - } - - public static String getUserDeptId() { - return (String) SaveKeyValues.getValue("userDeptId", ""); + public static List getToiletBeanList() { + String toiletsJson = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); + List toilets = new ArrayList<>(); + if (toiletsJson.equals("")) { + return toilets; + } + return new Gson().fromJson(toiletsJson, new TypeToken>() { + }.getType()); } public static boolean isLetterAndDigit(String str) { diff --git a/app/src/main/res/drawable/ic_package_holder.xml b/app/src/main/res/drawable/ic_package_holder.xml deleted file mode 100644 index 1f5ad5e..0000000 --- a/app/src/main/res/drawable/ic_package_holder.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 1d21c58..b376886 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -50,10 +50,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -95,10 +94,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -142,10 +140,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - @@ -38,10 +37,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -53,10 +51,9 @@ style="@style/noPointTextViewStyle" android:text="核查图片" /> - diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index e754c14..7d7a7c2 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -136,10 +136,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -151,10 +150,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -166,10 +164,9 @@ style="@style/noPointTextViewStyle" android:text="核查图片" /> - diff --git a/app/src/main/res/layout/activity_case_handle_detail.xml b/app/src/main/res/layout/activity_case_handle_detail.xml index 4cc674c..19a1a4a 100644 --- a/app/src/main/res/layout/activity_case_handle_detail.xml +++ b/app/src/main/res/layout/activity_case_handle_detail.xml @@ -22,16 +22,13 @@ - + @@ -132,10 +129,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - @@ -150,10 +149,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - diff --git a/app/src/main/res/layout/activity_case_todo_detail.xml b/app/src/main/res/layout/activity_case_todo_detail.xml index 345ca19..255a52e 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -97,10 +97,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_todo_handled_detail.xml b/app/src/main/res/layout/activity_case_todo_handled_detail.xml index a929b43..2bb8cf1 100644 --- a/app/src/main/res/layout/activity_case_todo_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_handled_detail.xml @@ -151,10 +151,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_verified_detail.xml b/app/src/main/res/layout/activity_case_verified_detail.xml index 394d248..a39e000 100644 --- a/app/src/main/res/layout/activity_case_verified_detail.xml +++ b/app/src/main/res/layout/activity_case_verified_detail.xml @@ -50,10 +50,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_verify_detail.xml b/app/src/main/res/layout/activity_case_verify_detail.xml index 0c90a09..1220507 100644 --- a/app/src/main/res/layout/activity_case_verify_detail.xml +++ b/app/src/main/res/layout/activity_case_verify_detail.xml @@ -76,10 +76,9 @@ style="@style/tagTextViewStyle" android:text="案卷图片" /> - - + @@ -130,7 +127,6 @@ android:id="@+id/phoneNumberView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="@dimen/margin_10dp" android:background="@null" android:hint="请输入店主手机号码" android:inputType="phone" @@ -145,6 +141,7 @@ @@ -153,14 +150,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:orientation="vertical"> - + diff --git a/app/src/main/res/layout/activity_dept_authorize.xml b/app/src/main/res/layout/activity_dept_authorize.xml index b097a6e..22934d5 100644 --- a/app/src/main/res/layout/activity_dept_authorize.xml +++ b/app/src/main/res/layout/activity_dept_authorize.xml @@ -76,7 +76,6 @@ android:id="@+id/optionEditView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:background="@null" android:hint="请输入少于50个字的处理意见" android:maxLength="50" /> diff --git a/app/src/main/res/layout/activity_dept_todo.xml b/app/src/main/res/layout/activity_dept_todo.xml index b097a6e..22934d5 100644 --- a/app/src/main/res/layout/activity_dept_todo.xml +++ b/app/src/main/res/layout/activity_dept_todo.xml @@ -76,7 +76,6 @@ android:id="@+id/optionEditView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:background="@null" android:hint="请输入少于50个字的处理意见" android:maxLength="50" /> diff --git a/app/src/main/res/layout/activity_package_handled.xml b/app/src/main/res/layout/activity_package_handled.xml index 5298ba1..8791216 100644 --- a/app/src/main/res/layout/activity_package_handled.xml +++ b/app/src/main/res/layout/activity_package_handled.xml @@ -23,10 +23,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -66,10 +65,9 @@ style="@style/noPointTextViewStyle" android:text="处罚图片" /> - diff --git a/app/src/main/res/layout/activity_package_todo.xml b/app/src/main/res/layout/activity_package_todo.xml index c20b869..fa5dae0 100644 --- a/app/src/main/res/layout/activity_package_todo.xml +++ b/app/src/main/res/layout/activity_package_todo.xml @@ -56,10 +56,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:layout_marginStart="100dp"> - + images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 91bf9f9..e3a2c99 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -11,7 +11,9 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -20,13 +22,11 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -104,8 +103,8 @@ JzvdStd videoPlayerView; @BindView(R.id.addImageView) ImageView addImageView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -125,7 +124,7 @@ private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; private UploadVideoPresenterImpl uploadVideoPresenter; private String audioUrl, videoUrl; @@ -164,10 +163,8 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @SuppressLint("ClickableViewAccessibility") @@ -534,7 +531,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); imageList.add(url); @@ -542,21 +539,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -618,7 +615,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index aa02a1c..b7b71f5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -62,8 +61,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -73,7 +72,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -97,10 +96,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -217,7 +214,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -273,7 +270,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -281,21 +278,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 964490e..f4f3501 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -29,7 +29,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -71,8 +70,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -90,7 +89,7 @@ private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; @Override @@ -115,10 +114,8 @@ .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -331,28 +328,28 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -401,7 +398,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b8f97ec..496edba 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -57,8 +56,8 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -121,19 +120,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index c3b3b66..5f6a3e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -39,7 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -87,16 +86,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseOpinionView) TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; - @BindView(R.id.caseVerifyRecyclerView) - RecyclerView caseVerifyRecyclerView; + @BindView(R.id.verifyGridView) + GridView verifyGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -139,7 +138,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private ImageRecycleViewAdapter verifyImageAdapter; + private ImageGridViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -168,10 +167,8 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); - verifyImageAdapter = new ImageRecycleViewAdapter(this); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(verifyImageAdapter); + verifyImageAdapter = new ImageGridViewAdapter(this); + verifyGridView.setAdapter(verifyImageAdapter); } @Override @@ -226,19 +223,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -386,7 +381,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -402,7 +397,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -533,7 +528,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = verifyImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -541,22 +536,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); //九宫格点击事件 - verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + verifyGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - verifyImageAdapter.setDeleteView(true); - verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + verifyImageAdapter.isDeleteVisible(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 3cedbfe..8b08041 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -57,8 +56,8 @@ EditText shopKeeperView; @BindView(R.id.phoneNumberView) EditText phoneNumberView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -67,7 +66,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopChangePresenterImpl shopChangePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; private ArrayList realPaths = new ArrayList<>();//真实图片路径 @@ -91,10 +90,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -153,7 +150,7 @@ ToastHelper.showToast("店主名还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -235,7 +232,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -243,21 +240,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 381b704..d371d17 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -80,7 +80,7 @@ @Override public void initEvent() { - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", "", "", pageIndex); + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); calendarView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -98,7 +98,7 @@ endGroup = endGroupPosition;//结束月份位置 endChild = endChildPosition;//结束对应月份中日的位置 dateView.setText(startDate + "~" + endDate); - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", startDate, endDate, pageIndex); } }).builder(); @@ -110,7 +110,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); @@ -119,7 +119,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0d7053a..3662274 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -3,17 +3,17 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -27,7 +27,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAdjustFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -66,14 +65,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.optionEditView) @@ -207,19 +206,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -250,19 +247,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index bd491c3..19b9039 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAuthorizeFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -70,14 +69,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -264,19 +263,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -307,19 +304,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java index f22a99d..797b130 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -32,7 +32,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -71,14 +70,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -157,19 +156,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -200,19 +197,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 1c1fcd0..e40d2cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -22,9 +22,11 @@ import com.casic.dcms.base.BaseApplication; import com.casic.dcms.base.DoubleClickExitActivity; import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.HomePageBean; import com.casic.dcms.bean.NoticeBean; import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.greendao.NoticeBeanDao; import com.casic.dcms.mvp.presenter.PushRegisterPresenterImpl; import com.casic.dcms.mvp.presenter.ToiletListPresenterImpl; @@ -44,6 +46,8 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StatusBarColorUtil; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.callback.IHttpRequestListener; import com.casic.dcms.widgets.NoScrollViewPager; import com.google.android.material.bottomnavigation.BottomNavigationView; @@ -59,7 +63,8 @@ import butterknife.BindView; import okhttp3.ResponseBody; -public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, IPushRegisterView, IToiletListView { +public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, + IPushRegisterView, IToiletListView { private static final String TAG = "MainActivity"; @BindView(R.id.pageTitleView) @@ -100,18 +105,17 @@ uploadPositionPresenter = new UploadPositionPresenterImpl(this); registerPresenter = new PushRegisterPresenterImpl(this); toiletListPresenter = new ToiletListPresenterImpl(this); - gson = new Gson(); + //获取配置项 + obtainProjectConfig(); + //配置页面 pageList = new ArrayList<>(); pageList.add(new HomePageFragment()); pageList.add(new PhonePageFragment()); pageList.add(new NoticePageFragment()); pageList.add(new MinePageFragment()); + imei = OtherUtils.obtainSimCardSerialNumber(this); - - //获取配置项 - obtainProjectConfig(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UploadLocationService.class)); } else { @@ -128,7 +132,7 @@ try { String resultStr = resultBean.string(); List bridges = gson.fromJson(resultStr, ProjectConfigBean.class).getBridges(); - SaveKeyValues.putValue(Constant.BRIDGE_LIST, gson.toJson(bridges)); + StringHelper.saveBridgeList(gson.toJson(bridges)); } catch (IOException e) { e.printStackTrace(); } @@ -310,7 +314,7 @@ @Override public void obtainToiletListData(ToiletListBean resultBean) { if (resultBean.isSuccess()) { - SaveKeyValues.putValue(Constant.TOILET_LIST, gson.toJson(resultBean.getData())); + StringHelper.saveToiletList(gson.toJson(resultBean.getData())); } } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 441625b..fe48830 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -3,18 +3,16 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -44,16 +42,16 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.punishTypeView) TextView punishTypeView; @BindView(R.id.punishOpinionView) TextView punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.punishDateView) TextView punishDateView; @@ -106,19 +104,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -131,19 +127,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处罚记录 @@ -158,19 +152,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + punishGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } punishDateView.setText(data.getPunishTime()); } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index 1dec74b..6711568 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -5,7 +5,9 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; @@ -13,11 +15,9 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; @@ -78,8 +77,8 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.line1) @@ -90,8 +89,8 @@ View line2; @BindView(R.id.reasonLayout) RelativeLayout reasonLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.addHandleImageView) ImageView addHandleImageView; @BindView(R.id.caseReasonView) @@ -102,8 +101,8 @@ TextView punishTypeView; @BindView(R.id.punishOpinionView) EditText punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.addPunishImageView) ImageView addPunishImageView; @BindView(R.id.punishDateView) @@ -120,7 +119,8 @@ private ArrayList punishRealPaths = new ArrayList<>();//真实图片路径 private List handleImageList = new ArrayList<>();//上传到服务器的数据集 private List punishImageList = new ArrayList<>();//上传到服务器的数据集 - private ImageRecycleViewAdapter punishImageAdapter, handleImageAdapter; + private ImageGridViewAdapter handleImageAdapter; + private ImageGridViewAdapter punishImageAdapter; private CaseNextNodePresenterImpl caseNextNodePresenter; private String changeState; private String approvalResult; @@ -155,17 +155,13 @@ .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); //处罚adapter - punishImageAdapter = new ImageRecycleViewAdapter(this); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(punishImageAdapter); + punishImageAdapter = new ImageGridViewAdapter(this); + punishGridView.setAdapter(punishImageAdapter); //下级结点 caseNextNodePresenter = new CaseNextNodePresenterImpl(this); - //案卷处理adapter - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); caseHandlePresenter = new CaseHandlePresenterImpl(this); packageHandlePresenter = new PackageHandlePresenterImpl(this); @@ -206,19 +202,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -231,19 +225,16 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + handleImageAdapter.setImageList(urls); + handleGridView.setAdapter(handleImageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + handleImageAdapter.isDeleteVisible(true); } } } @@ -382,7 +373,7 @@ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg if (isAddHandleImage) { //处理图片 - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); handleImageList.add(url); @@ -390,22 +381,22 @@ if (handleRealPaths.size() == 2) { addHandleImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, handleRealPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { handleImageList.remove(position); handleRealPaths.remove(position); - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); if (handleRealPaths.size() != 2) { addHandleImageView.setVisibility(View.VISIBLE); } @@ -416,7 +407,7 @@ } } else { //处罚图片 - int sumItemCount = punishImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = punishImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); punishImageList.add(url); @@ -424,21 +415,21 @@ if (punishRealPaths.size() == 2) { addPunishImageView.setVisibility(View.GONE); } - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); //九宫格点击事件 - punishImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, punishRealPaths); } }); //删除按钮点击事件 - punishImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + punishImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { punishImageList.remove(position); punishRealPaths.remove(position); - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); if (punishRealPaths.size() != 2) { addPunishImageView.setVisibility(View.VISIBLE); } @@ -506,7 +497,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index 7e3d47e..7c58e30 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -31,7 +31,6 @@ import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; @@ -50,8 +49,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; @@ -216,16 +213,14 @@ mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.obtainToiletIdLayout: - String toiletValue = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); - if (toiletValue.equals("")) { + List toiletBeanList = StringHelper.getToiletBeanList(); + if (toiletBeanList.size() == 0) { ToastHelper.showToast("获取公厕数据失败，请联系管理员", ToastHelper.ERROR); return; } - List dataBeans = new Gson().fromJson(toiletValue, new TypeToken>() { - }.getType()); QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("请选择您要打卡的公厕"); - for (ToiletListBean.DataBean it : dataBeans) { + for (ToiletListBean.DataBean it : toiletBeanList) { sheetBuilder.addItem(it.getName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -233,7 +228,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - toiletIdView.setText(dataBeans.get(position).getId()); + toiletIdView.setText(toiletBeanList.get(position).getId()); //TODO 是否需要将地图移到相应的公厕，待定 } }).build().show(); @@ -308,7 +303,7 @@ ToastHelper.showToast("保洁开始时间不能为空", ToastHelper.WARING); return; } - cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserId(), + cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, endTimeView.getText().toString(), imagePath, StringHelper.filterString(workContentView.getText().toString())); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 3a8ebc6..9f316a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -7,6 +7,7 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.utils.StringHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; @@ -47,9 +48,10 @@ @Override public void initData() { - userNameView.setText(StringHelper.getUserName()); - userPhoneView.setText(StringHelper.getUserPhone()); - userDeptView.setText(StringHelper.getUserDept()); + UserBean.DataBean userBean = StringHelper.getUserBean(); + userNameView.setText(userBean.getName()); + userPhoneView.setText(userBean.getPhone()); + userDeptView.setText(userBean.getDeptName()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index d9656aa..16bd2e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -39,6 +39,7 @@ import com.casic.dcms.ui.UrgentCaseActivity; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import butterknife.BindView; @@ -74,36 +75,38 @@ @Override protected void initData() { - userDataPresenter = new UserDataPresenterImpl(this); homePagePresenter = new HomePagePresenterImpl(this); + userDataPresenter = new UserDataPresenterImpl(this); + + //用户信息 + userDataPresenter.onReadyRetrofitRequest(); + //首页相关功能项 + homePagePresenter.onReadyRetrofitRequest("05"); } @Override protected void initEvent() { - userDataPresenter.onReadyRetrofitRequest(); - homePagePresenter.onReadyRetrofitRequest("05"); + //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 +// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); + Glide.with(this).load(R.mipmap.app_logo).into(userIconView); } @SuppressLint("SetTextI18n") @Override public void obtainUserData(UserBean userBean) { if (userBean.isSuccess()) { - //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 -// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); - Glide.with(this).load(R.mipmap.app_logo).into(userIconView); + UserBean.DataBean dataBean = userBean.getData(); + StringHelper.saveUserBean(new Gson().toJson(dataBean)); - UserBean.DataBean data = userBean.getData(); - userNameView.setText(data.getName()); - userDeptView.setText(data.getDeptName() + data.getRoleNames()); - - StringHelper.saveUserName(data.getName()); - StringHelper.saveUserPhone(data.getPhone()); - StringHelper.saveUserDept(data.getDeptName()); - StringHelper.saveUserDeptId(data.getDeptId()); - StringHelper.saveUserId(data.getId()); + userNameView.setText(dataBean.getName()); + userDeptView.setText(dataBean.getDeptName() + dataBean.getRoleNames()); } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); + } @Override public void obtainHomePageResult(HomePageBean resultBean) { @@ -183,11 +186,6 @@ } @Override - public void obtainDataFail() { - ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); - } - - @Override public void onDestroyView() { super.onDestroyView(); if (userDataPresenter != null) { @@ -197,4 +195,4 @@ homePagePresenter.disposeRetrofitRequest(); } } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 1657341..13aa09b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -76,7 +76,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserDeptId()); + phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 9e3437c..859d2ac 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -37,8 +37,9 @@ Color.rgb(120, 104, 230)}; public static final String IP_KEY = "ip"; - public static final String BRIDGE_LIST = "projectBridges"; - public static final String TOILET_LIST = "toilets"; + static final String USER_BEAN = "userBean"; + static final String BRIDGE_LIST = "projectBridges"; + static final String TOILET_LIST = "toilets"; public static final long HALF_YEAR = 180 * 60 * 60 * 24 * 1000L; public static final long ONE_YEAR = 365 * 60 * 60 * 24 * 1000L; diff --git a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java b/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java deleted file mode 100644 index 0286bb6..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.dcms.utils; - -import android.graphics.Rect; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -public class ItemDecorationSpace extends RecyclerView.ItemDecoration { - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (parent.getChildAdapterPosition(view) % 2 == 0) { - outRect.left = 0; - outRect.right = 5; - } else if (parent.getChildAdapterPosition(view) % 2 == 1) { - outRect.left = 5; - outRect.right = 0; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 4dd4dbd..cac58c5 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,7 +4,14 @@ import android.util.Log; import com.casic.dcms.R; +import com.casic.dcms.bean.HomePageBean; +import com.casic.dcms.bean.ProjectConfigBean; +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -21,44 +28,45 @@ return (String) SaveKeyValues.getValue("userAccount", ""); } - public static void saveUserId(String userId) { - SaveKeyValues.putValue("userId", userId); + public static void saveUserBean(String userBeanJson) { + SaveKeyValues.putValue(Constant.USER_BEAN, userBeanJson); } - public static String getUserId() { - return (String) SaveKeyValues.getValue("userId", ""); + public static UserBean.DataBean getUserBean() { + String userBeanJson = (String) SaveKeyValues.getValue(Constant.USER_BEAN, ""); + UserBean.DataBean dataBean = new UserBean.DataBean(); + if (userBeanJson.equals("")) { + return dataBean; + } + return new Gson().fromJson(userBeanJson, UserBean.DataBean.class); } - public static void saveUserName(String name) { - SaveKeyValues.putValue("userName", name); + public static void saveBridgeList(String bridgesJson) { + SaveKeyValues.putValue(Constant.BRIDGE_LIST, bridgesJson); } - public static String getUserName() { - return (String) SaveKeyValues.getValue("userName", ""); + public static List getBridgeBeanList() { + String bridgesJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); + List bridges = new ArrayList<>(); + if (bridgesJson.equals("")) { + return bridges; + } + return new Gson().fromJson(bridgesJson, new TypeToken>() { + }.getType()); } - public static void saveUserPhone(String phone) { - SaveKeyValues.putValue("userPhone", phone); + public static void saveToiletList(String toiletsJson) { + SaveKeyValues.putValue(Constant.TOILET_LIST, toiletsJson); } - public static String getUserPhone() { - return (String) SaveKeyValues.getValue("userPhone", ""); - } - - public static void saveUserDept(String dept) { - SaveKeyValues.putValue("userDept", dept); - } - - public static String getUserDept() { - return (String) SaveKeyValues.getValue("userDept", ""); - } - - public static void saveUserDeptId(String deptid) { - SaveKeyValues.putValue("userDeptId", deptid); - } - - public static String getUserDeptId() { - return (String) SaveKeyValues.getValue("userDeptId", ""); + public static List getToiletBeanList() { + String toiletsJson = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); + List toilets = new ArrayList<>(); + if (toiletsJson.equals("")) { + return toilets; + } + return new Gson().fromJson(toiletsJson, new TypeToken>() { + }.getType()); } public static boolean isLetterAndDigit(String str) { diff --git a/app/src/main/res/drawable/ic_package_holder.xml b/app/src/main/res/drawable/ic_package_holder.xml deleted file mode 100644 index 1f5ad5e..0000000 --- a/app/src/main/res/drawable/ic_package_holder.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 1d21c58..b376886 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -50,10 +50,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -95,10 +94,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -142,10 +140,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - @@ -38,10 +37,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -53,10 +51,9 @@ style="@style/noPointTextViewStyle" android:text="核查图片" /> - diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index e754c14..7d7a7c2 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -136,10 +136,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -151,10 +150,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -166,10 +164,9 @@ style="@style/noPointTextViewStyle" android:text="核查图片" /> - diff --git a/app/src/main/res/layout/activity_case_handle_detail.xml b/app/src/main/res/layout/activity_case_handle_detail.xml index 4cc674c..19a1a4a 100644 --- a/app/src/main/res/layout/activity_case_handle_detail.xml +++ b/app/src/main/res/layout/activity_case_handle_detail.xml @@ -22,16 +22,13 @@ - + @@ -132,10 +129,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - @@ -150,10 +149,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - diff --git a/app/src/main/res/layout/activity_case_todo_detail.xml b/app/src/main/res/layout/activity_case_todo_detail.xml index 345ca19..255a52e 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -97,10 +97,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_todo_handled_detail.xml b/app/src/main/res/layout/activity_case_todo_handled_detail.xml index a929b43..2bb8cf1 100644 --- a/app/src/main/res/layout/activity_case_todo_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_handled_detail.xml @@ -151,10 +151,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_verified_detail.xml b/app/src/main/res/layout/activity_case_verified_detail.xml index 394d248..a39e000 100644 --- a/app/src/main/res/layout/activity_case_verified_detail.xml +++ b/app/src/main/res/layout/activity_case_verified_detail.xml @@ -50,10 +50,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_verify_detail.xml b/app/src/main/res/layout/activity_case_verify_detail.xml index 0c90a09..1220507 100644 --- a/app/src/main/res/layout/activity_case_verify_detail.xml +++ b/app/src/main/res/layout/activity_case_verify_detail.xml @@ -76,10 +76,9 @@ style="@style/tagTextViewStyle" android:text="案卷图片" /> - - + @@ -130,7 +127,6 @@ android:id="@+id/phoneNumberView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="@dimen/margin_10dp" android:background="@null" android:hint="请输入店主手机号码" android:inputType="phone" @@ -145,6 +141,7 @@ @@ -153,14 +150,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:orientation="vertical"> - + diff --git a/app/src/main/res/layout/activity_dept_authorize.xml b/app/src/main/res/layout/activity_dept_authorize.xml index b097a6e..22934d5 100644 --- a/app/src/main/res/layout/activity_dept_authorize.xml +++ b/app/src/main/res/layout/activity_dept_authorize.xml @@ -76,7 +76,6 @@ android:id="@+id/optionEditView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:background="@null" android:hint="请输入少于50个字的处理意见" android:maxLength="50" /> diff --git a/app/src/main/res/layout/activity_dept_todo.xml b/app/src/main/res/layout/activity_dept_todo.xml index b097a6e..22934d5 100644 --- a/app/src/main/res/layout/activity_dept_todo.xml +++ b/app/src/main/res/layout/activity_dept_todo.xml @@ -76,7 +76,6 @@ android:id="@+id/optionEditView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:background="@null" android:hint="请输入少于50个字的处理意见" android:maxLength="50" /> diff --git a/app/src/main/res/layout/activity_package_handled.xml b/app/src/main/res/layout/activity_package_handled.xml index 5298ba1..8791216 100644 --- a/app/src/main/res/layout/activity_package_handled.xml +++ b/app/src/main/res/layout/activity_package_handled.xml @@ -23,10 +23,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -66,10 +65,9 @@ style="@style/noPointTextViewStyle" android:text="处罚图片" /> - diff --git a/app/src/main/res/layout/activity_package_todo.xml b/app/src/main/res/layout/activity_package_todo.xml index c20b869..fa5dae0 100644 --- a/app/src/main/res/layout/activity_package_todo.xml +++ b/app/src/main/res/layout/activity_package_todo.xml @@ -56,10 +56,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:layout_marginStart="100dp"> - + - + images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 91bf9f9..e3a2c99 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -11,7 +11,9 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -20,13 +22,11 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -104,8 +103,8 @@ JzvdStd videoPlayerView; @BindView(R.id.addImageView) ImageView addImageView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -125,7 +124,7 @@ private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; private UploadVideoPresenterImpl uploadVideoPresenter; private String audioUrl, videoUrl; @@ -164,10 +163,8 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @SuppressLint("ClickableViewAccessibility") @@ -534,7 +531,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); imageList.add(url); @@ -542,21 +539,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -618,7 +615,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index aa02a1c..b7b71f5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -62,8 +61,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -73,7 +72,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -97,10 +96,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -217,7 +214,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -273,7 +270,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -281,21 +278,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 964490e..f4f3501 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -29,7 +29,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -71,8 +70,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -90,7 +89,7 @@ private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; @Override @@ -115,10 +114,8 @@ .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -331,28 +328,28 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -401,7 +398,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b8f97ec..496edba 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -57,8 +56,8 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -121,19 +120,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index c3b3b66..5f6a3e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -39,7 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -87,16 +86,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseOpinionView) TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; - @BindView(R.id.caseVerifyRecyclerView) - RecyclerView caseVerifyRecyclerView; + @BindView(R.id.verifyGridView) + GridView verifyGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -139,7 +138,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private ImageRecycleViewAdapter verifyImageAdapter; + private ImageGridViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -168,10 +167,8 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); - verifyImageAdapter = new ImageRecycleViewAdapter(this); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(verifyImageAdapter); + verifyImageAdapter = new ImageGridViewAdapter(this); + verifyGridView.setAdapter(verifyImageAdapter); } @Override @@ -226,19 +223,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -386,7 +381,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -402,7 +397,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -533,7 +528,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = verifyImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -541,22 +536,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); //九宫格点击事件 - verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + verifyGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - verifyImageAdapter.setDeleteView(true); - verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + verifyImageAdapter.isDeleteVisible(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 3cedbfe..8b08041 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -57,8 +56,8 @@ EditText shopKeeperView; @BindView(R.id.phoneNumberView) EditText phoneNumberView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -67,7 +66,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopChangePresenterImpl shopChangePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; private ArrayList realPaths = new ArrayList<>();//真实图片路径 @@ -91,10 +90,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -153,7 +150,7 @@ ToastHelper.showToast("店主名还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -235,7 +232,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -243,21 +240,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 381b704..d371d17 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -80,7 +80,7 @@ @Override public void initEvent() { - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", "", "", pageIndex); + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); calendarView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -98,7 +98,7 @@ endGroup = endGroupPosition;//结束月份位置 endChild = endChildPosition;//结束对应月份中日的位置 dateView.setText(startDate + "~" + endDate); - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", startDate, endDate, pageIndex); } }).builder(); @@ -110,7 +110,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); @@ -119,7 +119,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0d7053a..3662274 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -3,17 +3,17 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -27,7 +27,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAdjustFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -66,14 +65,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.optionEditView) @@ -207,19 +206,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -250,19 +247,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index bd491c3..19b9039 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAuthorizeFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -70,14 +69,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -264,19 +263,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -307,19 +304,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java index f22a99d..797b130 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -32,7 +32,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -71,14 +70,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -157,19 +156,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -200,19 +197,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 1c1fcd0..e40d2cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -22,9 +22,11 @@ import com.casic.dcms.base.BaseApplication; import com.casic.dcms.base.DoubleClickExitActivity; import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.HomePageBean; import com.casic.dcms.bean.NoticeBean; import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.greendao.NoticeBeanDao; import com.casic.dcms.mvp.presenter.PushRegisterPresenterImpl; import com.casic.dcms.mvp.presenter.ToiletListPresenterImpl; @@ -44,6 +46,8 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StatusBarColorUtil; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.callback.IHttpRequestListener; import com.casic.dcms.widgets.NoScrollViewPager; import com.google.android.material.bottomnavigation.BottomNavigationView; @@ -59,7 +63,8 @@ import butterknife.BindView; import okhttp3.ResponseBody; -public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, IPushRegisterView, IToiletListView { +public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, + IPushRegisterView, IToiletListView { private static final String TAG = "MainActivity"; @BindView(R.id.pageTitleView) @@ -100,18 +105,17 @@ uploadPositionPresenter = new UploadPositionPresenterImpl(this); registerPresenter = new PushRegisterPresenterImpl(this); toiletListPresenter = new ToiletListPresenterImpl(this); - gson = new Gson(); + //获取配置项 + obtainProjectConfig(); + //配置页面 pageList = new ArrayList<>(); pageList.add(new HomePageFragment()); pageList.add(new PhonePageFragment()); pageList.add(new NoticePageFragment()); pageList.add(new MinePageFragment()); + imei = OtherUtils.obtainSimCardSerialNumber(this); - - //获取配置项 - obtainProjectConfig(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UploadLocationService.class)); } else { @@ -128,7 +132,7 @@ try { String resultStr = resultBean.string(); List bridges = gson.fromJson(resultStr, ProjectConfigBean.class).getBridges(); - SaveKeyValues.putValue(Constant.BRIDGE_LIST, gson.toJson(bridges)); + StringHelper.saveBridgeList(gson.toJson(bridges)); } catch (IOException e) { e.printStackTrace(); } @@ -310,7 +314,7 @@ @Override public void obtainToiletListData(ToiletListBean resultBean) { if (resultBean.isSuccess()) { - SaveKeyValues.putValue(Constant.TOILET_LIST, gson.toJson(resultBean.getData())); + StringHelper.saveToiletList(gson.toJson(resultBean.getData())); } } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 441625b..fe48830 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -3,18 +3,16 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -44,16 +42,16 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.punishTypeView) TextView punishTypeView; @BindView(R.id.punishOpinionView) TextView punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.punishDateView) TextView punishDateView; @@ -106,19 +104,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -131,19 +127,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处罚记录 @@ -158,19 +152,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + punishGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } punishDateView.setText(data.getPunishTime()); } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index 1dec74b..6711568 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -5,7 +5,9 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; @@ -13,11 +15,9 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; @@ -78,8 +77,8 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.line1) @@ -90,8 +89,8 @@ View line2; @BindView(R.id.reasonLayout) RelativeLayout reasonLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.addHandleImageView) ImageView addHandleImageView; @BindView(R.id.caseReasonView) @@ -102,8 +101,8 @@ TextView punishTypeView; @BindView(R.id.punishOpinionView) EditText punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.addPunishImageView) ImageView addPunishImageView; @BindView(R.id.punishDateView) @@ -120,7 +119,8 @@ private ArrayList punishRealPaths = new ArrayList<>();//真实图片路径 private List handleImageList = new ArrayList<>();//上传到服务器的数据集 private List punishImageList = new ArrayList<>();//上传到服务器的数据集 - private ImageRecycleViewAdapter punishImageAdapter, handleImageAdapter; + private ImageGridViewAdapter handleImageAdapter; + private ImageGridViewAdapter punishImageAdapter; private CaseNextNodePresenterImpl caseNextNodePresenter; private String changeState; private String approvalResult; @@ -155,17 +155,13 @@ .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); //处罚adapter - punishImageAdapter = new ImageRecycleViewAdapter(this); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(punishImageAdapter); + punishImageAdapter = new ImageGridViewAdapter(this); + punishGridView.setAdapter(punishImageAdapter); //下级结点 caseNextNodePresenter = new CaseNextNodePresenterImpl(this); - //案卷处理adapter - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); caseHandlePresenter = new CaseHandlePresenterImpl(this); packageHandlePresenter = new PackageHandlePresenterImpl(this); @@ -206,19 +202,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -231,19 +225,16 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + handleImageAdapter.setImageList(urls); + handleGridView.setAdapter(handleImageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + handleImageAdapter.isDeleteVisible(true); } } } @@ -382,7 +373,7 @@ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg if (isAddHandleImage) { //处理图片 - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); handleImageList.add(url); @@ -390,22 +381,22 @@ if (handleRealPaths.size() == 2) { addHandleImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, handleRealPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { handleImageList.remove(position); handleRealPaths.remove(position); - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); if (handleRealPaths.size() != 2) { addHandleImageView.setVisibility(View.VISIBLE); } @@ -416,7 +407,7 @@ } } else { //处罚图片 - int sumItemCount = punishImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = punishImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); punishImageList.add(url); @@ -424,21 +415,21 @@ if (punishRealPaths.size() == 2) { addPunishImageView.setVisibility(View.GONE); } - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); //九宫格点击事件 - punishImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, punishRealPaths); } }); //删除按钮点击事件 - punishImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + punishImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { punishImageList.remove(position); punishRealPaths.remove(position); - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); if (punishRealPaths.size() != 2) { addPunishImageView.setVisibility(View.VISIBLE); } @@ -506,7 +497,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index 7e3d47e..7c58e30 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -31,7 +31,6 @@ import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; @@ -50,8 +49,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; @@ -216,16 +213,14 @@ mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.obtainToiletIdLayout: - String toiletValue = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); - if (toiletValue.equals("")) { + List toiletBeanList = StringHelper.getToiletBeanList(); + if (toiletBeanList.size() == 0) { ToastHelper.showToast("获取公厕数据失败，请联系管理员", ToastHelper.ERROR); return; } - List dataBeans = new Gson().fromJson(toiletValue, new TypeToken>() { - }.getType()); QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("请选择您要打卡的公厕"); - for (ToiletListBean.DataBean it : dataBeans) { + for (ToiletListBean.DataBean it : toiletBeanList) { sheetBuilder.addItem(it.getName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -233,7 +228,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - toiletIdView.setText(dataBeans.get(position).getId()); + toiletIdView.setText(toiletBeanList.get(position).getId()); //TODO 是否需要将地图移到相应的公厕，待定 } }).build().show(); @@ -308,7 +303,7 @@ ToastHelper.showToast("保洁开始时间不能为空", ToastHelper.WARING); return; } - cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserId(), + cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, endTimeView.getText().toString(), imagePath, StringHelper.filterString(workContentView.getText().toString())); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 3a8ebc6..9f316a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -7,6 +7,7 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.utils.StringHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; @@ -47,9 +48,10 @@ @Override public void initData() { - userNameView.setText(StringHelper.getUserName()); - userPhoneView.setText(StringHelper.getUserPhone()); - userDeptView.setText(StringHelper.getUserDept()); + UserBean.DataBean userBean = StringHelper.getUserBean(); + userNameView.setText(userBean.getName()); + userPhoneView.setText(userBean.getPhone()); + userDeptView.setText(userBean.getDeptName()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index d9656aa..16bd2e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -39,6 +39,7 @@ import com.casic.dcms.ui.UrgentCaseActivity; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import butterknife.BindView; @@ -74,36 +75,38 @@ @Override protected void initData() { - userDataPresenter = new UserDataPresenterImpl(this); homePagePresenter = new HomePagePresenterImpl(this); + userDataPresenter = new UserDataPresenterImpl(this); + + //用户信息 + userDataPresenter.onReadyRetrofitRequest(); + //首页相关功能项 + homePagePresenter.onReadyRetrofitRequest("05"); } @Override protected void initEvent() { - userDataPresenter.onReadyRetrofitRequest(); - homePagePresenter.onReadyRetrofitRequest("05"); + //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 +// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); + Glide.with(this).load(R.mipmap.app_logo).into(userIconView); } @SuppressLint("SetTextI18n") @Override public void obtainUserData(UserBean userBean) { if (userBean.isSuccess()) { - //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 -// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); - Glide.with(this).load(R.mipmap.app_logo).into(userIconView); + UserBean.DataBean dataBean = userBean.getData(); + StringHelper.saveUserBean(new Gson().toJson(dataBean)); - UserBean.DataBean data = userBean.getData(); - userNameView.setText(data.getName()); - userDeptView.setText(data.getDeptName() + data.getRoleNames()); - - StringHelper.saveUserName(data.getName()); - StringHelper.saveUserPhone(data.getPhone()); - StringHelper.saveUserDept(data.getDeptName()); - StringHelper.saveUserDeptId(data.getDeptId()); - StringHelper.saveUserId(data.getId()); + userNameView.setText(dataBean.getName()); + userDeptView.setText(dataBean.getDeptName() + dataBean.getRoleNames()); } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); + } @Override public void obtainHomePageResult(HomePageBean resultBean) { @@ -183,11 +186,6 @@ } @Override - public void obtainDataFail() { - ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); - } - - @Override public void onDestroyView() { super.onDestroyView(); if (userDataPresenter != null) { @@ -197,4 +195,4 @@ homePagePresenter.disposeRetrofitRequest(); } } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 1657341..13aa09b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -76,7 +76,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserDeptId()); + phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 9e3437c..859d2ac 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -37,8 +37,9 @@ Color.rgb(120, 104, 230)}; public static final String IP_KEY = "ip"; - public static final String BRIDGE_LIST = "projectBridges"; - public static final String TOILET_LIST = "toilets"; + static final String USER_BEAN = "userBean"; + static final String BRIDGE_LIST = "projectBridges"; + static final String TOILET_LIST = "toilets"; public static final long HALF_YEAR = 180 * 60 * 60 * 24 * 1000L; public static final long ONE_YEAR = 365 * 60 * 60 * 24 * 1000L; diff --git a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java b/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java deleted file mode 100644 index 0286bb6..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.dcms.utils; - -import android.graphics.Rect; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -public class ItemDecorationSpace extends RecyclerView.ItemDecoration { - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (parent.getChildAdapterPosition(view) % 2 == 0) { - outRect.left = 0; - outRect.right = 5; - } else if (parent.getChildAdapterPosition(view) % 2 == 1) { - outRect.left = 5; - outRect.right = 0; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 4dd4dbd..cac58c5 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,7 +4,14 @@ import android.util.Log; import com.casic.dcms.R; +import com.casic.dcms.bean.HomePageBean; +import com.casic.dcms.bean.ProjectConfigBean; +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -21,44 +28,45 @@ return (String) SaveKeyValues.getValue("userAccount", ""); } - public static void saveUserId(String userId) { - SaveKeyValues.putValue("userId", userId); + public static void saveUserBean(String userBeanJson) { + SaveKeyValues.putValue(Constant.USER_BEAN, userBeanJson); } - public static String getUserId() { - return (String) SaveKeyValues.getValue("userId", ""); + public static UserBean.DataBean getUserBean() { + String userBeanJson = (String) SaveKeyValues.getValue(Constant.USER_BEAN, ""); + UserBean.DataBean dataBean = new UserBean.DataBean(); + if (userBeanJson.equals("")) { + return dataBean; + } + return new Gson().fromJson(userBeanJson, UserBean.DataBean.class); } - public static void saveUserName(String name) { - SaveKeyValues.putValue("userName", name); + public static void saveBridgeList(String bridgesJson) { + SaveKeyValues.putValue(Constant.BRIDGE_LIST, bridgesJson); } - public static String getUserName() { - return (String) SaveKeyValues.getValue("userName", ""); + public static List getBridgeBeanList() { + String bridgesJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); + List bridges = new ArrayList<>(); + if (bridgesJson.equals("")) { + return bridges; + } + return new Gson().fromJson(bridgesJson, new TypeToken>() { + }.getType()); } - public static void saveUserPhone(String phone) { - SaveKeyValues.putValue("userPhone", phone); + public static void saveToiletList(String toiletsJson) { + SaveKeyValues.putValue(Constant.TOILET_LIST, toiletsJson); } - public static String getUserPhone() { - return (String) SaveKeyValues.getValue("userPhone", ""); - } - - public static void saveUserDept(String dept) { - SaveKeyValues.putValue("userDept", dept); - } - - public static String getUserDept() { - return (String) SaveKeyValues.getValue("userDept", ""); - } - - public static void saveUserDeptId(String deptid) { - SaveKeyValues.putValue("userDeptId", deptid); - } - - public static String getUserDeptId() { - return (String) SaveKeyValues.getValue("userDeptId", ""); + public static List getToiletBeanList() { + String toiletsJson = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); + List toilets = new ArrayList<>(); + if (toiletsJson.equals("")) { + return toilets; + } + return new Gson().fromJson(toiletsJson, new TypeToken>() { + }.getType()); } public static boolean isLetterAndDigit(String str) { diff --git a/app/src/main/res/drawable/ic_package_holder.xml b/app/src/main/res/drawable/ic_package_holder.xml deleted file mode 100644 index 1f5ad5e..0000000 --- a/app/src/main/res/drawable/ic_package_holder.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 1d21c58..b376886 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -50,10 +50,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -95,10 +94,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -142,10 +140,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - @@ -38,10 +37,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -53,10 +51,9 @@ style="@style/noPointTextViewStyle" android:text="核查图片" /> - diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index e754c14..7d7a7c2 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -136,10 +136,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -151,10 +150,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -166,10 +164,9 @@ style="@style/noPointTextViewStyle" android:text="核查图片" /> - diff --git a/app/src/main/res/layout/activity_case_handle_detail.xml b/app/src/main/res/layout/activity_case_handle_detail.xml index 4cc674c..19a1a4a 100644 --- a/app/src/main/res/layout/activity_case_handle_detail.xml +++ b/app/src/main/res/layout/activity_case_handle_detail.xml @@ -22,16 +22,13 @@ - + @@ -132,10 +129,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - @@ -150,10 +149,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - diff --git a/app/src/main/res/layout/activity_case_todo_detail.xml b/app/src/main/res/layout/activity_case_todo_detail.xml index 345ca19..255a52e 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -97,10 +97,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_todo_handled_detail.xml b/app/src/main/res/layout/activity_case_todo_handled_detail.xml index a929b43..2bb8cf1 100644 --- a/app/src/main/res/layout/activity_case_todo_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_handled_detail.xml @@ -151,10 +151,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_verified_detail.xml b/app/src/main/res/layout/activity_case_verified_detail.xml index 394d248..a39e000 100644 --- a/app/src/main/res/layout/activity_case_verified_detail.xml +++ b/app/src/main/res/layout/activity_case_verified_detail.xml @@ -50,10 +50,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_verify_detail.xml b/app/src/main/res/layout/activity_case_verify_detail.xml index 0c90a09..1220507 100644 --- a/app/src/main/res/layout/activity_case_verify_detail.xml +++ b/app/src/main/res/layout/activity_case_verify_detail.xml @@ -76,10 +76,9 @@ style="@style/tagTextViewStyle" android:text="案卷图片" /> - - + @@ -130,7 +127,6 @@ android:id="@+id/phoneNumberView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="@dimen/margin_10dp" android:background="@null" android:hint="请输入店主手机号码" android:inputType="phone" @@ -145,6 +141,7 @@ @@ -153,14 +150,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:orientation="vertical"> - + diff --git a/app/src/main/res/layout/activity_dept_authorize.xml b/app/src/main/res/layout/activity_dept_authorize.xml index b097a6e..22934d5 100644 --- a/app/src/main/res/layout/activity_dept_authorize.xml +++ b/app/src/main/res/layout/activity_dept_authorize.xml @@ -76,7 +76,6 @@ android:id="@+id/optionEditView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:background="@null" android:hint="请输入少于50个字的处理意见" android:maxLength="50" /> diff --git a/app/src/main/res/layout/activity_dept_todo.xml b/app/src/main/res/layout/activity_dept_todo.xml index b097a6e..22934d5 100644 --- a/app/src/main/res/layout/activity_dept_todo.xml +++ b/app/src/main/res/layout/activity_dept_todo.xml @@ -76,7 +76,6 @@ android:id="@+id/optionEditView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:background="@null" android:hint="请输入少于50个字的处理意见" android:maxLength="50" /> diff --git a/app/src/main/res/layout/activity_package_handled.xml b/app/src/main/res/layout/activity_package_handled.xml index 5298ba1..8791216 100644 --- a/app/src/main/res/layout/activity_package_handled.xml +++ b/app/src/main/res/layout/activity_package_handled.xml @@ -23,10 +23,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -66,10 +65,9 @@ style="@style/noPointTextViewStyle" android:text="处罚图片" /> - diff --git a/app/src/main/res/layout/activity_package_todo.xml b/app/src/main/res/layout/activity_package_todo.xml index c20b869..fa5dae0 100644 --- a/app/src/main/res/layout/activity_package_todo.xml +++ b/app/src/main/res/layout/activity_package_todo.xml @@ -56,10 +56,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:layout_marginStart="100dp"> - + - + @@ -84,7 +83,6 @@ android:id="@+id/phoneNumberView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="@dimen/margin_10dp" android:background="@null" android:hint="请输入店主手机号码" android:inputType="phone" @@ -104,7 +102,6 @@ android:id="@+id/caseDetailEditView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:background="@null" android:hint="请输入少于50个字的案卷情况描述" android:maxLength="50" @@ -126,14 +123,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:orientation="vertical"> - + images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 91bf9f9..e3a2c99 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -11,7 +11,9 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -20,13 +22,11 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -104,8 +103,8 @@ JzvdStd videoPlayerView; @BindView(R.id.addImageView) ImageView addImageView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -125,7 +124,7 @@ private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; private UploadVideoPresenterImpl uploadVideoPresenter; private String audioUrl, videoUrl; @@ -164,10 +163,8 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @SuppressLint("ClickableViewAccessibility") @@ -534,7 +531,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); imageList.add(url); @@ -542,21 +539,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -618,7 +615,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index aa02a1c..b7b71f5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -62,8 +61,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -73,7 +72,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -97,10 +96,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -217,7 +214,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -273,7 +270,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -281,21 +278,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 964490e..f4f3501 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -29,7 +29,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -71,8 +70,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -90,7 +89,7 @@ private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; @Override @@ -115,10 +114,8 @@ .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -331,28 +328,28 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -401,7 +398,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b8f97ec..496edba 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -57,8 +56,8 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -121,19 +120,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index c3b3b66..5f6a3e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -39,7 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -87,16 +86,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseOpinionView) TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; - @BindView(R.id.caseVerifyRecyclerView) - RecyclerView caseVerifyRecyclerView; + @BindView(R.id.verifyGridView) + GridView verifyGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -139,7 +138,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private ImageRecycleViewAdapter verifyImageAdapter; + private ImageGridViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -168,10 +167,8 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); - verifyImageAdapter = new ImageRecycleViewAdapter(this); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(verifyImageAdapter); + verifyImageAdapter = new ImageGridViewAdapter(this); + verifyGridView.setAdapter(verifyImageAdapter); } @Override @@ -226,19 +223,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -386,7 +381,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -402,7 +397,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -533,7 +528,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = verifyImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -541,22 +536,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); //九宫格点击事件 - verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + verifyGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - verifyImageAdapter.setDeleteView(true); - verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + verifyImageAdapter.isDeleteVisible(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 3cedbfe..8b08041 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -57,8 +56,8 @@ EditText shopKeeperView; @BindView(R.id.phoneNumberView) EditText phoneNumberView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -67,7 +66,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopChangePresenterImpl shopChangePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; private ArrayList realPaths = new ArrayList<>();//真实图片路径 @@ -91,10 +90,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -153,7 +150,7 @@ ToastHelper.showToast("店主名还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -235,7 +232,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -243,21 +240,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 381b704..d371d17 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -80,7 +80,7 @@ @Override public void initEvent() { - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", "", "", pageIndex); + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); calendarView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -98,7 +98,7 @@ endGroup = endGroupPosition;//结束月份位置 endChild = endChildPosition;//结束对应月份中日的位置 dateView.setText(startDate + "~" + endDate); - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", startDate, endDate, pageIndex); } }).builder(); @@ -110,7 +110,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); @@ -119,7 +119,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0d7053a..3662274 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -3,17 +3,17 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -27,7 +27,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAdjustFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -66,14 +65,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.optionEditView) @@ -207,19 +206,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -250,19 +247,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index bd491c3..19b9039 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAuthorizeFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -70,14 +69,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -264,19 +263,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -307,19 +304,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java index f22a99d..797b130 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -32,7 +32,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -71,14 +70,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -157,19 +156,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -200,19 +197,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 1c1fcd0..e40d2cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -22,9 +22,11 @@ import com.casic.dcms.base.BaseApplication; import com.casic.dcms.base.DoubleClickExitActivity; import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.HomePageBean; import com.casic.dcms.bean.NoticeBean; import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.greendao.NoticeBeanDao; import com.casic.dcms.mvp.presenter.PushRegisterPresenterImpl; import com.casic.dcms.mvp.presenter.ToiletListPresenterImpl; @@ -44,6 +46,8 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StatusBarColorUtil; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.callback.IHttpRequestListener; import com.casic.dcms.widgets.NoScrollViewPager; import com.google.android.material.bottomnavigation.BottomNavigationView; @@ -59,7 +63,8 @@ import butterknife.BindView; import okhttp3.ResponseBody; -public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, IPushRegisterView, IToiletListView { +public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, + IPushRegisterView, IToiletListView { private static final String TAG = "MainActivity"; @BindView(R.id.pageTitleView) @@ -100,18 +105,17 @@ uploadPositionPresenter = new UploadPositionPresenterImpl(this); registerPresenter = new PushRegisterPresenterImpl(this); toiletListPresenter = new ToiletListPresenterImpl(this); - gson = new Gson(); + //获取配置项 + obtainProjectConfig(); + //配置页面 pageList = new ArrayList<>(); pageList.add(new HomePageFragment()); pageList.add(new PhonePageFragment()); pageList.add(new NoticePageFragment()); pageList.add(new MinePageFragment()); + imei = OtherUtils.obtainSimCardSerialNumber(this); - - //获取配置项 - obtainProjectConfig(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UploadLocationService.class)); } else { @@ -128,7 +132,7 @@ try { String resultStr = resultBean.string(); List bridges = gson.fromJson(resultStr, ProjectConfigBean.class).getBridges(); - SaveKeyValues.putValue(Constant.BRIDGE_LIST, gson.toJson(bridges)); + StringHelper.saveBridgeList(gson.toJson(bridges)); } catch (IOException e) { e.printStackTrace(); } @@ -310,7 +314,7 @@ @Override public void obtainToiletListData(ToiletListBean resultBean) { if (resultBean.isSuccess()) { - SaveKeyValues.putValue(Constant.TOILET_LIST, gson.toJson(resultBean.getData())); + StringHelper.saveToiletList(gson.toJson(resultBean.getData())); } } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 441625b..fe48830 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -3,18 +3,16 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -44,16 +42,16 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.punishTypeView) TextView punishTypeView; @BindView(R.id.punishOpinionView) TextView punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.punishDateView) TextView punishDateView; @@ -106,19 +104,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -131,19 +127,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处罚记录 @@ -158,19 +152,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + punishGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } punishDateView.setText(data.getPunishTime()); } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index 1dec74b..6711568 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -5,7 +5,9 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; @@ -13,11 +15,9 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; @@ -78,8 +77,8 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.line1) @@ -90,8 +89,8 @@ View line2; @BindView(R.id.reasonLayout) RelativeLayout reasonLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.addHandleImageView) ImageView addHandleImageView; @BindView(R.id.caseReasonView) @@ -102,8 +101,8 @@ TextView punishTypeView; @BindView(R.id.punishOpinionView) EditText punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.addPunishImageView) ImageView addPunishImageView; @BindView(R.id.punishDateView) @@ -120,7 +119,8 @@ private ArrayList punishRealPaths = new ArrayList<>();//真实图片路径 private List handleImageList = new ArrayList<>();//上传到服务器的数据集 private List punishImageList = new ArrayList<>();//上传到服务器的数据集 - private ImageRecycleViewAdapter punishImageAdapter, handleImageAdapter; + private ImageGridViewAdapter handleImageAdapter; + private ImageGridViewAdapter punishImageAdapter; private CaseNextNodePresenterImpl caseNextNodePresenter; private String changeState; private String approvalResult; @@ -155,17 +155,13 @@ .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); //处罚adapter - punishImageAdapter = new ImageRecycleViewAdapter(this); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(punishImageAdapter); + punishImageAdapter = new ImageGridViewAdapter(this); + punishGridView.setAdapter(punishImageAdapter); //下级结点 caseNextNodePresenter = new CaseNextNodePresenterImpl(this); - //案卷处理adapter - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); caseHandlePresenter = new CaseHandlePresenterImpl(this); packageHandlePresenter = new PackageHandlePresenterImpl(this); @@ -206,19 +202,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -231,19 +225,16 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + handleImageAdapter.setImageList(urls); + handleGridView.setAdapter(handleImageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + handleImageAdapter.isDeleteVisible(true); } } } @@ -382,7 +373,7 @@ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg if (isAddHandleImage) { //处理图片 - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); handleImageList.add(url); @@ -390,22 +381,22 @@ if (handleRealPaths.size() == 2) { addHandleImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, handleRealPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { handleImageList.remove(position); handleRealPaths.remove(position); - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); if (handleRealPaths.size() != 2) { addHandleImageView.setVisibility(View.VISIBLE); } @@ -416,7 +407,7 @@ } } else { //处罚图片 - int sumItemCount = punishImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = punishImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); punishImageList.add(url); @@ -424,21 +415,21 @@ if (punishRealPaths.size() == 2) { addPunishImageView.setVisibility(View.GONE); } - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); //九宫格点击事件 - punishImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, punishRealPaths); } }); //删除按钮点击事件 - punishImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + punishImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { punishImageList.remove(position); punishRealPaths.remove(position); - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); if (punishRealPaths.size() != 2) { addPunishImageView.setVisibility(View.VISIBLE); } @@ -506,7 +497,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index 7e3d47e..7c58e30 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -31,7 +31,6 @@ import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; @@ -50,8 +49,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; @@ -216,16 +213,14 @@ mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.obtainToiletIdLayout: - String toiletValue = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); - if (toiletValue.equals("")) { + List toiletBeanList = StringHelper.getToiletBeanList(); + if (toiletBeanList.size() == 0) { ToastHelper.showToast("获取公厕数据失败，请联系管理员", ToastHelper.ERROR); return; } - List dataBeans = new Gson().fromJson(toiletValue, new TypeToken>() { - }.getType()); QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("请选择您要打卡的公厕"); - for (ToiletListBean.DataBean it : dataBeans) { + for (ToiletListBean.DataBean it : toiletBeanList) { sheetBuilder.addItem(it.getName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -233,7 +228,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - toiletIdView.setText(dataBeans.get(position).getId()); + toiletIdView.setText(toiletBeanList.get(position).getId()); //TODO 是否需要将地图移到相应的公厕，待定 } }).build().show(); @@ -308,7 +303,7 @@ ToastHelper.showToast("保洁开始时间不能为空", ToastHelper.WARING); return; } - cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserId(), + cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, endTimeView.getText().toString(), imagePath, StringHelper.filterString(workContentView.getText().toString())); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 3a8ebc6..9f316a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -7,6 +7,7 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.utils.StringHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; @@ -47,9 +48,10 @@ @Override public void initData() { - userNameView.setText(StringHelper.getUserName()); - userPhoneView.setText(StringHelper.getUserPhone()); - userDeptView.setText(StringHelper.getUserDept()); + UserBean.DataBean userBean = StringHelper.getUserBean(); + userNameView.setText(userBean.getName()); + userPhoneView.setText(userBean.getPhone()); + userDeptView.setText(userBean.getDeptName()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index d9656aa..16bd2e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -39,6 +39,7 @@ import com.casic.dcms.ui.UrgentCaseActivity; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import butterknife.BindView; @@ -74,36 +75,38 @@ @Override protected void initData() { - userDataPresenter = new UserDataPresenterImpl(this); homePagePresenter = new HomePagePresenterImpl(this); + userDataPresenter = new UserDataPresenterImpl(this); + + //用户信息 + userDataPresenter.onReadyRetrofitRequest(); + //首页相关功能项 + homePagePresenter.onReadyRetrofitRequest("05"); } @Override protected void initEvent() { - userDataPresenter.onReadyRetrofitRequest(); - homePagePresenter.onReadyRetrofitRequest("05"); + //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 +// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); + Glide.with(this).load(R.mipmap.app_logo).into(userIconView); } @SuppressLint("SetTextI18n") @Override public void obtainUserData(UserBean userBean) { if (userBean.isSuccess()) { - //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 -// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); - Glide.with(this).load(R.mipmap.app_logo).into(userIconView); + UserBean.DataBean dataBean = userBean.getData(); + StringHelper.saveUserBean(new Gson().toJson(dataBean)); - UserBean.DataBean data = userBean.getData(); - userNameView.setText(data.getName()); - userDeptView.setText(data.getDeptName() + data.getRoleNames()); - - StringHelper.saveUserName(data.getName()); - StringHelper.saveUserPhone(data.getPhone()); - StringHelper.saveUserDept(data.getDeptName()); - StringHelper.saveUserDeptId(data.getDeptId()); - StringHelper.saveUserId(data.getId()); + userNameView.setText(dataBean.getName()); + userDeptView.setText(dataBean.getDeptName() + dataBean.getRoleNames()); } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); + } @Override public void obtainHomePageResult(HomePageBean resultBean) { @@ -183,11 +186,6 @@ } @Override - public void obtainDataFail() { - ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); - } - - @Override public void onDestroyView() { super.onDestroyView(); if (userDataPresenter != null) { @@ -197,4 +195,4 @@ homePagePresenter.disposeRetrofitRequest(); } } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 1657341..13aa09b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -76,7 +76,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserDeptId()); + phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 9e3437c..859d2ac 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -37,8 +37,9 @@ Color.rgb(120, 104, 230)}; public static final String IP_KEY = "ip"; - public static final String BRIDGE_LIST = "projectBridges"; - public static final String TOILET_LIST = "toilets"; + static final String USER_BEAN = "userBean"; + static final String BRIDGE_LIST = "projectBridges"; + static final String TOILET_LIST = "toilets"; public static final long HALF_YEAR = 180 * 60 * 60 * 24 * 1000L; public static final long ONE_YEAR = 365 * 60 * 60 * 24 * 1000L; diff --git a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java b/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java deleted file mode 100644 index 0286bb6..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.dcms.utils; - -import android.graphics.Rect; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -public class ItemDecorationSpace extends RecyclerView.ItemDecoration { - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (parent.getChildAdapterPosition(view) % 2 == 0) { - outRect.left = 0; - outRect.right = 5; - } else if (parent.getChildAdapterPosition(view) % 2 == 1) { - outRect.left = 5; - outRect.right = 0; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 4dd4dbd..cac58c5 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,7 +4,14 @@ import android.util.Log; import com.casic.dcms.R; +import com.casic.dcms.bean.HomePageBean; +import com.casic.dcms.bean.ProjectConfigBean; +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -21,44 +28,45 @@ return (String) SaveKeyValues.getValue("userAccount", ""); } - public static void saveUserId(String userId) { - SaveKeyValues.putValue("userId", userId); + public static void saveUserBean(String userBeanJson) { + SaveKeyValues.putValue(Constant.USER_BEAN, userBeanJson); } - public static String getUserId() { - return (String) SaveKeyValues.getValue("userId", ""); + public static UserBean.DataBean getUserBean() { + String userBeanJson = (String) SaveKeyValues.getValue(Constant.USER_BEAN, ""); + UserBean.DataBean dataBean = new UserBean.DataBean(); + if (userBeanJson.equals("")) { + return dataBean; + } + return new Gson().fromJson(userBeanJson, UserBean.DataBean.class); } - public static void saveUserName(String name) { - SaveKeyValues.putValue("userName", name); + public static void saveBridgeList(String bridgesJson) { + SaveKeyValues.putValue(Constant.BRIDGE_LIST, bridgesJson); } - public static String getUserName() { - return (String) SaveKeyValues.getValue("userName", ""); + public static List getBridgeBeanList() { + String bridgesJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); + List bridges = new ArrayList<>(); + if (bridgesJson.equals("")) { + return bridges; + } + return new Gson().fromJson(bridgesJson, new TypeToken>() { + }.getType()); } - public static void saveUserPhone(String phone) { - SaveKeyValues.putValue("userPhone", phone); + public static void saveToiletList(String toiletsJson) { + SaveKeyValues.putValue(Constant.TOILET_LIST, toiletsJson); } - public static String getUserPhone() { - return (String) SaveKeyValues.getValue("userPhone", ""); - } - - public static void saveUserDept(String dept) { - SaveKeyValues.putValue("userDept", dept); - } - - public static String getUserDept() { - return (String) SaveKeyValues.getValue("userDept", ""); - } - - public static void saveUserDeptId(String deptid) { - SaveKeyValues.putValue("userDeptId", deptid); - } - - public static String getUserDeptId() { - return (String) SaveKeyValues.getValue("userDeptId", ""); + public static List getToiletBeanList() { + String toiletsJson = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); + List toilets = new ArrayList<>(); + if (toiletsJson.equals("")) { + return toilets; + } + return new Gson().fromJson(toiletsJson, new TypeToken>() { + }.getType()); } public static boolean isLetterAndDigit(String str) { diff --git a/app/src/main/res/drawable/ic_package_holder.xml b/app/src/main/res/drawable/ic_package_holder.xml deleted file mode 100644 index 1f5ad5e..0000000 --- a/app/src/main/res/drawable/ic_package_holder.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 1d21c58..b376886 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -50,10 +50,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -95,10 +94,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -142,10 +140,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - @@ -38,10 +37,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -53,10 +51,9 @@ style="@style/noPointTextViewStyle" android:text="核查图片" /> - diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index e754c14..7d7a7c2 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -136,10 +136,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -151,10 +150,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -166,10 +164,9 @@ style="@style/noPointTextViewStyle" android:text="核查图片" /> - diff --git a/app/src/main/res/layout/activity_case_handle_detail.xml b/app/src/main/res/layout/activity_case_handle_detail.xml index 4cc674c..19a1a4a 100644 --- a/app/src/main/res/layout/activity_case_handle_detail.xml +++ b/app/src/main/res/layout/activity_case_handle_detail.xml @@ -22,16 +22,13 @@ - + @@ -132,10 +129,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - @@ -150,10 +149,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - diff --git a/app/src/main/res/layout/activity_case_todo_detail.xml b/app/src/main/res/layout/activity_case_todo_detail.xml index 345ca19..255a52e 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -97,10 +97,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_todo_handled_detail.xml b/app/src/main/res/layout/activity_case_todo_handled_detail.xml index a929b43..2bb8cf1 100644 --- a/app/src/main/res/layout/activity_case_todo_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_handled_detail.xml @@ -151,10 +151,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_verified_detail.xml b/app/src/main/res/layout/activity_case_verified_detail.xml index 394d248..a39e000 100644 --- a/app/src/main/res/layout/activity_case_verified_detail.xml +++ b/app/src/main/res/layout/activity_case_verified_detail.xml @@ -50,10 +50,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_verify_detail.xml b/app/src/main/res/layout/activity_case_verify_detail.xml index 0c90a09..1220507 100644 --- a/app/src/main/res/layout/activity_case_verify_detail.xml +++ b/app/src/main/res/layout/activity_case_verify_detail.xml @@ -76,10 +76,9 @@ style="@style/tagTextViewStyle" android:text="案卷图片" /> - - + @@ -130,7 +127,6 @@ android:id="@+id/phoneNumberView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="@dimen/margin_10dp" android:background="@null" android:hint="请输入店主手机号码" android:inputType="phone" @@ -145,6 +141,7 @@ @@ -153,14 +150,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:orientation="vertical"> - + diff --git a/app/src/main/res/layout/activity_dept_authorize.xml b/app/src/main/res/layout/activity_dept_authorize.xml index b097a6e..22934d5 100644 --- a/app/src/main/res/layout/activity_dept_authorize.xml +++ b/app/src/main/res/layout/activity_dept_authorize.xml @@ -76,7 +76,6 @@ android:id="@+id/optionEditView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:background="@null" android:hint="请输入少于50个字的处理意见" android:maxLength="50" /> diff --git a/app/src/main/res/layout/activity_dept_todo.xml b/app/src/main/res/layout/activity_dept_todo.xml index b097a6e..22934d5 100644 --- a/app/src/main/res/layout/activity_dept_todo.xml +++ b/app/src/main/res/layout/activity_dept_todo.xml @@ -76,7 +76,6 @@ android:id="@+id/optionEditView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:background="@null" android:hint="请输入少于50个字的处理意见" android:maxLength="50" /> diff --git a/app/src/main/res/layout/activity_package_handled.xml b/app/src/main/res/layout/activity_package_handled.xml index 5298ba1..8791216 100644 --- a/app/src/main/res/layout/activity_package_handled.xml +++ b/app/src/main/res/layout/activity_package_handled.xml @@ -23,10 +23,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -66,10 +65,9 @@ style="@style/noPointTextViewStyle" android:text="处罚图片" /> - diff --git a/app/src/main/res/layout/activity_package_todo.xml b/app/src/main/res/layout/activity_package_todo.xml index c20b869..fa5dae0 100644 --- a/app/src/main/res/layout/activity_package_todo.xml +++ b/app/src/main/res/layout/activity_package_todo.xml @@ -56,10 +56,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:layout_marginStart="100dp"> - + - + @@ -84,7 +83,6 @@ android:id="@+id/phoneNumberView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="@dimen/margin_10dp" android:background="@null" android:hint="请输入店主手机号码" android:inputType="phone" @@ -104,7 +102,6 @@ android:id="@+id/caseDetailEditView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:background="@null" android:hint="请输入少于50个字的案卷情况描述" android:maxLength="50" @@ -126,14 +123,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:orientation="vertical"> - + + style="@style/detailTextViewStyle" /> @@ -62,7 +61,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:background="@null" android:hint="社区通过地图选点获取" android:padding="3dp" @@ -83,7 +81,6 @@ android:id="@+id/caseLocationView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:background="@null" android:hint="请输入案卷发生的地点" android:maxLength="50" diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 91bf9f9..e3a2c99 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -11,7 +11,9 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -20,13 +22,11 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -104,8 +103,8 @@ JzvdStd videoPlayerView; @BindView(R.id.addImageView) ImageView addImageView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -125,7 +124,7 @@ private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; private UploadVideoPresenterImpl uploadVideoPresenter; private String audioUrl, videoUrl; @@ -164,10 +163,8 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @SuppressLint("ClickableViewAccessibility") @@ -534,7 +531,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); imageList.add(url); @@ -542,21 +539,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -618,7 +615,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index aa02a1c..b7b71f5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -62,8 +61,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -73,7 +72,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -97,10 +96,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -217,7 +214,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -273,7 +270,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -281,21 +278,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 964490e..f4f3501 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -29,7 +29,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -71,8 +70,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -90,7 +89,7 @@ private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; @Override @@ -115,10 +114,8 @@ .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -331,28 +328,28 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -401,7 +398,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b8f97ec..496edba 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -57,8 +56,8 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -121,19 +120,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index c3b3b66..5f6a3e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -39,7 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -87,16 +86,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseOpinionView) TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; - @BindView(R.id.caseVerifyRecyclerView) - RecyclerView caseVerifyRecyclerView; + @BindView(R.id.verifyGridView) + GridView verifyGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -139,7 +138,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private ImageRecycleViewAdapter verifyImageAdapter; + private ImageGridViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -168,10 +167,8 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); - verifyImageAdapter = new ImageRecycleViewAdapter(this); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(verifyImageAdapter); + verifyImageAdapter = new ImageGridViewAdapter(this); + verifyGridView.setAdapter(verifyImageAdapter); } @Override @@ -226,19 +223,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -386,7 +381,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -402,7 +397,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -533,7 +528,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = verifyImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -541,22 +536,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); //九宫格点击事件 - verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + verifyGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - verifyImageAdapter.setDeleteView(true); - verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + verifyImageAdapter.isDeleteVisible(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 3cedbfe..8b08041 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -57,8 +56,8 @@ EditText shopKeeperView; @BindView(R.id.phoneNumberView) EditText phoneNumberView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -67,7 +66,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopChangePresenterImpl shopChangePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; private ArrayList realPaths = new ArrayList<>();//真实图片路径 @@ -91,10 +90,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -153,7 +150,7 @@ ToastHelper.showToast("店主名还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -235,7 +232,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -243,21 +240,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 381b704..d371d17 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -80,7 +80,7 @@ @Override public void initEvent() { - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", "", "", pageIndex); + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); calendarView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -98,7 +98,7 @@ endGroup = endGroupPosition;//结束月份位置 endChild = endChildPosition;//结束对应月份中日的位置 dateView.setText(startDate + "~" + endDate); - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", startDate, endDate, pageIndex); } }).builder(); @@ -110,7 +110,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); @@ -119,7 +119,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0d7053a..3662274 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -3,17 +3,17 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -27,7 +27,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAdjustFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -66,14 +65,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.optionEditView) @@ -207,19 +206,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -250,19 +247,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index bd491c3..19b9039 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAuthorizeFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -70,14 +69,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -264,19 +263,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -307,19 +304,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java index f22a99d..797b130 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -32,7 +32,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -71,14 +70,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -157,19 +156,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -200,19 +197,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 1c1fcd0..e40d2cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -22,9 +22,11 @@ import com.casic.dcms.base.BaseApplication; import com.casic.dcms.base.DoubleClickExitActivity; import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.HomePageBean; import com.casic.dcms.bean.NoticeBean; import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.greendao.NoticeBeanDao; import com.casic.dcms.mvp.presenter.PushRegisterPresenterImpl; import com.casic.dcms.mvp.presenter.ToiletListPresenterImpl; @@ -44,6 +46,8 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StatusBarColorUtil; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.callback.IHttpRequestListener; import com.casic.dcms.widgets.NoScrollViewPager; import com.google.android.material.bottomnavigation.BottomNavigationView; @@ -59,7 +63,8 @@ import butterknife.BindView; import okhttp3.ResponseBody; -public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, IPushRegisterView, IToiletListView { +public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, + IPushRegisterView, IToiletListView { private static final String TAG = "MainActivity"; @BindView(R.id.pageTitleView) @@ -100,18 +105,17 @@ uploadPositionPresenter = new UploadPositionPresenterImpl(this); registerPresenter = new PushRegisterPresenterImpl(this); toiletListPresenter = new ToiletListPresenterImpl(this); - gson = new Gson(); + //获取配置项 + obtainProjectConfig(); + //配置页面 pageList = new ArrayList<>(); pageList.add(new HomePageFragment()); pageList.add(new PhonePageFragment()); pageList.add(new NoticePageFragment()); pageList.add(new MinePageFragment()); + imei = OtherUtils.obtainSimCardSerialNumber(this); - - //获取配置项 - obtainProjectConfig(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UploadLocationService.class)); } else { @@ -128,7 +132,7 @@ try { String resultStr = resultBean.string(); List bridges = gson.fromJson(resultStr, ProjectConfigBean.class).getBridges(); - SaveKeyValues.putValue(Constant.BRIDGE_LIST, gson.toJson(bridges)); + StringHelper.saveBridgeList(gson.toJson(bridges)); } catch (IOException e) { e.printStackTrace(); } @@ -310,7 +314,7 @@ @Override public void obtainToiletListData(ToiletListBean resultBean) { if (resultBean.isSuccess()) { - SaveKeyValues.putValue(Constant.TOILET_LIST, gson.toJson(resultBean.getData())); + StringHelper.saveToiletList(gson.toJson(resultBean.getData())); } } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 441625b..fe48830 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -3,18 +3,16 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -44,16 +42,16 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.punishTypeView) TextView punishTypeView; @BindView(R.id.punishOpinionView) TextView punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.punishDateView) TextView punishDateView; @@ -106,19 +104,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -131,19 +127,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处罚记录 @@ -158,19 +152,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + punishGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } punishDateView.setText(data.getPunishTime()); } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index 1dec74b..6711568 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -5,7 +5,9 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; @@ -13,11 +15,9 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; @@ -78,8 +77,8 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.line1) @@ -90,8 +89,8 @@ View line2; @BindView(R.id.reasonLayout) RelativeLayout reasonLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.addHandleImageView) ImageView addHandleImageView; @BindView(R.id.caseReasonView) @@ -102,8 +101,8 @@ TextView punishTypeView; @BindView(R.id.punishOpinionView) EditText punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.addPunishImageView) ImageView addPunishImageView; @BindView(R.id.punishDateView) @@ -120,7 +119,8 @@ private ArrayList punishRealPaths = new ArrayList<>();//真实图片路径 private List handleImageList = new ArrayList<>();//上传到服务器的数据集 private List punishImageList = new ArrayList<>();//上传到服务器的数据集 - private ImageRecycleViewAdapter punishImageAdapter, handleImageAdapter; + private ImageGridViewAdapter handleImageAdapter; + private ImageGridViewAdapter punishImageAdapter; private CaseNextNodePresenterImpl caseNextNodePresenter; private String changeState; private String approvalResult; @@ -155,17 +155,13 @@ .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); //处罚adapter - punishImageAdapter = new ImageRecycleViewAdapter(this); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(punishImageAdapter); + punishImageAdapter = new ImageGridViewAdapter(this); + punishGridView.setAdapter(punishImageAdapter); //下级结点 caseNextNodePresenter = new CaseNextNodePresenterImpl(this); - //案卷处理adapter - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); caseHandlePresenter = new CaseHandlePresenterImpl(this); packageHandlePresenter = new PackageHandlePresenterImpl(this); @@ -206,19 +202,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -231,19 +225,16 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + handleImageAdapter.setImageList(urls); + handleGridView.setAdapter(handleImageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + handleImageAdapter.isDeleteVisible(true); } } } @@ -382,7 +373,7 @@ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg if (isAddHandleImage) { //处理图片 - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); handleImageList.add(url); @@ -390,22 +381,22 @@ if (handleRealPaths.size() == 2) { addHandleImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, handleRealPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { handleImageList.remove(position); handleRealPaths.remove(position); - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); if (handleRealPaths.size() != 2) { addHandleImageView.setVisibility(View.VISIBLE); } @@ -416,7 +407,7 @@ } } else { //处罚图片 - int sumItemCount = punishImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = punishImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); punishImageList.add(url); @@ -424,21 +415,21 @@ if (punishRealPaths.size() == 2) { addPunishImageView.setVisibility(View.GONE); } - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); //九宫格点击事件 - punishImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, punishRealPaths); } }); //删除按钮点击事件 - punishImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + punishImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { punishImageList.remove(position); punishRealPaths.remove(position); - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); if (punishRealPaths.size() != 2) { addPunishImageView.setVisibility(View.VISIBLE); } @@ -506,7 +497,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index 7e3d47e..7c58e30 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -31,7 +31,6 @@ import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; @@ -50,8 +49,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; @@ -216,16 +213,14 @@ mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.obtainToiletIdLayout: - String toiletValue = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); - if (toiletValue.equals("")) { + List toiletBeanList = StringHelper.getToiletBeanList(); + if (toiletBeanList.size() == 0) { ToastHelper.showToast("获取公厕数据失败，请联系管理员", ToastHelper.ERROR); return; } - List dataBeans = new Gson().fromJson(toiletValue, new TypeToken>() { - }.getType()); QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("请选择您要打卡的公厕"); - for (ToiletListBean.DataBean it : dataBeans) { + for (ToiletListBean.DataBean it : toiletBeanList) { sheetBuilder.addItem(it.getName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -233,7 +228,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - toiletIdView.setText(dataBeans.get(position).getId()); + toiletIdView.setText(toiletBeanList.get(position).getId()); //TODO 是否需要将地图移到相应的公厕，待定 } }).build().show(); @@ -308,7 +303,7 @@ ToastHelper.showToast("保洁开始时间不能为空", ToastHelper.WARING); return; } - cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserId(), + cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, endTimeView.getText().toString(), imagePath, StringHelper.filterString(workContentView.getText().toString())); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 3a8ebc6..9f316a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -7,6 +7,7 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.utils.StringHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; @@ -47,9 +48,10 @@ @Override public void initData() { - userNameView.setText(StringHelper.getUserName()); - userPhoneView.setText(StringHelper.getUserPhone()); - userDeptView.setText(StringHelper.getUserDept()); + UserBean.DataBean userBean = StringHelper.getUserBean(); + userNameView.setText(userBean.getName()); + userPhoneView.setText(userBean.getPhone()); + userDeptView.setText(userBean.getDeptName()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index d9656aa..16bd2e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -39,6 +39,7 @@ import com.casic.dcms.ui.UrgentCaseActivity; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import butterknife.BindView; @@ -74,36 +75,38 @@ @Override protected void initData() { - userDataPresenter = new UserDataPresenterImpl(this); homePagePresenter = new HomePagePresenterImpl(this); + userDataPresenter = new UserDataPresenterImpl(this); + + //用户信息 + userDataPresenter.onReadyRetrofitRequest(); + //首页相关功能项 + homePagePresenter.onReadyRetrofitRequest("05"); } @Override protected void initEvent() { - userDataPresenter.onReadyRetrofitRequest(); - homePagePresenter.onReadyRetrofitRequest("05"); + //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 +// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); + Glide.with(this).load(R.mipmap.app_logo).into(userIconView); } @SuppressLint("SetTextI18n") @Override public void obtainUserData(UserBean userBean) { if (userBean.isSuccess()) { - //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 -// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); - Glide.with(this).load(R.mipmap.app_logo).into(userIconView); + UserBean.DataBean dataBean = userBean.getData(); + StringHelper.saveUserBean(new Gson().toJson(dataBean)); - UserBean.DataBean data = userBean.getData(); - userNameView.setText(data.getName()); - userDeptView.setText(data.getDeptName() + data.getRoleNames()); - - StringHelper.saveUserName(data.getName()); - StringHelper.saveUserPhone(data.getPhone()); - StringHelper.saveUserDept(data.getDeptName()); - StringHelper.saveUserDeptId(data.getDeptId()); - StringHelper.saveUserId(data.getId()); + userNameView.setText(dataBean.getName()); + userDeptView.setText(dataBean.getDeptName() + dataBean.getRoleNames()); } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); + } @Override public void obtainHomePageResult(HomePageBean resultBean) { @@ -183,11 +186,6 @@ } @Override - public void obtainDataFail() { - ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); - } - - @Override public void onDestroyView() { super.onDestroyView(); if (userDataPresenter != null) { @@ -197,4 +195,4 @@ homePagePresenter.disposeRetrofitRequest(); } } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 1657341..13aa09b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -76,7 +76,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserDeptId()); + phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 9e3437c..859d2ac 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -37,8 +37,9 @@ Color.rgb(120, 104, 230)}; public static final String IP_KEY = "ip"; - public static final String BRIDGE_LIST = "projectBridges"; - public static final String TOILET_LIST = "toilets"; + static final String USER_BEAN = "userBean"; + static final String BRIDGE_LIST = "projectBridges"; + static final String TOILET_LIST = "toilets"; public static final long HALF_YEAR = 180 * 60 * 60 * 24 * 1000L; public static final long ONE_YEAR = 365 * 60 * 60 * 24 * 1000L; diff --git a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java b/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java deleted file mode 100644 index 0286bb6..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.dcms.utils; - -import android.graphics.Rect; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -public class ItemDecorationSpace extends RecyclerView.ItemDecoration { - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (parent.getChildAdapterPosition(view) % 2 == 0) { - outRect.left = 0; - outRect.right = 5; - } else if (parent.getChildAdapterPosition(view) % 2 == 1) { - outRect.left = 5; - outRect.right = 0; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 4dd4dbd..cac58c5 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,7 +4,14 @@ import android.util.Log; import com.casic.dcms.R; +import com.casic.dcms.bean.HomePageBean; +import com.casic.dcms.bean.ProjectConfigBean; +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -21,44 +28,45 @@ return (String) SaveKeyValues.getValue("userAccount", ""); } - public static void saveUserId(String userId) { - SaveKeyValues.putValue("userId", userId); + public static void saveUserBean(String userBeanJson) { + SaveKeyValues.putValue(Constant.USER_BEAN, userBeanJson); } - public static String getUserId() { - return (String) SaveKeyValues.getValue("userId", ""); + public static UserBean.DataBean getUserBean() { + String userBeanJson = (String) SaveKeyValues.getValue(Constant.USER_BEAN, ""); + UserBean.DataBean dataBean = new UserBean.DataBean(); + if (userBeanJson.equals("")) { + return dataBean; + } + return new Gson().fromJson(userBeanJson, UserBean.DataBean.class); } - public static void saveUserName(String name) { - SaveKeyValues.putValue("userName", name); + public static void saveBridgeList(String bridgesJson) { + SaveKeyValues.putValue(Constant.BRIDGE_LIST, bridgesJson); } - public static String getUserName() { - return (String) SaveKeyValues.getValue("userName", ""); + public static List getBridgeBeanList() { + String bridgesJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); + List bridges = new ArrayList<>(); + if (bridgesJson.equals("")) { + return bridges; + } + return new Gson().fromJson(bridgesJson, new TypeToken>() { + }.getType()); } - public static void saveUserPhone(String phone) { - SaveKeyValues.putValue("userPhone", phone); + public static void saveToiletList(String toiletsJson) { + SaveKeyValues.putValue(Constant.TOILET_LIST, toiletsJson); } - public static String getUserPhone() { - return (String) SaveKeyValues.getValue("userPhone", ""); - } - - public static void saveUserDept(String dept) { - SaveKeyValues.putValue("userDept", dept); - } - - public static String getUserDept() { - return (String) SaveKeyValues.getValue("userDept", ""); - } - - public static void saveUserDeptId(String deptid) { - SaveKeyValues.putValue("userDeptId", deptid); - } - - public static String getUserDeptId() { - return (String) SaveKeyValues.getValue("userDeptId", ""); + public static List getToiletBeanList() { + String toiletsJson = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); + List toilets = new ArrayList<>(); + if (toiletsJson.equals("")) { + return toilets; + } + return new Gson().fromJson(toiletsJson, new TypeToken>() { + }.getType()); } public static boolean isLetterAndDigit(String str) { diff --git a/app/src/main/res/drawable/ic_package_holder.xml b/app/src/main/res/drawable/ic_package_holder.xml deleted file mode 100644 index 1f5ad5e..0000000 --- a/app/src/main/res/drawable/ic_package_holder.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 1d21c58..b376886 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -50,10 +50,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -95,10 +94,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -142,10 +140,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - @@ -38,10 +37,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -53,10 +51,9 @@ style="@style/noPointTextViewStyle" android:text="核查图片" /> - diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index e754c14..7d7a7c2 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -136,10 +136,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -151,10 +150,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -166,10 +164,9 @@ style="@style/noPointTextViewStyle" android:text="核查图片" /> - diff --git a/app/src/main/res/layout/activity_case_handle_detail.xml b/app/src/main/res/layout/activity_case_handle_detail.xml index 4cc674c..19a1a4a 100644 --- a/app/src/main/res/layout/activity_case_handle_detail.xml +++ b/app/src/main/res/layout/activity_case_handle_detail.xml @@ -22,16 +22,13 @@ - + @@ -132,10 +129,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - @@ -150,10 +149,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - diff --git a/app/src/main/res/layout/activity_case_todo_detail.xml b/app/src/main/res/layout/activity_case_todo_detail.xml index 345ca19..255a52e 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -97,10 +97,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_todo_handled_detail.xml b/app/src/main/res/layout/activity_case_todo_handled_detail.xml index a929b43..2bb8cf1 100644 --- a/app/src/main/res/layout/activity_case_todo_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_handled_detail.xml @@ -151,10 +151,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_verified_detail.xml b/app/src/main/res/layout/activity_case_verified_detail.xml index 394d248..a39e000 100644 --- a/app/src/main/res/layout/activity_case_verified_detail.xml +++ b/app/src/main/res/layout/activity_case_verified_detail.xml @@ -50,10 +50,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_verify_detail.xml b/app/src/main/res/layout/activity_case_verify_detail.xml index 0c90a09..1220507 100644 --- a/app/src/main/res/layout/activity_case_verify_detail.xml +++ b/app/src/main/res/layout/activity_case_verify_detail.xml @@ -76,10 +76,9 @@ style="@style/tagTextViewStyle" android:text="案卷图片" /> - - + @@ -130,7 +127,6 @@ android:id="@+id/phoneNumberView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="@dimen/margin_10dp" android:background="@null" android:hint="请输入店主手机号码" android:inputType="phone" @@ -145,6 +141,7 @@ @@ -153,14 +150,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:orientation="vertical"> - + diff --git a/app/src/main/res/layout/activity_dept_authorize.xml b/app/src/main/res/layout/activity_dept_authorize.xml index b097a6e..22934d5 100644 --- a/app/src/main/res/layout/activity_dept_authorize.xml +++ b/app/src/main/res/layout/activity_dept_authorize.xml @@ -76,7 +76,6 @@ android:id="@+id/optionEditView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:background="@null" android:hint="请输入少于50个字的处理意见" android:maxLength="50" /> diff --git a/app/src/main/res/layout/activity_dept_todo.xml b/app/src/main/res/layout/activity_dept_todo.xml index b097a6e..22934d5 100644 --- a/app/src/main/res/layout/activity_dept_todo.xml +++ b/app/src/main/res/layout/activity_dept_todo.xml @@ -76,7 +76,6 @@ android:id="@+id/optionEditView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:background="@null" android:hint="请输入少于50个字的处理意见" android:maxLength="50" /> diff --git a/app/src/main/res/layout/activity_package_handled.xml b/app/src/main/res/layout/activity_package_handled.xml index 5298ba1..8791216 100644 --- a/app/src/main/res/layout/activity_package_handled.xml +++ b/app/src/main/res/layout/activity_package_handled.xml @@ -23,10 +23,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -66,10 +65,9 @@ style="@style/noPointTextViewStyle" android:text="处罚图片" /> - diff --git a/app/src/main/res/layout/activity_package_todo.xml b/app/src/main/res/layout/activity_package_todo.xml index c20b869..fa5dae0 100644 --- a/app/src/main/res/layout/activity_package_todo.xml +++ b/app/src/main/res/layout/activity_package_todo.xml @@ -56,10 +56,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:layout_marginStart="100dp"> - + - + @@ -84,7 +83,6 @@ android:id="@+id/phoneNumberView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="@dimen/margin_10dp" android:background="@null" android:hint="请输入店主手机号码" android:inputType="phone" @@ -104,7 +102,6 @@ android:id="@+id/caseDetailEditView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:background="@null" android:hint="请输入少于50个字的案卷情况描述" android:maxLength="50" @@ -126,14 +123,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:orientation="vertical"> - + + style="@style/detailTextViewStyle" /> @@ -62,7 +61,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:background="@null" android:hint="社区通过地图选点获取" android:padding="3dp" @@ -83,7 +81,6 @@ android:id="@+id/caseLocationView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:background="@null" android:hint="请输入案卷发生的地点" android:maxLength="50" diff --git a/app/src/main/res/layout/include_dept_base_layout.xml b/app/src/main/res/layout/include_dept_base_layout.xml index 9319f36..fd11c2f 100644 --- a/app/src/main/res/layout/include_dept_base_layout.xml +++ b/app/src/main/res/layout/include_dept_base_layout.xml @@ -137,10 +137,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -182,10 +181,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 91bf9f9..e3a2c99 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -11,7 +11,9 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -20,13 +22,11 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -104,8 +103,8 @@ JzvdStd videoPlayerView; @BindView(R.id.addImageView) ImageView addImageView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -125,7 +124,7 @@ private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; private UploadVideoPresenterImpl uploadVideoPresenter; private String audioUrl, videoUrl; @@ -164,10 +163,8 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @SuppressLint("ClickableViewAccessibility") @@ -534,7 +531,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); imageList.add(url); @@ -542,21 +539,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -618,7 +615,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index aa02a1c..b7b71f5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -62,8 +61,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -73,7 +72,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -97,10 +96,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -217,7 +214,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -273,7 +270,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -281,21 +278,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 964490e..f4f3501 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -29,7 +29,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -71,8 +70,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -90,7 +89,7 @@ private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; @Override @@ -115,10 +114,8 @@ .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -331,28 +328,28 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -401,7 +398,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b8f97ec..496edba 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -57,8 +56,8 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -121,19 +120,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index c3b3b66..5f6a3e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -39,7 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -87,16 +86,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseOpinionView) TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; - @BindView(R.id.caseVerifyRecyclerView) - RecyclerView caseVerifyRecyclerView; + @BindView(R.id.verifyGridView) + GridView verifyGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -139,7 +138,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private ImageRecycleViewAdapter verifyImageAdapter; + private ImageGridViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -168,10 +167,8 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); - verifyImageAdapter = new ImageRecycleViewAdapter(this); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(verifyImageAdapter); + verifyImageAdapter = new ImageGridViewAdapter(this); + verifyGridView.setAdapter(verifyImageAdapter); } @Override @@ -226,19 +223,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -386,7 +381,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -402,7 +397,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -533,7 +528,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = verifyImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -541,22 +536,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); //九宫格点击事件 - verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + verifyGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - verifyImageAdapter.setDeleteView(true); - verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + verifyImageAdapter.isDeleteVisible(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 3cedbfe..8b08041 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -57,8 +56,8 @@ EditText shopKeeperView; @BindView(R.id.phoneNumberView) EditText phoneNumberView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -67,7 +66,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopChangePresenterImpl shopChangePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; private ArrayList realPaths = new ArrayList<>();//真实图片路径 @@ -91,10 +90,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -153,7 +150,7 @@ ToastHelper.showToast("店主名还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -235,7 +232,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -243,21 +240,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 381b704..d371d17 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -80,7 +80,7 @@ @Override public void initEvent() { - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", "", "", pageIndex); + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); calendarView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -98,7 +98,7 @@ endGroup = endGroupPosition;//结束月份位置 endChild = endChildPosition;//结束对应月份中日的位置 dateView.setText(startDate + "~" + endDate); - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", startDate, endDate, pageIndex); } }).builder(); @@ -110,7 +110,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); @@ -119,7 +119,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0d7053a..3662274 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -3,17 +3,17 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -27,7 +27,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAdjustFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -66,14 +65,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.optionEditView) @@ -207,19 +206,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -250,19 +247,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index bd491c3..19b9039 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAuthorizeFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -70,14 +69,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -264,19 +263,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -307,19 +304,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java index f22a99d..797b130 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -32,7 +32,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -71,14 +70,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -157,19 +156,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -200,19 +197,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 1c1fcd0..e40d2cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -22,9 +22,11 @@ import com.casic.dcms.base.BaseApplication; import com.casic.dcms.base.DoubleClickExitActivity; import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.HomePageBean; import com.casic.dcms.bean.NoticeBean; import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.greendao.NoticeBeanDao; import com.casic.dcms.mvp.presenter.PushRegisterPresenterImpl; import com.casic.dcms.mvp.presenter.ToiletListPresenterImpl; @@ -44,6 +46,8 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StatusBarColorUtil; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.callback.IHttpRequestListener; import com.casic.dcms.widgets.NoScrollViewPager; import com.google.android.material.bottomnavigation.BottomNavigationView; @@ -59,7 +63,8 @@ import butterknife.BindView; import okhttp3.ResponseBody; -public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, IPushRegisterView, IToiletListView { +public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, + IPushRegisterView, IToiletListView { private static final String TAG = "MainActivity"; @BindView(R.id.pageTitleView) @@ -100,18 +105,17 @@ uploadPositionPresenter = new UploadPositionPresenterImpl(this); registerPresenter = new PushRegisterPresenterImpl(this); toiletListPresenter = new ToiletListPresenterImpl(this); - gson = new Gson(); + //获取配置项 + obtainProjectConfig(); + //配置页面 pageList = new ArrayList<>(); pageList.add(new HomePageFragment()); pageList.add(new PhonePageFragment()); pageList.add(new NoticePageFragment()); pageList.add(new MinePageFragment()); + imei = OtherUtils.obtainSimCardSerialNumber(this); - - //获取配置项 - obtainProjectConfig(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UploadLocationService.class)); } else { @@ -128,7 +132,7 @@ try { String resultStr = resultBean.string(); List bridges = gson.fromJson(resultStr, ProjectConfigBean.class).getBridges(); - SaveKeyValues.putValue(Constant.BRIDGE_LIST, gson.toJson(bridges)); + StringHelper.saveBridgeList(gson.toJson(bridges)); } catch (IOException e) { e.printStackTrace(); } @@ -310,7 +314,7 @@ @Override public void obtainToiletListData(ToiletListBean resultBean) { if (resultBean.isSuccess()) { - SaveKeyValues.putValue(Constant.TOILET_LIST, gson.toJson(resultBean.getData())); + StringHelper.saveToiletList(gson.toJson(resultBean.getData())); } } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 441625b..fe48830 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -3,18 +3,16 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -44,16 +42,16 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.punishTypeView) TextView punishTypeView; @BindView(R.id.punishOpinionView) TextView punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.punishDateView) TextView punishDateView; @@ -106,19 +104,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -131,19 +127,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处罚记录 @@ -158,19 +152,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + punishGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } punishDateView.setText(data.getPunishTime()); } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index 1dec74b..6711568 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -5,7 +5,9 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; @@ -13,11 +15,9 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; @@ -78,8 +77,8 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.line1) @@ -90,8 +89,8 @@ View line2; @BindView(R.id.reasonLayout) RelativeLayout reasonLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.addHandleImageView) ImageView addHandleImageView; @BindView(R.id.caseReasonView) @@ -102,8 +101,8 @@ TextView punishTypeView; @BindView(R.id.punishOpinionView) EditText punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.addPunishImageView) ImageView addPunishImageView; @BindView(R.id.punishDateView) @@ -120,7 +119,8 @@ private ArrayList punishRealPaths = new ArrayList<>();//真实图片路径 private List handleImageList = new ArrayList<>();//上传到服务器的数据集 private List punishImageList = new ArrayList<>();//上传到服务器的数据集 - private ImageRecycleViewAdapter punishImageAdapter, handleImageAdapter; + private ImageGridViewAdapter handleImageAdapter; + private ImageGridViewAdapter punishImageAdapter; private CaseNextNodePresenterImpl caseNextNodePresenter; private String changeState; private String approvalResult; @@ -155,17 +155,13 @@ .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); //处罚adapter - punishImageAdapter = new ImageRecycleViewAdapter(this); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(punishImageAdapter); + punishImageAdapter = new ImageGridViewAdapter(this); + punishGridView.setAdapter(punishImageAdapter); //下级结点 caseNextNodePresenter = new CaseNextNodePresenterImpl(this); - //案卷处理adapter - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); caseHandlePresenter = new CaseHandlePresenterImpl(this); packageHandlePresenter = new PackageHandlePresenterImpl(this); @@ -206,19 +202,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -231,19 +225,16 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + handleImageAdapter.setImageList(urls); + handleGridView.setAdapter(handleImageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + handleImageAdapter.isDeleteVisible(true); } } } @@ -382,7 +373,7 @@ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg if (isAddHandleImage) { //处理图片 - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); handleImageList.add(url); @@ -390,22 +381,22 @@ if (handleRealPaths.size() == 2) { addHandleImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, handleRealPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { handleImageList.remove(position); handleRealPaths.remove(position); - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); if (handleRealPaths.size() != 2) { addHandleImageView.setVisibility(View.VISIBLE); } @@ -416,7 +407,7 @@ } } else { //处罚图片 - int sumItemCount = punishImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = punishImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); punishImageList.add(url); @@ -424,21 +415,21 @@ if (punishRealPaths.size() == 2) { addPunishImageView.setVisibility(View.GONE); } - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); //九宫格点击事件 - punishImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, punishRealPaths); } }); //删除按钮点击事件 - punishImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + punishImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { punishImageList.remove(position); punishRealPaths.remove(position); - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); if (punishRealPaths.size() != 2) { addPunishImageView.setVisibility(View.VISIBLE); } @@ -506,7 +497,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index 7e3d47e..7c58e30 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -31,7 +31,6 @@ import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; @@ -50,8 +49,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; @@ -216,16 +213,14 @@ mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.obtainToiletIdLayout: - String toiletValue = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); - if (toiletValue.equals("")) { + List toiletBeanList = StringHelper.getToiletBeanList(); + if (toiletBeanList.size() == 0) { ToastHelper.showToast("获取公厕数据失败，请联系管理员", ToastHelper.ERROR); return; } - List dataBeans = new Gson().fromJson(toiletValue, new TypeToken>() { - }.getType()); QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("请选择您要打卡的公厕"); - for (ToiletListBean.DataBean it : dataBeans) { + for (ToiletListBean.DataBean it : toiletBeanList) { sheetBuilder.addItem(it.getName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -233,7 +228,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - toiletIdView.setText(dataBeans.get(position).getId()); + toiletIdView.setText(toiletBeanList.get(position).getId()); //TODO 是否需要将地图移到相应的公厕，待定 } }).build().show(); @@ -308,7 +303,7 @@ ToastHelper.showToast("保洁开始时间不能为空", ToastHelper.WARING); return; } - cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserId(), + cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, endTimeView.getText().toString(), imagePath, StringHelper.filterString(workContentView.getText().toString())); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 3a8ebc6..9f316a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -7,6 +7,7 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.utils.StringHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; @@ -47,9 +48,10 @@ @Override public void initData() { - userNameView.setText(StringHelper.getUserName()); - userPhoneView.setText(StringHelper.getUserPhone()); - userDeptView.setText(StringHelper.getUserDept()); + UserBean.DataBean userBean = StringHelper.getUserBean(); + userNameView.setText(userBean.getName()); + userPhoneView.setText(userBean.getPhone()); + userDeptView.setText(userBean.getDeptName()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index d9656aa..16bd2e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -39,6 +39,7 @@ import com.casic.dcms.ui.UrgentCaseActivity; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import butterknife.BindView; @@ -74,36 +75,38 @@ @Override protected void initData() { - userDataPresenter = new UserDataPresenterImpl(this); homePagePresenter = new HomePagePresenterImpl(this); + userDataPresenter = new UserDataPresenterImpl(this); + + //用户信息 + userDataPresenter.onReadyRetrofitRequest(); + //首页相关功能项 + homePagePresenter.onReadyRetrofitRequest("05"); } @Override protected void initEvent() { - userDataPresenter.onReadyRetrofitRequest(); - homePagePresenter.onReadyRetrofitRequest("05"); + //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 +// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); + Glide.with(this).load(R.mipmap.app_logo).into(userIconView); } @SuppressLint("SetTextI18n") @Override public void obtainUserData(UserBean userBean) { if (userBean.isSuccess()) { - //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 -// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); - Glide.with(this).load(R.mipmap.app_logo).into(userIconView); + UserBean.DataBean dataBean = userBean.getData(); + StringHelper.saveUserBean(new Gson().toJson(dataBean)); - UserBean.DataBean data = userBean.getData(); - userNameView.setText(data.getName()); - userDeptView.setText(data.getDeptName() + data.getRoleNames()); - - StringHelper.saveUserName(data.getName()); - StringHelper.saveUserPhone(data.getPhone()); - StringHelper.saveUserDept(data.getDeptName()); - StringHelper.saveUserDeptId(data.getDeptId()); - StringHelper.saveUserId(data.getId()); + userNameView.setText(dataBean.getName()); + userDeptView.setText(dataBean.getDeptName() + dataBean.getRoleNames()); } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); + } @Override public void obtainHomePageResult(HomePageBean resultBean) { @@ -183,11 +186,6 @@ } @Override - public void obtainDataFail() { - ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); - } - - @Override public void onDestroyView() { super.onDestroyView(); if (userDataPresenter != null) { @@ -197,4 +195,4 @@ homePagePresenter.disposeRetrofitRequest(); } } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 1657341..13aa09b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -76,7 +76,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserDeptId()); + phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 9e3437c..859d2ac 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -37,8 +37,9 @@ Color.rgb(120, 104, 230)}; public static final String IP_KEY = "ip"; - public static final String BRIDGE_LIST = "projectBridges"; - public static final String TOILET_LIST = "toilets"; + static final String USER_BEAN = "userBean"; + static final String BRIDGE_LIST = "projectBridges"; + static final String TOILET_LIST = "toilets"; public static final long HALF_YEAR = 180 * 60 * 60 * 24 * 1000L; public static final long ONE_YEAR = 365 * 60 * 60 * 24 * 1000L; diff --git a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java b/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java deleted file mode 100644 index 0286bb6..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.dcms.utils; - -import android.graphics.Rect; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -public class ItemDecorationSpace extends RecyclerView.ItemDecoration { - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (parent.getChildAdapterPosition(view) % 2 == 0) { - outRect.left = 0; - outRect.right = 5; - } else if (parent.getChildAdapterPosition(view) % 2 == 1) { - outRect.left = 5; - outRect.right = 0; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 4dd4dbd..cac58c5 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,7 +4,14 @@ import android.util.Log; import com.casic.dcms.R; +import com.casic.dcms.bean.HomePageBean; +import com.casic.dcms.bean.ProjectConfigBean; +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -21,44 +28,45 @@ return (String) SaveKeyValues.getValue("userAccount", ""); } - public static void saveUserId(String userId) { - SaveKeyValues.putValue("userId", userId); + public static void saveUserBean(String userBeanJson) { + SaveKeyValues.putValue(Constant.USER_BEAN, userBeanJson); } - public static String getUserId() { - return (String) SaveKeyValues.getValue("userId", ""); + public static UserBean.DataBean getUserBean() { + String userBeanJson = (String) SaveKeyValues.getValue(Constant.USER_BEAN, ""); + UserBean.DataBean dataBean = new UserBean.DataBean(); + if (userBeanJson.equals("")) { + return dataBean; + } + return new Gson().fromJson(userBeanJson, UserBean.DataBean.class); } - public static void saveUserName(String name) { - SaveKeyValues.putValue("userName", name); + public static void saveBridgeList(String bridgesJson) { + SaveKeyValues.putValue(Constant.BRIDGE_LIST, bridgesJson); } - public static String getUserName() { - return (String) SaveKeyValues.getValue("userName", ""); + public static List getBridgeBeanList() { + String bridgesJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); + List bridges = new ArrayList<>(); + if (bridgesJson.equals("")) { + return bridges; + } + return new Gson().fromJson(bridgesJson, new TypeToken>() { + }.getType()); } - public static void saveUserPhone(String phone) { - SaveKeyValues.putValue("userPhone", phone); + public static void saveToiletList(String toiletsJson) { + SaveKeyValues.putValue(Constant.TOILET_LIST, toiletsJson); } - public static String getUserPhone() { - return (String) SaveKeyValues.getValue("userPhone", ""); - } - - public static void saveUserDept(String dept) { - SaveKeyValues.putValue("userDept", dept); - } - - public static String getUserDept() { - return (String) SaveKeyValues.getValue("userDept", ""); - } - - public static void saveUserDeptId(String deptid) { - SaveKeyValues.putValue("userDeptId", deptid); - } - - public static String getUserDeptId() { - return (String) SaveKeyValues.getValue("userDeptId", ""); + public static List getToiletBeanList() { + String toiletsJson = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); + List toilets = new ArrayList<>(); + if (toiletsJson.equals("")) { + return toilets; + } + return new Gson().fromJson(toiletsJson, new TypeToken>() { + }.getType()); } public static boolean isLetterAndDigit(String str) { diff --git a/app/src/main/res/drawable/ic_package_holder.xml b/app/src/main/res/drawable/ic_package_holder.xml deleted file mode 100644 index 1f5ad5e..0000000 --- a/app/src/main/res/drawable/ic_package_holder.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 1d21c58..b376886 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -50,10 +50,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -95,10 +94,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -142,10 +140,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - @@ -38,10 +37,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -53,10 +51,9 @@ style="@style/noPointTextViewStyle" android:text="核查图片" /> - diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index e754c14..7d7a7c2 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -136,10 +136,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -151,10 +150,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -166,10 +164,9 @@ style="@style/noPointTextViewStyle" android:text="核查图片" /> - diff --git a/app/src/main/res/layout/activity_case_handle_detail.xml b/app/src/main/res/layout/activity_case_handle_detail.xml index 4cc674c..19a1a4a 100644 --- a/app/src/main/res/layout/activity_case_handle_detail.xml +++ b/app/src/main/res/layout/activity_case_handle_detail.xml @@ -22,16 +22,13 @@ - + @@ -132,10 +129,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - @@ -150,10 +149,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - diff --git a/app/src/main/res/layout/activity_case_todo_detail.xml b/app/src/main/res/layout/activity_case_todo_detail.xml index 345ca19..255a52e 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -97,10 +97,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_todo_handled_detail.xml b/app/src/main/res/layout/activity_case_todo_handled_detail.xml index a929b43..2bb8cf1 100644 --- a/app/src/main/res/layout/activity_case_todo_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_handled_detail.xml @@ -151,10 +151,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_verified_detail.xml b/app/src/main/res/layout/activity_case_verified_detail.xml index 394d248..a39e000 100644 --- a/app/src/main/res/layout/activity_case_verified_detail.xml +++ b/app/src/main/res/layout/activity_case_verified_detail.xml @@ -50,10 +50,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_verify_detail.xml b/app/src/main/res/layout/activity_case_verify_detail.xml index 0c90a09..1220507 100644 --- a/app/src/main/res/layout/activity_case_verify_detail.xml +++ b/app/src/main/res/layout/activity_case_verify_detail.xml @@ -76,10 +76,9 @@ style="@style/tagTextViewStyle" android:text="案卷图片" /> - - + @@ -130,7 +127,6 @@ android:id="@+id/phoneNumberView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="@dimen/margin_10dp" android:background="@null" android:hint="请输入店主手机号码" android:inputType="phone" @@ -145,6 +141,7 @@ @@ -153,14 +150,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:orientation="vertical"> - + diff --git a/app/src/main/res/layout/activity_dept_authorize.xml b/app/src/main/res/layout/activity_dept_authorize.xml index b097a6e..22934d5 100644 --- a/app/src/main/res/layout/activity_dept_authorize.xml +++ b/app/src/main/res/layout/activity_dept_authorize.xml @@ -76,7 +76,6 @@ android:id="@+id/optionEditView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:background="@null" android:hint="请输入少于50个字的处理意见" android:maxLength="50" /> diff --git a/app/src/main/res/layout/activity_dept_todo.xml b/app/src/main/res/layout/activity_dept_todo.xml index b097a6e..22934d5 100644 --- a/app/src/main/res/layout/activity_dept_todo.xml +++ b/app/src/main/res/layout/activity_dept_todo.xml @@ -76,7 +76,6 @@ android:id="@+id/optionEditView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:background="@null" android:hint="请输入少于50个字的处理意见" android:maxLength="50" /> diff --git a/app/src/main/res/layout/activity_package_handled.xml b/app/src/main/res/layout/activity_package_handled.xml index 5298ba1..8791216 100644 --- a/app/src/main/res/layout/activity_package_handled.xml +++ b/app/src/main/res/layout/activity_package_handled.xml @@ -23,10 +23,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -66,10 +65,9 @@ style="@style/noPointTextViewStyle" android:text="处罚图片" /> - diff --git a/app/src/main/res/layout/activity_package_todo.xml b/app/src/main/res/layout/activity_package_todo.xml index c20b869..fa5dae0 100644 --- a/app/src/main/res/layout/activity_package_todo.xml +++ b/app/src/main/res/layout/activity_package_todo.xml @@ -56,10 +56,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:layout_marginStart="100dp"> - + - + @@ -84,7 +83,6 @@ android:id="@+id/phoneNumberView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="@dimen/margin_10dp" android:background="@null" android:hint="请输入店主手机号码" android:inputType="phone" @@ -104,7 +102,6 @@ android:id="@+id/caseDetailEditView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:background="@null" android:hint="请输入少于50个字的案卷情况描述" android:maxLength="50" @@ -126,14 +123,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:orientation="vertical"> - + + style="@style/detailTextViewStyle" /> @@ -62,7 +61,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:background="@null" android:hint="社区通过地图选点获取" android:padding="3dp" @@ -83,7 +81,6 @@ android:id="@+id/caseLocationView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:background="@null" android:hint="请输入案卷发生的地点" android:maxLength="50" diff --git a/app/src/main/res/layout/include_dept_base_layout.xml b/app/src/main/res/layout/include_dept_base_layout.xml index 9319f36..fd11c2f 100644 --- a/app/src/main/res/layout/include_dept_base_layout.xml +++ b/app/src/main/res/layout/include_dept_base_layout.xml @@ -137,10 +137,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -182,10 +181,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - diff --git a/app/src/main/res/layout/include_package_base.xml b/app/src/main/res/layout/include_package_base.xml index 62c75a1..e398c33 100644 --- a/app/src/main/res/layout/include_package_base.xml +++ b/app/src/main/res/layout/include_package_base.xml @@ -124,10 +124,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 91bf9f9..e3a2c99 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -11,7 +11,9 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -20,13 +22,11 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -104,8 +103,8 @@ JzvdStd videoPlayerView; @BindView(R.id.addImageView) ImageView addImageView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -125,7 +124,7 @@ private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; private UploadVideoPresenterImpl uploadVideoPresenter; private String audioUrl, videoUrl; @@ -164,10 +163,8 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @SuppressLint("ClickableViewAccessibility") @@ -534,7 +531,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); imageList.add(url); @@ -542,21 +539,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -618,7 +615,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index aa02a1c..b7b71f5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -62,8 +61,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -73,7 +72,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -97,10 +96,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -217,7 +214,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -273,7 +270,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -281,21 +278,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 964490e..f4f3501 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -29,7 +29,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -71,8 +70,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -90,7 +89,7 @@ private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; @Override @@ -115,10 +114,8 @@ .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -331,28 +328,28 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -401,7 +398,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b8f97ec..496edba 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -57,8 +56,8 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -121,19 +120,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index c3b3b66..5f6a3e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -39,7 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -87,16 +86,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseOpinionView) TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; - @BindView(R.id.caseVerifyRecyclerView) - RecyclerView caseVerifyRecyclerView; + @BindView(R.id.verifyGridView) + GridView verifyGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -139,7 +138,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private ImageRecycleViewAdapter verifyImageAdapter; + private ImageGridViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -168,10 +167,8 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); - verifyImageAdapter = new ImageRecycleViewAdapter(this); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(verifyImageAdapter); + verifyImageAdapter = new ImageGridViewAdapter(this); + verifyGridView.setAdapter(verifyImageAdapter); } @Override @@ -226,19 +223,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -386,7 +381,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -402,7 +397,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -533,7 +528,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = verifyImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -541,22 +536,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); //九宫格点击事件 - verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + verifyGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - verifyImageAdapter.setDeleteView(true); - verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + verifyImageAdapter.isDeleteVisible(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 3cedbfe..8b08041 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -57,8 +56,8 @@ EditText shopKeeperView; @BindView(R.id.phoneNumberView) EditText phoneNumberView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -67,7 +66,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopChangePresenterImpl shopChangePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; private ArrayList realPaths = new ArrayList<>();//真实图片路径 @@ -91,10 +90,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -153,7 +150,7 @@ ToastHelper.showToast("店主名还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -235,7 +232,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -243,21 +240,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 381b704..d371d17 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -80,7 +80,7 @@ @Override public void initEvent() { - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", "", "", pageIndex); + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); calendarView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -98,7 +98,7 @@ endGroup = endGroupPosition;//结束月份位置 endChild = endChildPosition;//结束对应月份中日的位置 dateView.setText(startDate + "~" + endDate); - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", startDate, endDate, pageIndex); } }).builder(); @@ -110,7 +110,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); @@ -119,7 +119,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0d7053a..3662274 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -3,17 +3,17 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -27,7 +27,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAdjustFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -66,14 +65,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.optionEditView) @@ -207,19 +206,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -250,19 +247,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index bd491c3..19b9039 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAuthorizeFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -70,14 +69,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -264,19 +263,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -307,19 +304,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java index f22a99d..797b130 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -32,7 +32,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -71,14 +70,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -157,19 +156,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -200,19 +197,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 1c1fcd0..e40d2cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -22,9 +22,11 @@ import com.casic.dcms.base.BaseApplication; import com.casic.dcms.base.DoubleClickExitActivity; import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.HomePageBean; import com.casic.dcms.bean.NoticeBean; import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.greendao.NoticeBeanDao; import com.casic.dcms.mvp.presenter.PushRegisterPresenterImpl; import com.casic.dcms.mvp.presenter.ToiletListPresenterImpl; @@ -44,6 +46,8 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StatusBarColorUtil; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.callback.IHttpRequestListener; import com.casic.dcms.widgets.NoScrollViewPager; import com.google.android.material.bottomnavigation.BottomNavigationView; @@ -59,7 +63,8 @@ import butterknife.BindView; import okhttp3.ResponseBody; -public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, IPushRegisterView, IToiletListView { +public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, + IPushRegisterView, IToiletListView { private static final String TAG = "MainActivity"; @BindView(R.id.pageTitleView) @@ -100,18 +105,17 @@ uploadPositionPresenter = new UploadPositionPresenterImpl(this); registerPresenter = new PushRegisterPresenterImpl(this); toiletListPresenter = new ToiletListPresenterImpl(this); - gson = new Gson(); + //获取配置项 + obtainProjectConfig(); + //配置页面 pageList = new ArrayList<>(); pageList.add(new HomePageFragment()); pageList.add(new PhonePageFragment()); pageList.add(new NoticePageFragment()); pageList.add(new MinePageFragment()); + imei = OtherUtils.obtainSimCardSerialNumber(this); - - //获取配置项 - obtainProjectConfig(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UploadLocationService.class)); } else { @@ -128,7 +132,7 @@ try { String resultStr = resultBean.string(); List bridges = gson.fromJson(resultStr, ProjectConfigBean.class).getBridges(); - SaveKeyValues.putValue(Constant.BRIDGE_LIST, gson.toJson(bridges)); + StringHelper.saveBridgeList(gson.toJson(bridges)); } catch (IOException e) { e.printStackTrace(); } @@ -310,7 +314,7 @@ @Override public void obtainToiletListData(ToiletListBean resultBean) { if (resultBean.isSuccess()) { - SaveKeyValues.putValue(Constant.TOILET_LIST, gson.toJson(resultBean.getData())); + StringHelper.saveToiletList(gson.toJson(resultBean.getData())); } } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 441625b..fe48830 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -3,18 +3,16 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -44,16 +42,16 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.punishTypeView) TextView punishTypeView; @BindView(R.id.punishOpinionView) TextView punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.punishDateView) TextView punishDateView; @@ -106,19 +104,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -131,19 +127,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处罚记录 @@ -158,19 +152,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + punishGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } punishDateView.setText(data.getPunishTime()); } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index 1dec74b..6711568 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -5,7 +5,9 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; @@ -13,11 +15,9 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; @@ -78,8 +77,8 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.line1) @@ -90,8 +89,8 @@ View line2; @BindView(R.id.reasonLayout) RelativeLayout reasonLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.addHandleImageView) ImageView addHandleImageView; @BindView(R.id.caseReasonView) @@ -102,8 +101,8 @@ TextView punishTypeView; @BindView(R.id.punishOpinionView) EditText punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.addPunishImageView) ImageView addPunishImageView; @BindView(R.id.punishDateView) @@ -120,7 +119,8 @@ private ArrayList punishRealPaths = new ArrayList<>();//真实图片路径 private List handleImageList = new ArrayList<>();//上传到服务器的数据集 private List punishImageList = new ArrayList<>();//上传到服务器的数据集 - private ImageRecycleViewAdapter punishImageAdapter, handleImageAdapter; + private ImageGridViewAdapter handleImageAdapter; + private ImageGridViewAdapter punishImageAdapter; private CaseNextNodePresenterImpl caseNextNodePresenter; private String changeState; private String approvalResult; @@ -155,17 +155,13 @@ .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); //处罚adapter - punishImageAdapter = new ImageRecycleViewAdapter(this); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(punishImageAdapter); + punishImageAdapter = new ImageGridViewAdapter(this); + punishGridView.setAdapter(punishImageAdapter); //下级结点 caseNextNodePresenter = new CaseNextNodePresenterImpl(this); - //案卷处理adapter - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); caseHandlePresenter = new CaseHandlePresenterImpl(this); packageHandlePresenter = new PackageHandlePresenterImpl(this); @@ -206,19 +202,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -231,19 +225,16 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + handleImageAdapter.setImageList(urls); + handleGridView.setAdapter(handleImageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + handleImageAdapter.isDeleteVisible(true); } } } @@ -382,7 +373,7 @@ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg if (isAddHandleImage) { //处理图片 - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); handleImageList.add(url); @@ -390,22 +381,22 @@ if (handleRealPaths.size() == 2) { addHandleImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, handleRealPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { handleImageList.remove(position); handleRealPaths.remove(position); - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); if (handleRealPaths.size() != 2) { addHandleImageView.setVisibility(View.VISIBLE); } @@ -416,7 +407,7 @@ } } else { //处罚图片 - int sumItemCount = punishImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = punishImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); punishImageList.add(url); @@ -424,21 +415,21 @@ if (punishRealPaths.size() == 2) { addPunishImageView.setVisibility(View.GONE); } - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); //九宫格点击事件 - punishImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, punishRealPaths); } }); //删除按钮点击事件 - punishImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + punishImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { punishImageList.remove(position); punishRealPaths.remove(position); - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); if (punishRealPaths.size() != 2) { addPunishImageView.setVisibility(View.VISIBLE); } @@ -506,7 +497,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index 7e3d47e..7c58e30 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -31,7 +31,6 @@ import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; @@ -50,8 +49,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; @@ -216,16 +213,14 @@ mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.obtainToiletIdLayout: - String toiletValue = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); - if (toiletValue.equals("")) { + List toiletBeanList = StringHelper.getToiletBeanList(); + if (toiletBeanList.size() == 0) { ToastHelper.showToast("获取公厕数据失败，请联系管理员", ToastHelper.ERROR); return; } - List dataBeans = new Gson().fromJson(toiletValue, new TypeToken>() { - }.getType()); QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("请选择您要打卡的公厕"); - for (ToiletListBean.DataBean it : dataBeans) { + for (ToiletListBean.DataBean it : toiletBeanList) { sheetBuilder.addItem(it.getName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -233,7 +228,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - toiletIdView.setText(dataBeans.get(position).getId()); + toiletIdView.setText(toiletBeanList.get(position).getId()); //TODO 是否需要将地图移到相应的公厕，待定 } }).build().show(); @@ -308,7 +303,7 @@ ToastHelper.showToast("保洁开始时间不能为空", ToastHelper.WARING); return; } - cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserId(), + cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, endTimeView.getText().toString(), imagePath, StringHelper.filterString(workContentView.getText().toString())); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 3a8ebc6..9f316a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -7,6 +7,7 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.utils.StringHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; @@ -47,9 +48,10 @@ @Override public void initData() { - userNameView.setText(StringHelper.getUserName()); - userPhoneView.setText(StringHelper.getUserPhone()); - userDeptView.setText(StringHelper.getUserDept()); + UserBean.DataBean userBean = StringHelper.getUserBean(); + userNameView.setText(userBean.getName()); + userPhoneView.setText(userBean.getPhone()); + userDeptView.setText(userBean.getDeptName()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index d9656aa..16bd2e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -39,6 +39,7 @@ import com.casic.dcms.ui.UrgentCaseActivity; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import butterknife.BindView; @@ -74,36 +75,38 @@ @Override protected void initData() { - userDataPresenter = new UserDataPresenterImpl(this); homePagePresenter = new HomePagePresenterImpl(this); + userDataPresenter = new UserDataPresenterImpl(this); + + //用户信息 + userDataPresenter.onReadyRetrofitRequest(); + //首页相关功能项 + homePagePresenter.onReadyRetrofitRequest("05"); } @Override protected void initEvent() { - userDataPresenter.onReadyRetrofitRequest(); - homePagePresenter.onReadyRetrofitRequest("05"); + //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 +// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); + Glide.with(this).load(R.mipmap.app_logo).into(userIconView); } @SuppressLint("SetTextI18n") @Override public void obtainUserData(UserBean userBean) { if (userBean.isSuccess()) { - //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 -// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); - Glide.with(this).load(R.mipmap.app_logo).into(userIconView); + UserBean.DataBean dataBean = userBean.getData(); + StringHelper.saveUserBean(new Gson().toJson(dataBean)); - UserBean.DataBean data = userBean.getData(); - userNameView.setText(data.getName()); - userDeptView.setText(data.getDeptName() + data.getRoleNames()); - - StringHelper.saveUserName(data.getName()); - StringHelper.saveUserPhone(data.getPhone()); - StringHelper.saveUserDept(data.getDeptName()); - StringHelper.saveUserDeptId(data.getDeptId()); - StringHelper.saveUserId(data.getId()); + userNameView.setText(dataBean.getName()); + userDeptView.setText(dataBean.getDeptName() + dataBean.getRoleNames()); } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); + } @Override public void obtainHomePageResult(HomePageBean resultBean) { @@ -183,11 +186,6 @@ } @Override - public void obtainDataFail() { - ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); - } - - @Override public void onDestroyView() { super.onDestroyView(); if (userDataPresenter != null) { @@ -197,4 +195,4 @@ homePagePresenter.disposeRetrofitRequest(); } } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 1657341..13aa09b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -76,7 +76,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserDeptId()); + phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 9e3437c..859d2ac 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -37,8 +37,9 @@ Color.rgb(120, 104, 230)}; public static final String IP_KEY = "ip"; - public static final String BRIDGE_LIST = "projectBridges"; - public static final String TOILET_LIST = "toilets"; + static final String USER_BEAN = "userBean"; + static final String BRIDGE_LIST = "projectBridges"; + static final String TOILET_LIST = "toilets"; public static final long HALF_YEAR = 180 * 60 * 60 * 24 * 1000L; public static final long ONE_YEAR = 365 * 60 * 60 * 24 * 1000L; diff --git a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java b/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java deleted file mode 100644 index 0286bb6..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.dcms.utils; - -import android.graphics.Rect; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -public class ItemDecorationSpace extends RecyclerView.ItemDecoration { - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (parent.getChildAdapterPosition(view) % 2 == 0) { - outRect.left = 0; - outRect.right = 5; - } else if (parent.getChildAdapterPosition(view) % 2 == 1) { - outRect.left = 5; - outRect.right = 0; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 4dd4dbd..cac58c5 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,7 +4,14 @@ import android.util.Log; import com.casic.dcms.R; +import com.casic.dcms.bean.HomePageBean; +import com.casic.dcms.bean.ProjectConfigBean; +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -21,44 +28,45 @@ return (String) SaveKeyValues.getValue("userAccount", ""); } - public static void saveUserId(String userId) { - SaveKeyValues.putValue("userId", userId); + public static void saveUserBean(String userBeanJson) { + SaveKeyValues.putValue(Constant.USER_BEAN, userBeanJson); } - public static String getUserId() { - return (String) SaveKeyValues.getValue("userId", ""); + public static UserBean.DataBean getUserBean() { + String userBeanJson = (String) SaveKeyValues.getValue(Constant.USER_BEAN, ""); + UserBean.DataBean dataBean = new UserBean.DataBean(); + if (userBeanJson.equals("")) { + return dataBean; + } + return new Gson().fromJson(userBeanJson, UserBean.DataBean.class); } - public static void saveUserName(String name) { - SaveKeyValues.putValue("userName", name); + public static void saveBridgeList(String bridgesJson) { + SaveKeyValues.putValue(Constant.BRIDGE_LIST, bridgesJson); } - public static String getUserName() { - return (String) SaveKeyValues.getValue("userName", ""); + public static List getBridgeBeanList() { + String bridgesJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); + List bridges = new ArrayList<>(); + if (bridgesJson.equals("")) { + return bridges; + } + return new Gson().fromJson(bridgesJson, new TypeToken>() { + }.getType()); } - public static void saveUserPhone(String phone) { - SaveKeyValues.putValue("userPhone", phone); + public static void saveToiletList(String toiletsJson) { + SaveKeyValues.putValue(Constant.TOILET_LIST, toiletsJson); } - public static String getUserPhone() { - return (String) SaveKeyValues.getValue("userPhone", ""); - } - - public static void saveUserDept(String dept) { - SaveKeyValues.putValue("userDept", dept); - } - - public static String getUserDept() { - return (String) SaveKeyValues.getValue("userDept", ""); - } - - public static void saveUserDeptId(String deptid) { - SaveKeyValues.putValue("userDeptId", deptid); - } - - public static String getUserDeptId() { - return (String) SaveKeyValues.getValue("userDeptId", ""); + public static List getToiletBeanList() { + String toiletsJson = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); + List toilets = new ArrayList<>(); + if (toiletsJson.equals("")) { + return toilets; + } + return new Gson().fromJson(toiletsJson, new TypeToken>() { + }.getType()); } public static boolean isLetterAndDigit(String str) { diff --git a/app/src/main/res/drawable/ic_package_holder.xml b/app/src/main/res/drawable/ic_package_holder.xml deleted file mode 100644 index 1f5ad5e..0000000 --- a/app/src/main/res/drawable/ic_package_holder.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 1d21c58..b376886 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -50,10 +50,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -95,10 +94,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -142,10 +140,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - @@ -38,10 +37,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -53,10 +51,9 @@ style="@style/noPointTextViewStyle" android:text="核查图片" /> - diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index e754c14..7d7a7c2 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -136,10 +136,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -151,10 +150,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -166,10 +164,9 @@ style="@style/noPointTextViewStyle" android:text="核查图片" /> - diff --git a/app/src/main/res/layout/activity_case_handle_detail.xml b/app/src/main/res/layout/activity_case_handle_detail.xml index 4cc674c..19a1a4a 100644 --- a/app/src/main/res/layout/activity_case_handle_detail.xml +++ b/app/src/main/res/layout/activity_case_handle_detail.xml @@ -22,16 +22,13 @@ - + @@ -132,10 +129,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - @@ -150,10 +149,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - diff --git a/app/src/main/res/layout/activity_case_todo_detail.xml b/app/src/main/res/layout/activity_case_todo_detail.xml index 345ca19..255a52e 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -97,10 +97,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_todo_handled_detail.xml b/app/src/main/res/layout/activity_case_todo_handled_detail.xml index a929b43..2bb8cf1 100644 --- a/app/src/main/res/layout/activity_case_todo_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_handled_detail.xml @@ -151,10 +151,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_verified_detail.xml b/app/src/main/res/layout/activity_case_verified_detail.xml index 394d248..a39e000 100644 --- a/app/src/main/res/layout/activity_case_verified_detail.xml +++ b/app/src/main/res/layout/activity_case_verified_detail.xml @@ -50,10 +50,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_verify_detail.xml b/app/src/main/res/layout/activity_case_verify_detail.xml index 0c90a09..1220507 100644 --- a/app/src/main/res/layout/activity_case_verify_detail.xml +++ b/app/src/main/res/layout/activity_case_verify_detail.xml @@ -76,10 +76,9 @@ style="@style/tagTextViewStyle" android:text="案卷图片" /> - - + @@ -130,7 +127,6 @@ android:id="@+id/phoneNumberView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="@dimen/margin_10dp" android:background="@null" android:hint="请输入店主手机号码" android:inputType="phone" @@ -145,6 +141,7 @@ @@ -153,14 +150,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:orientation="vertical"> - + diff --git a/app/src/main/res/layout/activity_dept_authorize.xml b/app/src/main/res/layout/activity_dept_authorize.xml index b097a6e..22934d5 100644 --- a/app/src/main/res/layout/activity_dept_authorize.xml +++ b/app/src/main/res/layout/activity_dept_authorize.xml @@ -76,7 +76,6 @@ android:id="@+id/optionEditView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:background="@null" android:hint="请输入少于50个字的处理意见" android:maxLength="50" /> diff --git a/app/src/main/res/layout/activity_dept_todo.xml b/app/src/main/res/layout/activity_dept_todo.xml index b097a6e..22934d5 100644 --- a/app/src/main/res/layout/activity_dept_todo.xml +++ b/app/src/main/res/layout/activity_dept_todo.xml @@ -76,7 +76,6 @@ android:id="@+id/optionEditView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:background="@null" android:hint="请输入少于50个字的处理意见" android:maxLength="50" /> diff --git a/app/src/main/res/layout/activity_package_handled.xml b/app/src/main/res/layout/activity_package_handled.xml index 5298ba1..8791216 100644 --- a/app/src/main/res/layout/activity_package_handled.xml +++ b/app/src/main/res/layout/activity_package_handled.xml @@ -23,10 +23,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -66,10 +65,9 @@ style="@style/noPointTextViewStyle" android:text="处罚图片" /> - diff --git a/app/src/main/res/layout/activity_package_todo.xml b/app/src/main/res/layout/activity_package_todo.xml index c20b869..fa5dae0 100644 --- a/app/src/main/res/layout/activity_package_todo.xml +++ b/app/src/main/res/layout/activity_package_todo.xml @@ -56,10 +56,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:layout_marginStart="100dp"> - + - + @@ -84,7 +83,6 @@ android:id="@+id/phoneNumberView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="@dimen/margin_10dp" android:background="@null" android:hint="请输入店主手机号码" android:inputType="phone" @@ -104,7 +102,6 @@ android:id="@+id/caseDetailEditView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:background="@null" android:hint="请输入少于50个字的案卷情况描述" android:maxLength="50" @@ -126,14 +123,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:orientation="vertical"> - + + style="@style/detailTextViewStyle" /> @@ -62,7 +61,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:background="@null" android:hint="社区通过地图选点获取" android:padding="3dp" @@ -83,7 +81,6 @@ android:id="@+id/caseLocationView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:background="@null" android:hint="请输入案卷发生的地点" android:maxLength="50" diff --git a/app/src/main/res/layout/include_dept_base_layout.xml b/app/src/main/res/layout/include_dept_base_layout.xml index 9319f36..fd11c2f 100644 --- a/app/src/main/res/layout/include_dept_base_layout.xml +++ b/app/src/main/res/layout/include_dept_base_layout.xml @@ -137,10 +137,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -182,10 +181,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - diff --git a/app/src/main/res/layout/include_package_base.xml b/app/src/main/res/layout/include_package_base.xml index 62c75a1..e398c33 100644 --- a/app/src/main/res/layout/include_package_base.xml +++ b/app/src/main/res/layout/include_package_base.xml @@ -124,10 +124,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/include_package_punish.xml b/app/src/main/res/layout/include_package_punish.xml deleted file mode 100644 index 0713bb1..0000000 --- a/app/src/main/res/layout/include_package_punish.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java new file mode 100644 index 0000000..ded8716 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/ImageGridViewAdapter.java @@ -0,0 +1,95 @@ +package com.casic.dcms.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; + +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; + +import java.util.ArrayList; +import java.util.List; + +public class ImageGridViewAdapter extends BaseAdapter { + + private Context context; + private boolean isVisible = true; + private List images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 91bf9f9..e3a2c99 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -11,7 +11,9 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -20,13 +22,11 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -104,8 +103,8 @@ JzvdStd videoPlayerView; @BindView(R.id.addImageView) ImageView addImageView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -125,7 +124,7 @@ private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; private UploadVideoPresenterImpl uploadVideoPresenter; private String audioUrl, videoUrl; @@ -164,10 +163,8 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @SuppressLint("ClickableViewAccessibility") @@ -534,7 +531,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); imageList.add(url); @@ -542,21 +539,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -618,7 +615,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index aa02a1c..b7b71f5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -62,8 +61,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -73,7 +72,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -97,10 +96,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -217,7 +214,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -273,7 +270,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -281,21 +278,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 964490e..f4f3501 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -29,7 +29,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -71,8 +70,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -90,7 +89,7 @@ private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; @Override @@ -115,10 +114,8 @@ .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -331,28 +328,28 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -401,7 +398,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b8f97ec..496edba 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -57,8 +56,8 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -121,19 +120,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index c3b3b66..5f6a3e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -39,7 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -87,16 +86,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseOpinionView) TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; - @BindView(R.id.caseVerifyRecyclerView) - RecyclerView caseVerifyRecyclerView; + @BindView(R.id.verifyGridView) + GridView verifyGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -139,7 +138,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private ImageRecycleViewAdapter verifyImageAdapter; + private ImageGridViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -168,10 +167,8 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); - verifyImageAdapter = new ImageRecycleViewAdapter(this); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(verifyImageAdapter); + verifyImageAdapter = new ImageGridViewAdapter(this); + verifyGridView.setAdapter(verifyImageAdapter); } @Override @@ -226,19 +223,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -386,7 +381,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -402,7 +397,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -533,7 +528,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = verifyImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -541,22 +536,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); //九宫格点击事件 - verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + verifyGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - verifyImageAdapter.setDeleteView(true); - verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + verifyImageAdapter.isDeleteVisible(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 3cedbfe..8b08041 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -57,8 +56,8 @@ EditText shopKeeperView; @BindView(R.id.phoneNumberView) EditText phoneNumberView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -67,7 +66,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopChangePresenterImpl shopChangePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; private ArrayList realPaths = new ArrayList<>();//真实图片路径 @@ -91,10 +90,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -153,7 +150,7 @@ ToastHelper.showToast("店主名还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -235,7 +232,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -243,21 +240,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 381b704..d371d17 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -80,7 +80,7 @@ @Override public void initEvent() { - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", "", "", pageIndex); + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); calendarView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -98,7 +98,7 @@ endGroup = endGroupPosition;//结束月份位置 endChild = endChildPosition;//结束对应月份中日的位置 dateView.setText(startDate + "~" + endDate); - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", startDate, endDate, pageIndex); } }).builder(); @@ -110,7 +110,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); @@ -119,7 +119,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0d7053a..3662274 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -3,17 +3,17 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -27,7 +27,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAdjustFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -66,14 +65,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.optionEditView) @@ -207,19 +206,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -250,19 +247,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index bd491c3..19b9039 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAuthorizeFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -70,14 +69,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -264,19 +263,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -307,19 +304,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java index f22a99d..797b130 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -32,7 +32,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -71,14 +70,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -157,19 +156,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -200,19 +197,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 1c1fcd0..e40d2cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -22,9 +22,11 @@ import com.casic.dcms.base.BaseApplication; import com.casic.dcms.base.DoubleClickExitActivity; import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.HomePageBean; import com.casic.dcms.bean.NoticeBean; import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.greendao.NoticeBeanDao; import com.casic.dcms.mvp.presenter.PushRegisterPresenterImpl; import com.casic.dcms.mvp.presenter.ToiletListPresenterImpl; @@ -44,6 +46,8 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StatusBarColorUtil; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.callback.IHttpRequestListener; import com.casic.dcms.widgets.NoScrollViewPager; import com.google.android.material.bottomnavigation.BottomNavigationView; @@ -59,7 +63,8 @@ import butterknife.BindView; import okhttp3.ResponseBody; -public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, IPushRegisterView, IToiletListView { +public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, + IPushRegisterView, IToiletListView { private static final String TAG = "MainActivity"; @BindView(R.id.pageTitleView) @@ -100,18 +105,17 @@ uploadPositionPresenter = new UploadPositionPresenterImpl(this); registerPresenter = new PushRegisterPresenterImpl(this); toiletListPresenter = new ToiletListPresenterImpl(this); - gson = new Gson(); + //获取配置项 + obtainProjectConfig(); + //配置页面 pageList = new ArrayList<>(); pageList.add(new HomePageFragment()); pageList.add(new PhonePageFragment()); pageList.add(new NoticePageFragment()); pageList.add(new MinePageFragment()); + imei = OtherUtils.obtainSimCardSerialNumber(this); - - //获取配置项 - obtainProjectConfig(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UploadLocationService.class)); } else { @@ -128,7 +132,7 @@ try { String resultStr = resultBean.string(); List bridges = gson.fromJson(resultStr, ProjectConfigBean.class).getBridges(); - SaveKeyValues.putValue(Constant.BRIDGE_LIST, gson.toJson(bridges)); + StringHelper.saveBridgeList(gson.toJson(bridges)); } catch (IOException e) { e.printStackTrace(); } @@ -310,7 +314,7 @@ @Override public void obtainToiletListData(ToiletListBean resultBean) { if (resultBean.isSuccess()) { - SaveKeyValues.putValue(Constant.TOILET_LIST, gson.toJson(resultBean.getData())); + StringHelper.saveToiletList(gson.toJson(resultBean.getData())); } } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 441625b..fe48830 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -3,18 +3,16 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -44,16 +42,16 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.punishTypeView) TextView punishTypeView; @BindView(R.id.punishOpinionView) TextView punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.punishDateView) TextView punishDateView; @@ -106,19 +104,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -131,19 +127,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处罚记录 @@ -158,19 +152,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + punishGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } punishDateView.setText(data.getPunishTime()); } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index 1dec74b..6711568 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -5,7 +5,9 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; @@ -13,11 +15,9 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; @@ -78,8 +77,8 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.line1) @@ -90,8 +89,8 @@ View line2; @BindView(R.id.reasonLayout) RelativeLayout reasonLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.addHandleImageView) ImageView addHandleImageView; @BindView(R.id.caseReasonView) @@ -102,8 +101,8 @@ TextView punishTypeView; @BindView(R.id.punishOpinionView) EditText punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.addPunishImageView) ImageView addPunishImageView; @BindView(R.id.punishDateView) @@ -120,7 +119,8 @@ private ArrayList punishRealPaths = new ArrayList<>();//真实图片路径 private List handleImageList = new ArrayList<>();//上传到服务器的数据集 private List punishImageList = new ArrayList<>();//上传到服务器的数据集 - private ImageRecycleViewAdapter punishImageAdapter, handleImageAdapter; + private ImageGridViewAdapter handleImageAdapter; + private ImageGridViewAdapter punishImageAdapter; private CaseNextNodePresenterImpl caseNextNodePresenter; private String changeState; private String approvalResult; @@ -155,17 +155,13 @@ .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); //处罚adapter - punishImageAdapter = new ImageRecycleViewAdapter(this); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(punishImageAdapter); + punishImageAdapter = new ImageGridViewAdapter(this); + punishGridView.setAdapter(punishImageAdapter); //下级结点 caseNextNodePresenter = new CaseNextNodePresenterImpl(this); - //案卷处理adapter - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); caseHandlePresenter = new CaseHandlePresenterImpl(this); packageHandlePresenter = new PackageHandlePresenterImpl(this); @@ -206,19 +202,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -231,19 +225,16 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + handleImageAdapter.setImageList(urls); + handleGridView.setAdapter(handleImageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + handleImageAdapter.isDeleteVisible(true); } } } @@ -382,7 +373,7 @@ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg if (isAddHandleImage) { //处理图片 - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); handleImageList.add(url); @@ -390,22 +381,22 @@ if (handleRealPaths.size() == 2) { addHandleImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, handleRealPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { handleImageList.remove(position); handleRealPaths.remove(position); - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); if (handleRealPaths.size() != 2) { addHandleImageView.setVisibility(View.VISIBLE); } @@ -416,7 +407,7 @@ } } else { //处罚图片 - int sumItemCount = punishImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = punishImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); punishImageList.add(url); @@ -424,21 +415,21 @@ if (punishRealPaths.size() == 2) { addPunishImageView.setVisibility(View.GONE); } - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); //九宫格点击事件 - punishImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, punishRealPaths); } }); //删除按钮点击事件 - punishImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + punishImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { punishImageList.remove(position); punishRealPaths.remove(position); - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); if (punishRealPaths.size() != 2) { addPunishImageView.setVisibility(View.VISIBLE); } @@ -506,7 +497,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index 7e3d47e..7c58e30 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -31,7 +31,6 @@ import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; @@ -50,8 +49,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; @@ -216,16 +213,14 @@ mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.obtainToiletIdLayout: - String toiletValue = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); - if (toiletValue.equals("")) { + List toiletBeanList = StringHelper.getToiletBeanList(); + if (toiletBeanList.size() == 0) { ToastHelper.showToast("获取公厕数据失败，请联系管理员", ToastHelper.ERROR); return; } - List dataBeans = new Gson().fromJson(toiletValue, new TypeToken>() { - }.getType()); QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("请选择您要打卡的公厕"); - for (ToiletListBean.DataBean it : dataBeans) { + for (ToiletListBean.DataBean it : toiletBeanList) { sheetBuilder.addItem(it.getName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -233,7 +228,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - toiletIdView.setText(dataBeans.get(position).getId()); + toiletIdView.setText(toiletBeanList.get(position).getId()); //TODO 是否需要将地图移到相应的公厕，待定 } }).build().show(); @@ -308,7 +303,7 @@ ToastHelper.showToast("保洁开始时间不能为空", ToastHelper.WARING); return; } - cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserId(), + cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, endTimeView.getText().toString(), imagePath, StringHelper.filterString(workContentView.getText().toString())); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 3a8ebc6..9f316a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -7,6 +7,7 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.utils.StringHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; @@ -47,9 +48,10 @@ @Override public void initData() { - userNameView.setText(StringHelper.getUserName()); - userPhoneView.setText(StringHelper.getUserPhone()); - userDeptView.setText(StringHelper.getUserDept()); + UserBean.DataBean userBean = StringHelper.getUserBean(); + userNameView.setText(userBean.getName()); + userPhoneView.setText(userBean.getPhone()); + userDeptView.setText(userBean.getDeptName()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index d9656aa..16bd2e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -39,6 +39,7 @@ import com.casic.dcms.ui.UrgentCaseActivity; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import butterknife.BindView; @@ -74,36 +75,38 @@ @Override protected void initData() { - userDataPresenter = new UserDataPresenterImpl(this); homePagePresenter = new HomePagePresenterImpl(this); + userDataPresenter = new UserDataPresenterImpl(this); + + //用户信息 + userDataPresenter.onReadyRetrofitRequest(); + //首页相关功能项 + homePagePresenter.onReadyRetrofitRequest("05"); } @Override protected void initEvent() { - userDataPresenter.onReadyRetrofitRequest(); - homePagePresenter.onReadyRetrofitRequest("05"); + //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 +// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); + Glide.with(this).load(R.mipmap.app_logo).into(userIconView); } @SuppressLint("SetTextI18n") @Override public void obtainUserData(UserBean userBean) { if (userBean.isSuccess()) { - //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 -// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); - Glide.with(this).load(R.mipmap.app_logo).into(userIconView); + UserBean.DataBean dataBean = userBean.getData(); + StringHelper.saveUserBean(new Gson().toJson(dataBean)); - UserBean.DataBean data = userBean.getData(); - userNameView.setText(data.getName()); - userDeptView.setText(data.getDeptName() + data.getRoleNames()); - - StringHelper.saveUserName(data.getName()); - StringHelper.saveUserPhone(data.getPhone()); - StringHelper.saveUserDept(data.getDeptName()); - StringHelper.saveUserDeptId(data.getDeptId()); - StringHelper.saveUserId(data.getId()); + userNameView.setText(dataBean.getName()); + userDeptView.setText(dataBean.getDeptName() + dataBean.getRoleNames()); } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); + } @Override public void obtainHomePageResult(HomePageBean resultBean) { @@ -183,11 +186,6 @@ } @Override - public void obtainDataFail() { - ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); - } - - @Override public void onDestroyView() { super.onDestroyView(); if (userDataPresenter != null) { @@ -197,4 +195,4 @@ homePagePresenter.disposeRetrofitRequest(); } } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 1657341..13aa09b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -76,7 +76,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserDeptId()); + phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 9e3437c..859d2ac 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -37,8 +37,9 @@ Color.rgb(120, 104, 230)}; public static final String IP_KEY = "ip"; - public static final String BRIDGE_LIST = "projectBridges"; - public static final String TOILET_LIST = "toilets"; + static final String USER_BEAN = "userBean"; + static final String BRIDGE_LIST = "projectBridges"; + static final String TOILET_LIST = "toilets"; public static final long HALF_YEAR = 180 * 60 * 60 * 24 * 1000L; public static final long ONE_YEAR = 365 * 60 * 60 * 24 * 1000L; diff --git a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java b/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java deleted file mode 100644 index 0286bb6..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.dcms.utils; - -import android.graphics.Rect; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -public class ItemDecorationSpace extends RecyclerView.ItemDecoration { - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (parent.getChildAdapterPosition(view) % 2 == 0) { - outRect.left = 0; - outRect.right = 5; - } else if (parent.getChildAdapterPosition(view) % 2 == 1) { - outRect.left = 5; - outRect.right = 0; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 4dd4dbd..cac58c5 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,7 +4,14 @@ import android.util.Log; import com.casic.dcms.R; +import com.casic.dcms.bean.HomePageBean; +import com.casic.dcms.bean.ProjectConfigBean; +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -21,44 +28,45 @@ return (String) SaveKeyValues.getValue("userAccount", ""); } - public static void saveUserId(String userId) { - SaveKeyValues.putValue("userId", userId); + public static void saveUserBean(String userBeanJson) { + SaveKeyValues.putValue(Constant.USER_BEAN, userBeanJson); } - public static String getUserId() { - return (String) SaveKeyValues.getValue("userId", ""); + public static UserBean.DataBean getUserBean() { + String userBeanJson = (String) SaveKeyValues.getValue(Constant.USER_BEAN, ""); + UserBean.DataBean dataBean = new UserBean.DataBean(); + if (userBeanJson.equals("")) { + return dataBean; + } + return new Gson().fromJson(userBeanJson, UserBean.DataBean.class); } - public static void saveUserName(String name) { - SaveKeyValues.putValue("userName", name); + public static void saveBridgeList(String bridgesJson) { + SaveKeyValues.putValue(Constant.BRIDGE_LIST, bridgesJson); } - public static String getUserName() { - return (String) SaveKeyValues.getValue("userName", ""); + public static List getBridgeBeanList() { + String bridgesJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); + List bridges = new ArrayList<>(); + if (bridgesJson.equals("")) { + return bridges; + } + return new Gson().fromJson(bridgesJson, new TypeToken>() { + }.getType()); } - public static void saveUserPhone(String phone) { - SaveKeyValues.putValue("userPhone", phone); + public static void saveToiletList(String toiletsJson) { + SaveKeyValues.putValue(Constant.TOILET_LIST, toiletsJson); } - public static String getUserPhone() { - return (String) SaveKeyValues.getValue("userPhone", ""); - } - - public static void saveUserDept(String dept) { - SaveKeyValues.putValue("userDept", dept); - } - - public static String getUserDept() { - return (String) SaveKeyValues.getValue("userDept", ""); - } - - public static void saveUserDeptId(String deptid) { - SaveKeyValues.putValue("userDeptId", deptid); - } - - public static String getUserDeptId() { - return (String) SaveKeyValues.getValue("userDeptId", ""); + public static List getToiletBeanList() { + String toiletsJson = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); + List toilets = new ArrayList<>(); + if (toiletsJson.equals("")) { + return toilets; + } + return new Gson().fromJson(toiletsJson, new TypeToken>() { + }.getType()); } public static boolean isLetterAndDigit(String str) { diff --git a/app/src/main/res/drawable/ic_package_holder.xml b/app/src/main/res/drawable/ic_package_holder.xml deleted file mode 100644 index 1f5ad5e..0000000 --- a/app/src/main/res/drawable/ic_package_holder.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 1d21c58..b376886 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -50,10 +50,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -95,10 +94,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -142,10 +140,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - @@ -38,10 +37,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -53,10 +51,9 @@ style="@style/noPointTextViewStyle" android:text="核查图片" /> - diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index e754c14..7d7a7c2 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -136,10 +136,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -151,10 +150,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -166,10 +164,9 @@ style="@style/noPointTextViewStyle" android:text="核查图片" /> - diff --git a/app/src/main/res/layout/activity_case_handle_detail.xml b/app/src/main/res/layout/activity_case_handle_detail.xml index 4cc674c..19a1a4a 100644 --- a/app/src/main/res/layout/activity_case_handle_detail.xml +++ b/app/src/main/res/layout/activity_case_handle_detail.xml @@ -22,16 +22,13 @@ - + @@ -132,10 +129,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - @@ -150,10 +149,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - diff --git a/app/src/main/res/layout/activity_case_todo_detail.xml b/app/src/main/res/layout/activity_case_todo_detail.xml index 345ca19..255a52e 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -97,10 +97,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_todo_handled_detail.xml b/app/src/main/res/layout/activity_case_todo_handled_detail.xml index a929b43..2bb8cf1 100644 --- a/app/src/main/res/layout/activity_case_todo_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_handled_detail.xml @@ -151,10 +151,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_verified_detail.xml b/app/src/main/res/layout/activity_case_verified_detail.xml index 394d248..a39e000 100644 --- a/app/src/main/res/layout/activity_case_verified_detail.xml +++ b/app/src/main/res/layout/activity_case_verified_detail.xml @@ -50,10 +50,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_verify_detail.xml b/app/src/main/res/layout/activity_case_verify_detail.xml index 0c90a09..1220507 100644 --- a/app/src/main/res/layout/activity_case_verify_detail.xml +++ b/app/src/main/res/layout/activity_case_verify_detail.xml @@ -76,10 +76,9 @@ style="@style/tagTextViewStyle" android:text="案卷图片" /> - - + @@ -130,7 +127,6 @@ android:id="@+id/phoneNumberView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="@dimen/margin_10dp" android:background="@null" android:hint="请输入店主手机号码" android:inputType="phone" @@ -145,6 +141,7 @@ @@ -153,14 +150,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:orientation="vertical"> - + diff --git a/app/src/main/res/layout/activity_dept_authorize.xml b/app/src/main/res/layout/activity_dept_authorize.xml index b097a6e..22934d5 100644 --- a/app/src/main/res/layout/activity_dept_authorize.xml +++ b/app/src/main/res/layout/activity_dept_authorize.xml @@ -76,7 +76,6 @@ android:id="@+id/optionEditView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:background="@null" android:hint="请输入少于50个字的处理意见" android:maxLength="50" /> diff --git a/app/src/main/res/layout/activity_dept_todo.xml b/app/src/main/res/layout/activity_dept_todo.xml index b097a6e..22934d5 100644 --- a/app/src/main/res/layout/activity_dept_todo.xml +++ b/app/src/main/res/layout/activity_dept_todo.xml @@ -76,7 +76,6 @@ android:id="@+id/optionEditView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:background="@null" android:hint="请输入少于50个字的处理意见" android:maxLength="50" /> diff --git a/app/src/main/res/layout/activity_package_handled.xml b/app/src/main/res/layout/activity_package_handled.xml index 5298ba1..8791216 100644 --- a/app/src/main/res/layout/activity_package_handled.xml +++ b/app/src/main/res/layout/activity_package_handled.xml @@ -23,10 +23,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -66,10 +65,9 @@ style="@style/noPointTextViewStyle" android:text="处罚图片" /> - diff --git a/app/src/main/res/layout/activity_package_todo.xml b/app/src/main/res/layout/activity_package_todo.xml index c20b869..fa5dae0 100644 --- a/app/src/main/res/layout/activity_package_todo.xml +++ b/app/src/main/res/layout/activity_package_todo.xml @@ -56,10 +56,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:layout_marginStart="100dp"> - + - + @@ -84,7 +83,6 @@ android:id="@+id/phoneNumberView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="@dimen/margin_10dp" android:background="@null" android:hint="请输入店主手机号码" android:inputType="phone" @@ -104,7 +102,6 @@ android:id="@+id/caseDetailEditView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:background="@null" android:hint="请输入少于50个字的案卷情况描述" android:maxLength="50" @@ -126,14 +123,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:orientation="vertical"> - + + style="@style/detailTextViewStyle" /> @@ -62,7 +61,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:background="@null" android:hint="社区通过地图选点获取" android:padding="3dp" @@ -83,7 +81,6 @@ android:id="@+id/caseLocationView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:background="@null" android:hint="请输入案卷发生的地点" android:maxLength="50" diff --git a/app/src/main/res/layout/include_dept_base_layout.xml b/app/src/main/res/layout/include_dept_base_layout.xml index 9319f36..fd11c2f 100644 --- a/app/src/main/res/layout/include_dept_base_layout.xml +++ b/app/src/main/res/layout/include_dept_base_layout.xml @@ -137,10 +137,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -182,10 +181,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - diff --git a/app/src/main/res/layout/include_package_base.xml b/app/src/main/res/layout/include_package_base.xml index 62c75a1..e398c33 100644 --- a/app/src/main/res/layout/include_package_base.xml +++ b/app/src/main/res/layout/include_package_base.xml @@ -124,10 +124,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/include_package_punish.xml b/app/src/main/res/layout/include_package_punish.xml deleted file mode 100644 index 0713bb1..0000000 --- a/app/src/main/res/layout/include_package_punish.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_select_gridview.xml b/app/src/main/res/layout/item_select_gridview.xml index cbe36db..d7a3bed 100644 --- a/app/src/main/res/layout/item_select_gridview.xml +++ b/app/src/main/res/layout/item_select_gridview.xml @@ -8,7 +8,8 @@ android:id="@+id/imageView" android:layout_width="150dp" android:layout_height="150dp" - android:layout_gravity="center" /> + android:layout_gravity="center" + android:scaleType="centerCrop" /> images = new ArrayList<>(); + + public ImageGridViewAdapter(Context mContext) { + this.context = mContext; + } + + public void setImageList(@Nullable List imageUrlList) { + images.clear(); + if (imageUrlList != null) { + images.addAll(imageUrlList); + } + notifyDataSetChanged(); + } + + public void isDeleteVisible(boolean isVisible) { + this.isVisible = isVisible; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public int getCount() { + return images.size(); + } + + @Override + public Object getItem(int position) { + return images.get(position); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ItemViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, null); + holder = new ItemViewHolder(); + holder.imageView = convertView.findViewById(R.id.imageView); + holder.deleteView = convertView.findViewById(R.id.deleteView); + convertView.setTag(holder); + } else { + holder = (ItemViewHolder) convertView.getTag(); + } + Glide.with(context) + .load(images.get(position)) + .apply(new RequestOptions().error(R.drawable.ic_load_error)) + .into(holder.imageView); + if (isVisible) { + holder.deleteView.setVisibility(View.VISIBLE); + holder.deleteView.setOnClickListener(v -> deleteClickListener.onClick(position)); + } else { + holder.deleteView.setVisibility(View.INVISIBLE); + } + return convertView; + } + + private static class ItemViewHolder { + private ImageView imageView; + private ImageView deleteView; + } + + private OnDeleteItemClickListener deleteClickListener; + + public interface OnDeleteItemClickListener { + void onClick(int position); + } + + public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { + this.deleteClickListener = deleteItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java b/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java deleted file mode 100644 index d9b10e0..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/ImageRecycleViewAdapter.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.casic.dcms.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/7 17:17 - * @Email: 290677893@qq.com - **/ -public class ImageRecycleViewAdapter extends RecyclerView.Adapter { - - private Context context; - private boolean isShow = true; - private List mediaList = new ArrayList<>(); - - public ImageRecycleViewAdapter(Context mContext) { - this.context = mContext; - } - - public void setMediaList(@Nullable List imageUrlList) { - mediaList.clear(); - if (imageUrlList != null) { - mediaList.addAll(imageUrlList); - } - notifyDataSetChanged(); - } - - public void setDeleteView(boolean isShow) { - this.isShow = isShow; - } - - @NonNull - @Override - public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = LayoutInflater.from(context).inflate(R.layout.item_select_gridview, parent, false); - return new ItemViewHolder(view); - } - - @Override - public int getItemCount() { - return mediaList.size(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { - Glide.with(context) - .load(mediaList.get(position)) - .apply(new RequestOptions().error(R.drawable.ic_load_error)) - .into(holder.imageView); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - itemClickListener.onClick(position); - } - }); - if (isShow) { - holder.deleteView.setVisibility(View.VISIBLE); - holder.deleteView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - deleteClickListener.onClick(position); - } - }); - } else { - holder.deleteView.setVisibility(View.INVISIBLE); - } - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - private ImageView imageView; - private ImageView deleteView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - imageView = itemView.findViewById(R.id.imageView); - deleteView = itemView.findViewById(R.id.deleteView); - } - } - - private OnDeleteItemClickListener deleteClickListener; - - public interface OnDeleteItemClickListener { - void onClick(int position); - } - - public void setOnDeleteClickListener(OnDeleteItemClickListener deleteItemClickListener) { - this.deleteClickListener = deleteItemClickListener; - } - - private OnItemClickListener itemClickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - this.itemClickListener = listener; - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 2ab2f73..2df6ede 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -18,7 +18,6 @@ import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; import com.casic.dcms.mvp.view.IMaintainSubmitView; -import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -28,13 +27,10 @@ import com.casic.dcms.utils.callback.IAddressListener; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; -import java.lang.reflect.Type; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -120,15 +116,11 @@ public void onClick(View v) { switch (v.getId()) { case R.id.bridgeLayout: - String bridgeJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); - if (bridgeJson.equals("")) { + List bridges = StringHelper.getBridgeBeanList(); + if (bridges.size() == 0) { ToastHelper.showToast("获取桥梁数据异常", ToastHelper.ERROR); return; } - Type type = new TypeToken>() { - }.getType(); - List bridges = new Gson().fromJson(bridgeJson, type); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("选择桥梁"); for (ProjectConfigBean.BridgesBean bean : bridges) { @@ -196,7 +188,7 @@ //提交养护记录 submitMaintainPresenter.onReadyRetrofitRequest(bridgeId, maintainContent, maintainDateView.getText().toString(), - StringHelper.getUserId(), String.valueOf(gcjToWgs[0]), + StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), StringHelper.filterString(remarksView.getText().toString())); } else { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index c7cc129..a5f468d 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.check.CaseCheckFragment; import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,16 +78,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.caseHandleTimeView) TextView caseHandleTimeView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -113,7 +112,7 @@ private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter checkImageAdapter; + private ImageGridViewAdapter checkImageAdapter; @Override public int initLayoutView() { @@ -138,10 +137,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - checkImageAdapter = new ImageRecycleViewAdapter(this); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(checkImageAdapter); + checkImageAdapter = new ImageGridViewAdapter(this); + checkGridView.setAdapter(checkImageAdapter); } @Override @@ -195,7 +192,7 @@ ToastHelper.showToast("核查情况还未选择", ToastHelper.WARING); return; } - if (checkImageAdapter.getItemCount() != 2) { + if (checkImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -257,19 +254,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -302,19 +297,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } caseHandleResultView.setText(data.getProcessRemarks().equals("") ? "无处理意见" : data.getProcessRemarks()); //TODO 服务器返回数据缺少此字段，暂时注掉 @@ -359,7 +352,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = checkImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = checkImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -367,22 +360,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); //九宫格点击事件 - checkImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - checkImageAdapter.setDeleteView(true); - checkImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + checkImageAdapter.isDeleteVisible(true); + checkImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - checkImageAdapter.setMediaList(realPaths); + checkImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7fd53a1..9d8274e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,12 +52,12 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -129,19 +128,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -154,19 +151,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -179,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index da201b3..62ac8a5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -3,22 +3,21 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -54,12 +53,12 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; - @BindView(R.id.caseCheckRecyclerView) - RecyclerView caseCheckRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; + @BindView(R.id.checkGridView) + GridView checkGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -122,19 +121,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处理图片 @@ -147,19 +144,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //核查图片 @@ -172,19 +167,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseCheckRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseCheckRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseCheckRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + checkGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 83f54ef..996401c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -79,8 +78,8 @@ TextView caseSituationView; @BindView(R.id.caseHandleView) TextView caseHandleView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseStartTimeView) @@ -91,8 +90,8 @@ TextView caseHandleResultView; @BindView(R.id.imageLayout) RelativeLayout imageLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -118,7 +117,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter handleImageAdapter;//处理图片的adapter + private ImageGridViewAdapter handleImageAdapter;//处理图片的adapter @Override public int initLayoutView() { @@ -144,10 +143,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); } @Override @@ -177,19 +174,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -294,7 +289,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } @@ -360,7 +355,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -368,22 +363,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - handleImageAdapter.setMediaList(realPaths); + handleImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index cafc4ac..c59ef06 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -53,10 +52,10 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleImageView) - RecyclerView caseHandleImageView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -117,19 +116,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -142,19 +139,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleImageView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleImageView.addItemDecoration(new ItemDecorationSpace()); - caseHandleImageView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index f89c05a..c3b9977 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -3,15 +3,14 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -25,7 +24,6 @@ import com.casic.dcms.ui.fragment.overtime.CaseHandledFragment; import com.casic.dcms.ui.fragment.overtime.CaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -56,8 +54,8 @@ TextView casePlaceView; @BindView(R.id.caseDescriptionView) TextView caseDescriptionView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -152,19 +150,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 7661a1c..398b244 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -55,8 +54,8 @@ TextView caseDescriptionView; @BindView(R.id.caseSuperviseView) TextView caseSuperviseView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -118,19 +117,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 91bf9f9..e3a2c99 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -11,7 +11,9 @@ import android.view.Gravity; import android.view.MotionEvent; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -20,13 +22,11 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -44,7 +44,6 @@ import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -104,8 +103,8 @@ JzvdStd videoPlayerView; @BindView(R.id.addImageView) ImageView addImageView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -125,7 +124,7 @@ private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 private UploadAudioPresenterImpl uploadAudioPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; private UploadVideoPresenterImpl uploadVideoPresenter; private String audioUrl, videoUrl; @@ -164,10 +163,8 @@ uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @SuppressLint("ClickableViewAccessibility") @@ -534,7 +531,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); imageList.add(url); @@ -542,21 +539,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -618,7 +615,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index aa02a1c..b7b71f5 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -62,8 +61,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -73,7 +72,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopCaseSubmitPresenterImpl shopCaseSubmitPresenter; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private QMUITipDialog submitDialog; private ArrayList realPaths = new ArrayList<>();//真实图片路径 private List mediaList = new ArrayList<>();//上传到服务器的数据集 @@ -97,10 +96,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -217,7 +214,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -273,7 +270,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -281,21 +278,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 964490e..f4f3501 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseLargeClassBean; @@ -29,7 +29,6 @@ import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -71,8 +70,8 @@ EditText caseLocationView; @BindView(R.id.caseDetailEditView) EditText caseDetailEditView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -90,7 +89,7 @@ private String eorc = ""; private String typeCode = ""; private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String gridId; @Override @@ -115,10 +114,8 @@ .setTipWord("处理中，请稍后") .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -331,28 +328,28 @@ */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg String url = resultBean.getData(); - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { imageList.add(url); realPaths.add(StringHelper.appendCompleteURL(url)); if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { imageList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } @@ -401,7 +398,7 @@ ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index b8f97ec..496edba 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -3,21 +3,20 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -57,8 +56,8 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) @@ -121,19 +120,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index c3b3b66..5f6a3e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -39,7 +39,6 @@ import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -87,16 +86,16 @@ TextView caseStartTimeView; @BindView(R.id.caseEndTimeView) TextView caseEndTimeView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; @BindView(R.id.caseOpinionView) TextView caseOpinionView; @BindView(R.id.caseConditionView) TextView caseConditionView; - @BindView(R.id.caseVerifyRecyclerView) - RecyclerView caseVerifyRecyclerView; + @BindView(R.id.verifyGridView) + GridView verifyGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.addImageView) @@ -139,7 +138,7 @@ private CaseNextNodePresenterImpl caseNextNodePresenter; private CaseHandlePresenterImpl caseHandlePresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private ImageRecycleViewAdapter verifyImageAdapter; + private ImageGridViewAdapter verifyImageAdapter; @Override public int initLayoutView() { @@ -168,10 +167,8 @@ .create(); caseNextNodePresenter = new CaseNextNodePresenterImpl(this); caseHandlePresenter = new CaseHandlePresenterImpl(this); - verifyImageAdapter = new ImageRecycleViewAdapter(this); - caseVerifyRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseVerifyRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseVerifyRecyclerView.setAdapter(verifyImageAdapter); + verifyImageAdapter = new ImageGridViewAdapter(this); + verifyGridView.setAdapter(verifyImageAdapter); } @Override @@ -226,19 +223,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //音频 @@ -386,7 +381,7 @@ int source = data.getSource(); if (source != 11 && source != 12) { //修改案卷 - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -402,7 +397,7 @@ if (TextUtils.isEmpty(fieldIntro)) { ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); } - if (verifyImageAdapter.getItemCount() != 2) { + if (verifyImageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -533,7 +528,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = verifyImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = verifyImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -541,22 +536,22 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); //九宫格点击事件 - verifyImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + verifyGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - verifyImageAdapter.setDeleteView(true); - verifyImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + verifyImageAdapter.isDeleteVisible(true); + verifyImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - verifyImageAdapter.setMediaList(realPaths); + verifyImageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 3cedbfe..8b08041 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -5,17 +5,17 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; @@ -23,7 +23,6 @@ import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -57,8 +56,8 @@ EditText shopKeeperView; @BindView(R.id.phoneNumberView) EditText phoneNumberView; - @BindView(R.id.selectedResultView) - RecyclerView selectedResultView; + @BindView(R.id.selectedGridViewView) + GridView selectedGridViewView; @BindView(R.id.addImageView) ImageView addImageView; @BindView(R.id.submitButton) @@ -67,7 +66,7 @@ private UploadImagePresenterImpl uploadImagePresenter; private ShopChangePresenterImpl shopChangePresenter; private QMUITipDialog submitDialog; - private ImageRecycleViewAdapter imageAdapter; + private ImageGridViewAdapter imageAdapter; private String merchantId;//商户id private String merchantName; private ArrayList realPaths = new ArrayList<>();//真实图片路径 @@ -91,10 +90,8 @@ .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") .create(); - imageAdapter = new ImageRecycleViewAdapter(this); - selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); - selectedResultView.addItemDecoration(new ItemDecorationSpace()); - selectedResultView.setAdapter(imageAdapter); + imageAdapter = new ImageGridViewAdapter(this); + selectedGridViewView.setAdapter(imageAdapter); } @Override @@ -153,7 +150,7 @@ ToastHelper.showToast("店主名还未填写", ToastHelper.WARING); return; } - if (imageAdapter.getItemCount() != 2) { + if (imageAdapter.getCount() != 2) { ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); return; } @@ -235,7 +232,7 @@ * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg */ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - int sumItemCount = imageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = imageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); mediaList.add(url); @@ -243,21 +240,21 @@ if (realPaths.size() == 2) { addImageView.setVisibility(View.GONE); } - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + selectedGridViewView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, realPaths); } }); //删除按钮点击事件 - imageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + imageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { mediaList.remove(position); realPaths.remove(position); - imageAdapter.setMediaList(realPaths); + imageAdapter.setImageList(realPaths); if (realPaths.size() != 2) { addImageView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 381b704..d371d17 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -80,7 +80,7 @@ @Override public void initEvent() { - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", "", "", pageIndex); + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); calendarView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -98,7 +98,7 @@ endGroup = endGroupPosition;//结束月份位置 endChild = endChildPosition;//结束对应月份中日的位置 dateView.setText(startDate + "~" + endDate); - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", startDate, endDate, pageIndex); } }).builder(); @@ -110,7 +110,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); @@ -119,7 +119,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - recordPresenter.onReadyRetrofitRequest(StringHelper.getUserId(), "", + recordPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getId(), "", "", "", pageIndex); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0d7053a..3662274 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -3,17 +3,17 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -27,7 +27,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAdjustFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -66,14 +65,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.optionEditView) @@ -207,19 +206,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -250,19 +247,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index bd491c3..19b9039 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -31,7 +31,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseAuthorizeFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -70,14 +69,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -264,19 +263,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -307,19 +304,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java index f22a99d..797b130 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptTodoDetailActivity.java @@ -3,18 +3,18 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.RelativeLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -32,7 +32,6 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; @@ -71,14 +70,14 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.audioPlayerView) AudioPlayerView audioPlayerView; @BindView(R.id.videoPlayerView) JzvdStd videoPlayerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.optTypeView) TextView optTypeView; @BindView(R.id.casePersonLayout) @@ -157,19 +156,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } String audioFile = data.getAudioIdVerify(); @@ -200,19 +197,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //获取处置类型 diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 1c1fcd0..e40d2cc 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -22,9 +22,11 @@ import com.casic.dcms.base.BaseApplication; import com.casic.dcms.base.DoubleClickExitActivity; import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.HomePageBean; import com.casic.dcms.bean.NoticeBean; import com.casic.dcms.bean.ProjectConfigBean; import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.greendao.NoticeBeanDao; import com.casic.dcms.mvp.presenter.PushRegisterPresenterImpl; import com.casic.dcms.mvp.presenter.ToiletListPresenterImpl; @@ -44,6 +46,8 @@ import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StatusBarColorUtil; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.callback.IHttpRequestListener; import com.casic.dcms.widgets.NoScrollViewPager; import com.google.android.material.bottomnavigation.BottomNavigationView; @@ -59,7 +63,8 @@ import butterknife.BindView; import okhttp3.ResponseBody; -public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, IPushRegisterView, IToiletListView { +public class MainActivity extends DoubleClickExitActivity implements IUploadPositionView, + IPushRegisterView, IToiletListView { private static final String TAG = "MainActivity"; @BindView(R.id.pageTitleView) @@ -100,18 +105,17 @@ uploadPositionPresenter = new UploadPositionPresenterImpl(this); registerPresenter = new PushRegisterPresenterImpl(this); toiletListPresenter = new ToiletListPresenterImpl(this); - gson = new Gson(); + //获取配置项 + obtainProjectConfig(); + //配置页面 pageList = new ArrayList<>(); pageList.add(new HomePageFragment()); pageList.add(new PhonePageFragment()); pageList.add(new NoticePageFragment()); pageList.add(new MinePageFragment()); + imei = OtherUtils.obtainSimCardSerialNumber(this); - - //获取配置项 - obtainProjectConfig(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { startForegroundService(new Intent(this, UploadLocationService.class)); } else { @@ -128,7 +132,7 @@ try { String resultStr = resultBean.string(); List bridges = gson.fromJson(resultStr, ProjectConfigBean.class).getBridges(); - SaveKeyValues.putValue(Constant.BRIDGE_LIST, gson.toJson(bridges)); + StringHelper.saveBridgeList(gson.toJson(bridges)); } catch (IOException e) { e.printStackTrace(); } @@ -310,7 +314,7 @@ @Override public void obtainToiletListData(ToiletListBean resultBean) { if (resultBean.isSuccess()) { - SaveKeyValues.putValue(Constant.TOILET_LIST, gson.toJson(resultBean.getData())); + StringHelper.saveToiletList(gson.toJson(resultBean.getData())); } } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 441625b..fe48830 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -3,18 +3,16 @@ import android.content.Context; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; +import android.widget.GridView; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.mvp.presenter.CaseDetailPresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; @@ -44,16 +42,16 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.punishTypeView) TextView punishTypeView; @BindView(R.id.punishOpinionView) TextView punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.punishDateView) TextView punishDateView; @@ -106,19 +104,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -131,19 +127,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + handleGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //处罚记录 @@ -158,19 +152,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + punishGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } punishDateView.setText(data.getPunishTime()); } diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index 1dec74b..6711568 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -5,7 +5,9 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import android.widget.AdapterView; import android.widget.EditText; +import android.widget.GridView; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; @@ -13,11 +15,9 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.ImageRecycleViewAdapter; +import com.casic.dcms.adapter.ImageGridViewAdapter; import com.casic.dcms.base.BaseCaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; @@ -35,7 +35,6 @@ import com.casic.dcms.ui.fragment.threepkg.PackageHandledFragment; import com.casic.dcms.ui.fragment.threepkg.PackageTodoFragment; import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; @@ -78,8 +77,8 @@ TextView casePlaceView; @BindView(R.id.caseSituationView) TextView caseSituationView; - @BindView(R.id.casePicRecyclerView) - RecyclerView casePicRecyclerView; + @BindView(R.id.casePicGridView) + GridView casePicGridView; @BindView(R.id.caseHandleResultView) TextView caseHandleResultView; @BindView(R.id.line1) @@ -90,8 +89,8 @@ View line2; @BindView(R.id.reasonLayout) RelativeLayout reasonLayout; - @BindView(R.id.caseHandleRecyclerView) - RecyclerView caseHandleRecyclerView; + @BindView(R.id.handleGridView) + GridView handleGridView; @BindView(R.id.addHandleImageView) ImageView addHandleImageView; @BindView(R.id.caseReasonView) @@ -102,8 +101,8 @@ TextView punishTypeView; @BindView(R.id.punishOpinionView) EditText punishOpinionView; - @BindView(R.id.punishRecyclerView) - RecyclerView punishRecyclerView; + @BindView(R.id.punishGridView) + GridView punishGridView; @BindView(R.id.addPunishImageView) ImageView addPunishImageView; @BindView(R.id.punishDateView) @@ -120,7 +119,8 @@ private ArrayList punishRealPaths = new ArrayList<>();//真实图片路径 private List handleImageList = new ArrayList<>();//上传到服务器的数据集 private List punishImageList = new ArrayList<>();//上传到服务器的数据集 - private ImageRecycleViewAdapter punishImageAdapter, handleImageAdapter; + private ImageGridViewAdapter handleImageAdapter; + private ImageGridViewAdapter punishImageAdapter; private CaseNextNodePresenterImpl caseNextNodePresenter; private String changeState; private String approvalResult; @@ -155,17 +155,13 @@ .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); //处罚adapter - punishImageAdapter = new ImageRecycleViewAdapter(this); - punishRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - punishRecyclerView.addItemDecoration(new ItemDecorationSpace()); - punishRecyclerView.setAdapter(punishImageAdapter); + punishImageAdapter = new ImageGridViewAdapter(this); + punishGridView.setAdapter(punishImageAdapter); //下级结点 caseNextNodePresenter = new CaseNextNodePresenterImpl(this); - //案卷处理adapter - handleImageAdapter = new ImageRecycleViewAdapter(this); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(handleImageAdapter); + //案卷处理adapter，默认加载之前的处理图，但是依旧可以处理，然后显示最新的图 + handleImageAdapter = new ImageGridViewAdapter(this); + handleGridView.setAdapter(handleImageAdapter); caseHandlePresenter = new CaseHandlePresenterImpl(this); packageHandlePresenter = new PackageHandlePresenterImpl(this); @@ -206,19 +202,17 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - casePicRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - casePicRecyclerView.addItemDecoration(new ItemDecorationSpace()); - casePicRecyclerView.setAdapter(imageAdapter); + ImageGridViewAdapter imageAdapter = new ImageGridViewAdapter(this); + imageAdapter.setImageList(urls); + casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + imageAdapter.isDeleteVisible(false); } //案卷处理时候上传的图片 @@ -231,19 +225,16 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ImageRecycleViewAdapter imageAdapter = new ImageRecycleViewAdapter(this); - imageAdapter.setMediaList(urls); - caseHandleRecyclerView.setLayoutManager(new GridLayoutManager(this, 2)); - caseHandleRecyclerView.addItemDecoration(new ItemDecorationSpace()); - caseHandleRecyclerView.setAdapter(imageAdapter); + handleImageAdapter.setImageList(urls); + handleGridView.setAdapter(handleImageAdapter); //九宫格点击事件 - imageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, urls); } }); - imageAdapter.setDeleteView(false); + handleImageAdapter.isDeleteVisible(true); } } } @@ -382,7 +373,7 @@ //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg if (isAddHandleImage) { //处理图片 - int sumItemCount = handleImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = handleImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); handleImageList.add(url); @@ -390,22 +381,22 @@ if (handleRealPaths.size() == 2) { addHandleImageView.setVisibility(View.GONE); } - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); //九宫格点击事件 - handleImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, handleRealPaths); } }); //删除按钮点击事件 - handleImageAdapter.setDeleteView(true); - handleImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + handleImageAdapter.isDeleteVisible(true); + handleImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { handleImageList.remove(position); handleRealPaths.remove(position); - handleImageAdapter.setMediaList(handleRealPaths); + handleImageAdapter.setImageList(handleRealPaths); if (handleRealPaths.size() != 2) { addHandleImageView.setVisibility(View.VISIBLE); } @@ -416,7 +407,7 @@ } } else { //处罚图片 - int sumItemCount = punishImageAdapter.getItemCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 + int sumItemCount = punishImageAdapter.getCount() + 1;//每上传一张图片，图片总数都是在原有的基础上+1 if (sumItemCount <= 2) { String url = resultBean.getData(); punishImageList.add(url); @@ -424,21 +415,21 @@ if (punishRealPaths.size() == 2) { addPunishImageView.setVisibility(View.GONE); } - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); //九宫格点击事件 - punishImageAdapter.setOnItemClickListener(new ImageRecycleViewAdapter.OnItemClickListener() { + punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(int position) { + public void onItemClick(AdapterView parent, View view, int position, long id) { OtherUtils.showBigImage(context, position, punishRealPaths); } }); //删除按钮点击事件 - punishImageAdapter.setOnDeleteClickListener(new ImageRecycleViewAdapter.OnDeleteItemClickListener() { + punishImageAdapter.setOnDeleteClickListener(new ImageGridViewAdapter.OnDeleteItemClickListener() { @Override public void onClick(int position) { punishImageList.remove(position); punishRealPaths.remove(position); - punishImageAdapter.setMediaList(punishRealPaths); + punishImageAdapter.setImageList(punishRealPaths); if (punishRealPaths.size() != 2) { addPunishImageView.setVisibility(View.VISIBLE); } @@ -506,7 +497,7 @@ } if (handleResult.equals("处理完成")) { //选择处理完成时，处理图片必传。至少一张，最多两张 - if (handleImageAdapter.getItemCount() != 2) { + if (handleImageAdapter.getCount() != 2) { ToastHelper.showToast("当前案卷状态必须上传至少两张图片", ToastHelper.WARING); return; } diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index 7e3d47e..7c58e30 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -31,7 +31,6 @@ import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; import com.casic.dcms.utils.ToastHelper; @@ -50,8 +49,6 @@ import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.luck.picture.lib.PictureSelector; @@ -216,16 +213,14 @@ mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.obtainToiletIdLayout: - String toiletValue = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); - if (toiletValue.equals("")) { + List toiletBeanList = StringHelper.getToiletBeanList(); + if (toiletBeanList.size() == 0) { ToastHelper.showToast("获取公厕数据失败，请联系管理员", ToastHelper.ERROR); return; } - List dataBeans = new Gson().fromJson(toiletValue, new TypeToken>() { - }.getType()); QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("请选择您要打卡的公厕"); - for (ToiletListBean.DataBean it : dataBeans) { + for (ToiletListBean.DataBean it : toiletBeanList) { sheetBuilder.addItem(it.getName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -233,7 +228,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - toiletIdView.setText(dataBeans.get(position).getId()); + toiletIdView.setText(toiletBeanList.get(position).getId()); //TODO 是否需要将地图移到相应的公厕，待定 } }).build().show(); @@ -308,7 +303,7 @@ ToastHelper.showToast("保洁开始时间不能为空", ToastHelper.WARING); return; } - cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserId(), + cleanToiletPresenter.onReadyRetrofitRequest(toiletId, StringHelper.getUserBean().getId(), String.valueOf(gcjToWgs[0]), String.valueOf(gcjToWgs[1]), startTime, endTimeView.getText().toString(), imagePath, StringHelper.filterString(workContentView.getText().toString())); diff --git a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java index 3a8ebc6..9f316a9 100644 --- a/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/UserInfoActivity.java @@ -7,6 +7,7 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; +import com.casic.dcms.bean.UserBean; import com.casic.dcms.utils.StringHelper; import com.qmuiteam.qmui.widget.QMUITopBarLayout; @@ -47,9 +48,10 @@ @Override public void initData() { - userNameView.setText(StringHelper.getUserName()); - userPhoneView.setText(StringHelper.getUserPhone()); - userDeptView.setText(StringHelper.getUserDept()); + UserBean.DataBean userBean = StringHelper.getUserBean(); + userNameView.setText(userBean.getName()); + userPhoneView.setText(userBean.getPhone()); + userDeptView.setText(userBean.getDeptName()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index d9656aa..16bd2e4 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -39,6 +39,7 @@ import com.casic.dcms.ui.UrgentCaseActivity; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; +import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIRadiusImageView; import butterknife.BindView; @@ -74,36 +75,38 @@ @Override protected void initData() { - userDataPresenter = new UserDataPresenterImpl(this); homePagePresenter = new HomePagePresenterImpl(this); + userDataPresenter = new UserDataPresenterImpl(this); + + //用户信息 + userDataPresenter.onReadyRetrofitRequest(); + //首页相关功能项 + homePagePresenter.onReadyRetrofitRequest("05"); } @Override protected void initEvent() { - userDataPresenter.onReadyRetrofitRequest(); - homePagePresenter.onReadyRetrofitRequest("05"); + //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 +// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); + Glide.with(this).load(R.mipmap.app_logo).into(userIconView); } @SuppressLint("SetTextI18n") @Override public void obtainUserData(UserBean userBean) { if (userBean.isSuccess()) { - //QMUIRadiusImageView无法动态设置圆形头像，借助Glide实现圆形头像 -// Glide.with(this).load(R.mipmap.app_logo).apply(RequestOptions.circleCropTransform()).into(userIconView); - Glide.with(this).load(R.mipmap.app_logo).into(userIconView); + UserBean.DataBean dataBean = userBean.getData(); + StringHelper.saveUserBean(new Gson().toJson(dataBean)); - UserBean.DataBean data = userBean.getData(); - userNameView.setText(data.getName()); - userDeptView.setText(data.getDeptName() + data.getRoleNames()); - - StringHelper.saveUserName(data.getName()); - StringHelper.saveUserPhone(data.getPhone()); - StringHelper.saveUserDept(data.getDeptName()); - StringHelper.saveUserDeptId(data.getDeptId()); - StringHelper.saveUserId(data.getId()); + userNameView.setText(dataBean.getName()); + userDeptView.setText(dataBean.getDeptName() + dataBean.getRoleNames()); } } + @Override + public void obtainDataFail() { + ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); + } @Override public void obtainHomePageResult(HomePageBean resultBean) { @@ -183,11 +186,6 @@ } @Override - public void obtainDataFail() { - ToastHelper.showToast("获取用户信息失败，请重试", ToastHelper.ERROR); - } - - @Override public void onDestroyView() { super.onDestroyView(); if (userDataPresenter != null) { @@ -197,4 +195,4 @@ homePagePresenter.disposeRetrofitRequest(); } } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index 1657341..13aa09b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -76,7 +76,7 @@ deptList.add(bean.getName()); } if (deptList.size() > 0) { - phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserDeptId()); + phoneBookPresenter.onReadyRetrofitRequest(StringHelper.getUserBean().getDeptId()); } } } diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index 9e3437c..859d2ac 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -37,8 +37,9 @@ Color.rgb(120, 104, 230)}; public static final String IP_KEY = "ip"; - public static final String BRIDGE_LIST = "projectBridges"; - public static final String TOILET_LIST = "toilets"; + static final String USER_BEAN = "userBean"; + static final String BRIDGE_LIST = "projectBridges"; + static final String TOILET_LIST = "toilets"; public static final long HALF_YEAR = 180 * 60 * 60 * 24 * 1000L; public static final long ONE_YEAR = 365 * 60 * 60 * 24 * 1000L; diff --git a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java b/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java deleted file mode 100644 index 0286bb6..0000000 --- a/app/src/main/java/com/casic/dcms/utils/ItemDecorationSpace.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.dcms.utils; - -import android.graphics.Rect; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -public class ItemDecorationSpace extends RecyclerView.ItemDecoration { - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { - if (parent.getChildAdapterPosition(view) % 2 == 0) { - outRect.left = 0; - outRect.right = 5; - } else if (parent.getChildAdapterPosition(view) % 2 == 1) { - outRect.left = 5; - outRect.right = 0; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 4dd4dbd..cac58c5 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -4,7 +4,14 @@ import android.util.Log; import com.casic.dcms.R; +import com.casic.dcms.bean.HomePageBean; +import com.casic.dcms.bean.ProjectConfigBean; +import com.casic.dcms.bean.ToiletListBean; +import com.casic.dcms.bean.UserBean; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -21,44 +28,45 @@ return (String) SaveKeyValues.getValue("userAccount", ""); } - public static void saveUserId(String userId) { - SaveKeyValues.putValue("userId", userId); + public static void saveUserBean(String userBeanJson) { + SaveKeyValues.putValue(Constant.USER_BEAN, userBeanJson); } - public static String getUserId() { - return (String) SaveKeyValues.getValue("userId", ""); + public static UserBean.DataBean getUserBean() { + String userBeanJson = (String) SaveKeyValues.getValue(Constant.USER_BEAN, ""); + UserBean.DataBean dataBean = new UserBean.DataBean(); + if (userBeanJson.equals("")) { + return dataBean; + } + return new Gson().fromJson(userBeanJson, UserBean.DataBean.class); } - public static void saveUserName(String name) { - SaveKeyValues.putValue("userName", name); + public static void saveBridgeList(String bridgesJson) { + SaveKeyValues.putValue(Constant.BRIDGE_LIST, bridgesJson); } - public static String getUserName() { - return (String) SaveKeyValues.getValue("userName", ""); + public static List getBridgeBeanList() { + String bridgesJson = (String) SaveKeyValues.getValue(Constant.BRIDGE_LIST, ""); + List bridges = new ArrayList<>(); + if (bridgesJson.equals("")) { + return bridges; + } + return new Gson().fromJson(bridgesJson, new TypeToken>() { + }.getType()); } - public static void saveUserPhone(String phone) { - SaveKeyValues.putValue("userPhone", phone); + public static void saveToiletList(String toiletsJson) { + SaveKeyValues.putValue(Constant.TOILET_LIST, toiletsJson); } - public static String getUserPhone() { - return (String) SaveKeyValues.getValue("userPhone", ""); - } - - public static void saveUserDept(String dept) { - SaveKeyValues.putValue("userDept", dept); - } - - public static String getUserDept() { - return (String) SaveKeyValues.getValue("userDept", ""); - } - - public static void saveUserDeptId(String deptid) { - SaveKeyValues.putValue("userDeptId", deptid); - } - - public static String getUserDeptId() { - return (String) SaveKeyValues.getValue("userDeptId", ""); + public static List getToiletBeanList() { + String toiletsJson = (String) SaveKeyValues.getValue(Constant.TOILET_LIST, ""); + List toilets = new ArrayList<>(); + if (toiletsJson.equals("")) { + return toilets; + } + return new Gson().fromJson(toiletsJson, new TypeToken>() { + }.getType()); } public static boolean isLetterAndDigit(String str) { diff --git a/app/src/main/res/drawable/ic_package_holder.xml b/app/src/main/res/drawable/ic_package_holder.xml deleted file mode 100644 index 1f5ad5e..0000000 --- a/app/src/main/res/drawable/ic_package_holder.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_case_check_detail.xml b/app/src/main/res/layout/activity_case_check_detail.xml index 1d21c58..b376886 100644 --- a/app/src/main/res/layout/activity_case_check_detail.xml +++ b/app/src/main/res/layout/activity_case_check_detail.xml @@ -50,10 +50,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -95,10 +94,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -142,10 +140,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - @@ -38,10 +37,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -53,10 +51,9 @@ style="@style/noPointTextViewStyle" android:text="核查图片" /> - diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index e754c14..7d7a7c2 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -136,10 +136,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -151,10 +150,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -166,10 +164,9 @@ style="@style/noPointTextViewStyle" android:text="核查图片" /> - diff --git a/app/src/main/res/layout/activity_case_handle_detail.xml b/app/src/main/res/layout/activity_case_handle_detail.xml index 4cc674c..19a1a4a 100644 --- a/app/src/main/res/layout/activity_case_handle_detail.xml +++ b/app/src/main/res/layout/activity_case_handle_detail.xml @@ -22,16 +22,13 @@ - + @@ -132,10 +129,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - @@ -150,10 +149,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - diff --git a/app/src/main/res/layout/activity_case_todo_detail.xml b/app/src/main/res/layout/activity_case_todo_detail.xml index 345ca19..255a52e 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -97,10 +97,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_todo_handled_detail.xml b/app/src/main/res/layout/activity_case_todo_handled_detail.xml index a929b43..2bb8cf1 100644 --- a/app/src/main/res/layout/activity_case_todo_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_handled_detail.xml @@ -151,10 +151,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_verified_detail.xml b/app/src/main/res/layout/activity_case_verified_detail.xml index 394d248..a39e000 100644 --- a/app/src/main/res/layout/activity_case_verified_detail.xml +++ b/app/src/main/res/layout/activity_case_verified_detail.xml @@ -50,10 +50,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/activity_case_verify_detail.xml b/app/src/main/res/layout/activity_case_verify_detail.xml index 0c90a09..1220507 100644 --- a/app/src/main/res/layout/activity_case_verify_detail.xml +++ b/app/src/main/res/layout/activity_case_verify_detail.xml @@ -76,10 +76,9 @@ style="@style/tagTextViewStyle" android:text="案卷图片" /> - - + @@ -130,7 +127,6 @@ android:id="@+id/phoneNumberView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="@dimen/margin_10dp" android:background="@null" android:hint="请输入店主手机号码" android:inputType="phone" @@ -145,6 +141,7 @@ @@ -153,14 +150,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:orientation="vertical"> - + diff --git a/app/src/main/res/layout/activity_dept_authorize.xml b/app/src/main/res/layout/activity_dept_authorize.xml index b097a6e..22934d5 100644 --- a/app/src/main/res/layout/activity_dept_authorize.xml +++ b/app/src/main/res/layout/activity_dept_authorize.xml @@ -76,7 +76,6 @@ android:id="@+id/optionEditView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:background="@null" android:hint="请输入少于50个字的处理意见" android:maxLength="50" /> diff --git a/app/src/main/res/layout/activity_dept_todo.xml b/app/src/main/res/layout/activity_dept_todo.xml index b097a6e..22934d5 100644 --- a/app/src/main/res/layout/activity_dept_todo.xml +++ b/app/src/main/res/layout/activity_dept_todo.xml @@ -76,7 +76,6 @@ android:id="@+id/optionEditView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:background="@null" android:hint="请输入少于50个字的处理意见" android:maxLength="50" /> diff --git a/app/src/main/res/layout/activity_package_handled.xml b/app/src/main/res/layout/activity_package_handled.xml index 5298ba1..8791216 100644 --- a/app/src/main/res/layout/activity_package_handled.xml +++ b/app/src/main/res/layout/activity_package_handled.xml @@ -23,10 +23,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - @@ -66,10 +65,9 @@ style="@style/noPointTextViewStyle" android:text="处罚图片" /> - diff --git a/app/src/main/res/layout/activity_package_todo.xml b/app/src/main/res/layout/activity_package_todo.xml index c20b869..fa5dae0 100644 --- a/app/src/main/res/layout/activity_package_todo.xml +++ b/app/src/main/res/layout/activity_package_todo.xml @@ -56,10 +56,9 @@ android:layout_marginStart="100dp" android:orientation="vertical"> - + - + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:layout_marginStart="100dp"> - + - + @@ -84,7 +83,6 @@ android:id="@+id/phoneNumberView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="@dimen/margin_10dp" android:background="@null" android:hint="请输入店主手机号码" android:inputType="phone" @@ -104,7 +102,6 @@ android:id="@+id/caseDetailEditView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:background="@null" android:hint="请输入少于50个字的案卷情况描述" android:maxLength="50" @@ -126,14 +123,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:orientation="vertical"> - + + style="@style/detailTextViewStyle" /> @@ -62,7 +61,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:background="@null" android:hint="社区通过地图选点获取" android:padding="3dp" @@ -83,7 +81,6 @@ android:id="@+id/caseLocationView" style="@style/inputEditTextStyle" android:layout_marginStart="100dp" - android:layout_marginEnd="10dp" android:background="@null" android:hint="请输入案卷发生的地点" android:maxLength="50" diff --git a/app/src/main/res/layout/include_dept_base_layout.xml b/app/src/main/res/layout/include_dept_base_layout.xml index 9319f36..fd11c2f 100644 --- a/app/src/main/res/layout/include_dept_base_layout.xml +++ b/app/src/main/res/layout/include_dept_base_layout.xml @@ -137,10 +137,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - @@ -182,10 +181,9 @@ style="@style/noPointTextViewStyle" android:text="处理图片" /> - diff --git a/app/src/main/res/layout/include_package_base.xml b/app/src/main/res/layout/include_package_base.xml index 62c75a1..e398c33 100644 --- a/app/src/main/res/layout/include_package_base.xml +++ b/app/src/main/res/layout/include_package_base.xml @@ -124,10 +124,9 @@ style="@style/noPointTextViewStyle" android:text="案卷图片" /> - diff --git a/app/src/main/res/layout/include_package_punish.xml b/app/src/main/res/layout/include_package_punish.xml deleted file mode 100644 index 0713bb1..0000000 --- a/app/src/main/res/layout/include_package_punish.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_select_gridview.xml b/app/src/main/res/layout/item_select_gridview.xml index cbe36db..d7a3bed 100644 --- a/app/src/main/res/layout/item_select_gridview.xml +++ b/app/src/main/res/layout/item_select_gridview.xml @@ -8,7 +8,8 @@ android:id="@+id/imageView" android:layout_width="150dp" android:layout_height="150dp" - android:layout_gravity="center" /> + android:layout_gravity="center" + android:scaleType="centerCrop" /> true + +