From 73c98e9779d9dd364d7404363a011d9299a08cdb Mon Sep 17 00:00:00 2001 From: adam Date: Tue, 5 Jul 2022 14:35:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E6=A1=A3=E6=A1=88-=E4=B8=AA?= =?UTF-8?q?=E4=BA=BA=E8=8D=A3=E8=AA=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/widget/base/AddImgGridAdapter.java | 89 +++ .../core/widget/base/AddImgGridHolder.java | 26 + .../core/widget/views/ButtomDialogView.java | 3 +- .../res/drawable-xhdpi/ic_honour_default.png | Bin 0 -> 3956 bytes .../sel_rectangle_btn_white_gray_border.xml | 5 + .../drawable/shape_rectangle_white_border.xml | 16 + .../res/layout/dialog_choose_photo_file.xml | 34 +- .../src/main/res/layout/item_grid_photo.xml | 30 + baselib/src/main/res/values/styles.xml | 8 + .../oamodule/adapter/HonourAdapter.java | 86 +++ .../oamodule/beans/SaveHonourBean.java | 54 ++ .../fragments/UserRecordHonourFragment.java | 551 ++++++++++++++++++ .../oamodule/holder/HonourHolder.java | 25 +- .../oamodule/widget/HonourDialog.java | 273 +++++++++ .../oamodule/widget/HonourShowDialog.java | 257 ++++++++ .../src/main/res/layout/dialog_educate.xml | 26 +- .../src/main/res/layout/dialog_honour.xml | 126 ++++ .../main/res/layout/dialog_honour_show.xml | 129 ++++ .../src/main/res/layout/dialog_resume.xml | 29 +- .../fragment_user_record_honour_phone.xml | 38 +- oamodule/src/main/res/layout/item_educate.xml | 14 +- oamodule/src/main/res/layout/item_resume.xml | 7 +- .../src/main/res/layout/item_user_honour.xml | 23 +- 23 files changed, 1773 insertions(+), 76 deletions(-) create mode 100755 baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/AddImgGridAdapter.java create mode 100755 baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/AddImgGridHolder.java create mode 100644 baselib/src/main/res/drawable-xhdpi/ic_honour_default.png create mode 100755 baselib/src/main/res/drawable/sel_rectangle_btn_white_gray_border.xml create mode 100755 baselib/src/main/res/drawable/shape_rectangle_white_border.xml create mode 100755 baselib/src/main/res/layout/item_grid_photo.xml create mode 100644 oamodule/src/main/java/com/tenlionsoft/oamodule/adapter/HonourAdapter.java create mode 100644 oamodule/src/main/java/com/tenlionsoft/oamodule/widget/HonourDialog.java create mode 100644 oamodule/src/main/java/com/tenlionsoft/oamodule/widget/HonourShowDialog.java create mode 100644 oamodule/src/main/res/layout/dialog_honour.xml create mode 100644 oamodule/src/main/res/layout/dialog_honour_show.xml 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 0000000000000000000000000000000000000000..01c52446b7d143bab2e7d3936acc157c1a931016 GIT binary patch literal 3956 zcmV-)4~y`LP)(^xB>_oNB=7(L4;e{BK~#90?VO2sR8^kG`=4l_N4rPqqjT(* z(WbQJsuUhwObSo1X1=iK$KI_XQn`#T?Hgi4E_N1$FcRI z;QiisU%!NfLk(cuj-{)hYz;I<2}`?RchHmtx3*!)Dl8Aej_cmYFTaEZ4H1yLm>qtG zAAg?f7D45gXxs+HD_GoL`Q9h_)j43?Dy$~WdHDe>1dHfM#`Y9(rxXWk(3A;f>sj=x zEaazBdw$6i-{q+v5;$AfGCu^d_jI=N7d&Y$*_r1f@dsF~ z7kSEuwh@UViJbd0`Dv{Jvlb%}RFQS0hu8AN?&>277K{J`W2S{&1K)n}tkO zX517?BFO)I6r&$WW@5rS?7Jr%unx_jnTX~V4{7--EGnA7iUYTy{uo_6kA9Uhi~O4> zy(eu*g+e954~NM6MPE4%RAE;RHbsMRGYnHJ_=4@8ZVUY>-}40FL*rKLDMZ^HA>4%K zi?D=1Y>9)4O~i%gf5GD4U}68l!hZ%SAE054Oq}u!*cwljCsm>{lz-*#$}@vdePe8svR0YX$WRGv>=$iR!HG0*SIEPR*M8s`^{OdSreXw@6sUEBU^slv7RR z32)==9Rkd5jLJu0$?G(%q0&iS;oc`vDMztpFSX6sSMlJb(4nSt0nRinSS8IKvKJ@?+P^~CYLFb+LxE)%)~~*{tls1`1zWdlTR?rE zgq1W`X3DMYWc;#9pewK0YX|EC28q4pGNBqHg&iryKZ|{1U6e?%MnsY)_?bNqN1FAN`HvoV%w}3n^P` z!5=m(TljajeMi}TZDc!mgl8O(ykh^tl>I44{cv=*yc&v@syi^)94m(E?RO;xYNhup zn8?V-tdEY;^yo|?g|!ETt=rYE$5U9=)xluA<=6$+NOB2lj)9U@{M0OI@R#0lcF05_ zH-KN8?Kna;YV~ee#H*_QR&5MHzl3N0V^nLcU#c1w&kcmzq3-RYY5)r*ER93(A?aKf zURP@F-#MN)awNSE>ANZBL!X1yuJp*OCil@B8PCv#X9%C0@#L^Xxtf7fnyvzZs zbTvL)qAU2+B&Cq2Z74 zLo?Xrx1ea5EIWD%ClVG#Z>yy?qqjy2wG}t=wlr!0p?o70E@ek%$_;~K&mpb)qgim> zCk|L~v!HksO=(rMM1)UcJ0IogA5lKS?QgN|GWOqgwZhUKmew~lg&oYIw+xNj*rhie z_I&KOkh^#ktgL^q`2S$nX0w>*pzsUlw~ANt_}OZu#`Zr&y&<$-5^_%&-5#fwumm+1 z47CTU70Rk~%(T>V^M| zC%%hiD?uLs`h`?g$$FwW)~8^3B@hAXBcMDO+mj&mc}RH{Q=g;SUA8ZwQ*4w?kuRar zGs`2p9+P(oPrV?U?VGRB4@1f`Q1KPC-#~q!VEw|gB}hwHz|q{phcpv2_YA_VaJUtM z&9RX7f^zYSvfq$iPE#^F0BF^__$EL9sAB&+z zPk3ntOQ0}b?N0itA?eF{E!1#*b4^|J9x#StTOy>*a$Y&<#`BQzPuczG7E+t-n0?

F_fB5E8C&8Z^Oez8 z{wyTU;HUq>3-{S}{(RKKMxj&qnK${(a2`2*%&%~ozZILY?FJNmCfvFmttBkVtg7Vh zfS!3k}3?uu3X4`pGVGl5UiL#$@A2mxbI{nUP@~XMN5RaWt_aU>kYXmJlzrVS+#q* zxU9?=aiTt>#B_N@f8yIb^+ia2X6zN_%q1h^1s`K=JUh4GzOZyhc-nSZh}EB@JRN%y zI&JFjkxJHrdDxMGrknEq3%fE!CSg1YBQ=Qz=lK=c&L?~DVMa)JRY zUIsKDtM~BK->GRutlb`wc6F9rbk~`SqfEtTJ2g?!S(E9~Y6**G-<{I_;iWDzOXzG?L5l@X<^OY*n=OnbrVpnkL*xk z@vQUKb)P#Q>`JV zUjfD>UiiJ{r0m*G!@+J_U2b1pZol``sP6{`s8ss4*h`ktu!cv7=<>t0;|ZTO_y-4z zyL=y5-U=-C^(QJAU*OJll9W4cSvdr4j8@m&L5HudfN8`eV(KZhlx zb9v#ZBc~9Y&59qxq6W3%QrFesdasJ=-o^sQXGr`QmU2h>hlfzXr-n7D{cy@CsW)TQariYXul7losxI0LG7D2@oaGrYq~}ysCttx>{YYIu3t^ zC3leoGlN&ftvI}i?#Hm~56j?(-^Gt%QNhqvH&hzirS#HXQfFmCm$~2ZqyoXR`Y9}{ z*FH2bMwxq@TQmgAx+>VRY7>cF^&ePZ!|a2t=NHwS5A>p97grnNJJoSGV66;RdHEA8 z3TB1A7F%zt)mv(@_IKE*O>n&32v{UPgY}SO3@q*!uwbHK#g2iM;_Y|z{EuJ+^8&r- zz9V`bo=_1x6Ek`m`U5QMwlG`h?uV_A-PTS2YjGO9f54hx5iE-eD`^te|EpCpyGfI< z#;IV-8lQwE|1#UQFiX&8AJT@cmW|tZa=JGFjSRQ`=3j*o$_&1waxhe2TZi3)M literal 0 HcmV?d00001 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 +