diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/AddImgGridAdapter.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/AddImgGridAdapter.java new file mode 100755 index 0000000..d3ce677 --- /dev/null +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/AddImgGridAdapter.java @@ -0,0 +1,89 @@ +package com.tenlionsoft.baselib.core.widget.base; + +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.tenlionsoft.baselib.R; +import com.tenlionsoft.baselib.core.beans.AddFileBean; + +import java.util.List; + +/** + * 作者 : Adam on 2018/11/10. + * 邮箱 : itgaojian@163.com + * 描述 : 添加图片的适配器 + */ +public class AddImgGridAdapter extends BaseRecyclerAdapter { + public AddImgGridAdapter(Context ctx, List list) { + super(ctx, list); + } + + @Override + public AddImgGridHolder createHolder(ViewGroup parent, int viewType) { + View itemView = LayoutInflater.from(mContext) + .inflate(R.layout.item_grid_photo, parent, false); + return new AddImgGridHolder(itemView); + } + + @Override + public void bindHolder(AddImgGridHolder applyServicePhotoHolder, int i) { + if (TextUtils.isEmpty(mData.get(i).getPath())) { + applyServicePhotoHolder.mIvDelete.setVisibility(View.GONE); + Glide.with(mContext) + .load(R.drawable.ic_file_add) + .into(applyServicePhotoHolder.mIvPhoto); + } else { + if (mDeleteListener != null) { + applyServicePhotoHolder.mIvDelete.setVisibility(View.VISIBLE); + applyServicePhotoHolder.mIvDelete.setOnClickListener(v -> mDeleteListener.onDelete(mData.get(i), i)); + } else { + applyServicePhotoHolder.mIvDelete.setVisibility(View.GONE); + } + RequestOptions options = new RequestOptions() + .transform(new GlideRoundTransform(mContext, 5)) + .error(R.drawable.ic_img_load_err) + .placeholder(R.drawable.ic_img_loading); + if (mData.get(i).getFileType() == 1) { + //文档 + Glide.with(mContext) + .load(R.drawable.ic_file_word) + .apply(options) + .into(applyServicePhotoHolder.mIvPhoto); + } else if (mData.get(i).getFileType() == 2) { + //图片 + Glide.with(mContext) + .load(mData.get(i).getPath()) + .apply(options) + .into(applyServicePhotoHolder.mIvPhoto); + } else if (mData.get(i).getFileType() == 3) { + //视频 + Glide.with(mContext) + .load(R.drawable.ic_file_video) + .apply(options) + .into(applyServicePhotoHolder.mIvPhoto); + } else if (mData.get(i).getFileType() == 4) { + //音频 + Glide.with(mContext) + .load(R.drawable.ic_file_audio) + .apply(options) + .into(applyServicePhotoHolder.mIvPhoto); + } + } + } + + private OnDeleteListener mDeleteListener; + + public void addOnDeleteListener(OnDeleteListener listener) { + this.mDeleteListener = listener; + } + + public interface OnDeleteListener { + void onDelete(AddFileBean bean, int i); + } + +} diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/AddImgGridHolder.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/AddImgGridHolder.java new file mode 100755 index 0000000..08851e9 --- /dev/null +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/AddImgGridHolder.java @@ -0,0 +1,26 @@ +package com.tenlionsoft.baselib.core.widget.base; + +import android.view.View; +import android.widget.ImageView; +import android.widget.TextView; + +import com.tenlionsoft.baselib.R; + +import androidx.recyclerview.widget.RecyclerView; + + +/** + * 作者 : Adam on 2018/11/10. + * 邮箱 : itgaojian@163.com + * 描述 : 维修图像 + */ +public class AddImgGridHolder extends RecyclerView.ViewHolder { + public ImageView mIvPhoto; + public ImageView mIvDelete; + + public AddImgGridHolder(View itemView) { + super(itemView); + mIvPhoto = itemView.findViewById(R.id.iv_photo); + mIvDelete = itemView.findViewById(R.id.iv_delete); + } +} diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/ButtomDialogView.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/ButtomDialogView.java index b4fcf9c..48200b5 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/ButtomDialogView.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/ButtomDialogView.java @@ -2,7 +2,6 @@ package com.tenlionsoft.baselib.core.widget.views; import android.app.Dialog; import android.content.Context; -import android.graphics.drawable.ColorDrawable; import android.os.Bundle; import android.view.Gravity; import android.view.LayoutInflater; @@ -81,7 +80,7 @@ public class ButtomDialogView extends Dialog { params.width = WindowManager.LayoutParams.MATCH_PARENT; params.height = WindowManager.LayoutParams.WRAP_CONTENT; window.setAttributes(params); - window.setBackgroundDrawable(new ColorDrawable()); + window.setBackgroundDrawableResource(android.R.color.transparent); } public void addOnChoseListener(OnChoseListener listener) { diff --git a/baselib/src/main/res/drawable-xhdpi/ic_honour_default.png b/baselib/src/main/res/drawable-xhdpi/ic_honour_default.png new file mode 100644 index 0000000..01c5244 Binary files /dev/null and b/baselib/src/main/res/drawable-xhdpi/ic_honour_default.png differ diff --git a/baselib/src/main/res/drawable/sel_rectangle_btn_white_gray_border.xml b/baselib/src/main/res/drawable/sel_rectangle_btn_white_gray_border.xml new file mode 100755 index 0000000..aa449c3 --- /dev/null +++ b/baselib/src/main/res/drawable/sel_rectangle_btn_white_gray_border.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/baselib/src/main/res/drawable/shape_rectangle_white_border.xml b/baselib/src/main/res/drawable/shape_rectangle_white_border.xml new file mode 100755 index 0000000..4946eae --- /dev/null +++ b/baselib/src/main/res/drawable/shape_rectangle_white_border.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/baselib/src/main/res/layout/dialog_choose_photo_file.xml b/baselib/src/main/res/layout/dialog_choose_photo_file.xml index c28acc4..12ebce0 100755 --- a/baselib/src/main/res/layout/dialog_choose_photo_file.xml +++ b/baselib/src/main/res/layout/dialog_choose_photo_file.xml @@ -2,14 +2,16 @@ + android:orientation="vertical" + android:paddingLeft="10dp" + android:paddingRight="10dp" + android:paddingBottom="20dp"> - - - - + + + + + + + + + \ No newline at end of file diff --git a/baselib/src/main/res/values/styles.xml b/baselib/src/main/res/values/styles.xml index 6abd9c8..18b94df 100755 --- a/baselib/src/main/res/values/styles.xml +++ b/baselib/src/main/res/values/styles.xml @@ -485,6 +485,14 @@ center_vertical 13sp +