From e6f3ad5cc293cdb9d358dc258f804fd64027e183 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= <1484288157@qq.com> Date: Thu, 27 Aug 2020 16:39:35 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E9=A2=91=E4=B8=8A=E4=BC=A0=E4=BA=A4?= =?UTF-8?q?=E4=BA=92=E4=BC=98=E5=8C=96=EF=BC=88=E7=AC=AC=E4=BA=8C=E6=9C=9F?= =?UTF-8?q?=EF=BC=8920200827ui=E5=8F=8D=E9=A6=88=20https://gitlab.ghzs.com?= =?UTF-8?q?/pm/halo-app-issues/-/issues/969?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/common/util/DialogUtils.java | 41 ++++++-- .../java/com/gh/common/util/ErrorHelper.kt | 1 + .../message/MessageItemViewHolder.java | 5 +- .../video/label/VideoLabelActivity.kt | 8 +- .../video/label/VideoLabelAdapter.kt | 12 ++- .../video/label/VideoLabelFragment.kt | 3 +- .../video/upload/view/UploadVideoActivity.kt | 7 +- .../drawable-xxhdpi/ic_activity_delete.png | Bin 0 -> 1015 bytes .../main/res/layout/activity_video_uplaod.xml | 4 +- .../dialog_upload_video_change_label.xml | 90 ++++++++++++++++++ app/src/main/res/values/colors.xml | 1 + 11 files changed, 152 insertions(+), 20 deletions(-) create mode 100644 app/src/main/res/drawable-xxhdpi/ic_activity_delete.png create mode 100644 app/src/main/res/layout/dialog_upload_video_change_label.xml diff --git a/app/src/main/java/com/gh/common/util/DialogUtils.java b/app/src/main/java/com/gh/common/util/DialogUtils.java index 5f9f7e358c..47b3fb908b 100644 --- a/app/src/main/java/com/gh/common/util/DialogUtils.java +++ b/app/src/main/java/com/gh/common/util/DialogUtils.java @@ -29,12 +29,6 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; -import androidx.annotation.NonNull; -import androidx.appcompat.app.AlertDialog; -import androidx.core.content.ContextCompat; -import androidx.databinding.DataBindingUtil; -import androidx.recyclerview.widget.RecyclerView; - import com.facebook.drawee.generic.GenericDraweeHierarchy; import com.gh.common.AppExecutor; import com.gh.common.constant.Config; @@ -68,6 +62,12 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; +import androidx.core.content.ContextCompat; +import androidx.databinding.DataBindingUtil; +import androidx.recyclerview.widget.RecyclerView; + public class DialogUtils { public static Dialog showWaitDialog(Context context, String msg) { @@ -1559,6 +1559,35 @@ public class DialogUtils { dialog.show(); } + public static void showUploadVideoChangeLabelDialog(Context context, @NonNull ConfirmListener confirmListener) { + context = checkDialogContext(context); + + final Dialog dialog = new Dialog(context, R.style.GhAlertDialog); + + View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_upload_video_change_label, null); + + View cancelBtn = contentView.findViewById(R.id.cancel); + View confirmBtn = contentView.findViewById(R.id.confirm); + + cancelBtn.setOnClickListener(v -> { + dialog.dismiss(); + }); + + confirmBtn.setOnClickListener(v -> { + confirmListener.onConfirm(); + dialog.dismiss(); + }); + + Window window = dialog.getWindow(); + if (window != null) { + window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); + } + + dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); + dialog.setContentView(contentView); + dialog.show(); + } + /** * @param context may be is application context * @return activity context diff --git a/app/src/main/java/com/gh/common/util/ErrorHelper.kt b/app/src/main/java/com/gh/common/util/ErrorHelper.kt index 15af55e0b6..1ead0569a1 100644 --- a/app/src/main/java/com/gh/common/util/ErrorHelper.kt +++ b/app/src/main/java/com/gh/common/util/ErrorHelper.kt @@ -116,6 +116,7 @@ object ErrorHelper { 403078 -> Utils.toast(context, "已点赞") 403072 -> Utils.toast(context, R.string.comment_failed_userblocked) 403082 -> Utils.toast(context, "作者已关闭评论") + 403022 -> Utils.toast(context, "不能回复自己") 403020 -> if (showHighPriorityHint) { DialogUtils.showAlertDialog(context, diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java b/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java index 4163bdbbf1..969048f2bd 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java @@ -2,7 +2,6 @@ package com.gh.gamecenter.message; import android.content.Context; import android.content.Intent; -import android.text.TextUtils; import android.view.View; import android.widget.RelativeLayout; @@ -269,7 +268,7 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder case "game_comment_vote": mBinding.messageCommand.setText("赞了你的评论"); mBinding.messageContent.setVisibility(View.GONE); - mBinding.messageOriginalTitle.setText(TextUtils.isEmpty(messageEntity.getGame().getName()) ? "" : messageEntity.getGame().getName()); + mBinding.messageOriginalTitle.setText(messageEntity.getGame().getName()); targetUrl = messageEntity.getGame().getDefaultIcon(); ImageUtils.displayIcon(mBinding.messageAskIcon, targetUrl); mBinding.messageAskIcon.setVisibility(View.VISIBLE); @@ -294,7 +293,7 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder case "game_comment_reply_vote": mBinding.messageCommand.setText("赞了你的回复"); mBinding.messageContent.setVisibility(View.GONE); - mBinding.messageOriginalTitle.setText(TextUtils.isEmpty(messageEntity.getGame().getName()) ? "" : messageEntity.getGame().getName()); + mBinding.messageOriginalTitle.setText(messageEntity.getGame().getName()); targetUrl = messageEntity.getGame().getDefaultIcon(); ImageUtils.displayIcon(mBinding.messageAskIcon, targetUrl); mBinding.messageAskIcon.setVisibility(View.VISIBLE); diff --git a/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelActivity.kt b/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelActivity.kt index 97e8327425..3ca37c5d5e 100644 --- a/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelActivity.kt @@ -31,8 +31,12 @@ class VideoLabelActivity : NormalActivity() { } companion object { - fun getIntent(context: Context): Intent { - return getTargetIntent(context, VideoLabelActivity::class.java, VideoLabelFragment::class.java) + const val TAG_ACTIVITY_ID = "tagActivityId" + + fun getIntent(context: Context, tagActivityId: String = ""): Intent { + val bundle = Bundle() + bundle.putString(TAG_ACTIVITY_ID, tagActivityId) + return getTargetIntent(context, VideoLabelActivity::class.java, VideoLabelFragment::class.java, bundle) } } diff --git a/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelAdapter.kt b/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelAdapter.kt index 998380f0c9..3f42798d4f 100644 --- a/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelAdapter.kt @@ -2,6 +2,7 @@ package com.gh.gamecenter.video.label import android.content.Context import android.view.ViewGroup +import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.gh.base.BaseRecyclerViewHolder import com.gh.gamecenter.R @@ -9,7 +10,7 @@ import com.gh.gamecenter.databinding.VideoLabelItemBinding import com.gh.gamecenter.entity.ActivityLabelEntity import com.lightgame.adapter.BaseRecyclerAdapter -class VideoLabelAdapter(context: Context, private val onItemClickListener: (entity: ActivityLabelEntity) -> Unit) : BaseRecyclerAdapter(context) { +class VideoLabelAdapter(context: Context, private val selectTagActivityId: String, private val onItemClickListener: (entity: ActivityLabelEntity) -> Unit) : BaseRecyclerAdapter(context) { val entityList = ArrayList() @@ -31,10 +32,15 @@ class VideoLabelAdapter(context: Context, private val onItemClickListener: (enti holder.itemView.setOnClickListener { onItemClickListener.invoke(activityLabelEntity) } + if (selectTagActivityId == activityLabelEntity.id) { + holder.itemView.setBackgroundColor(ContextCompat.getColor(mContext, R.color.bg_EFF7FF)) + } else { + holder.itemView.setBackgroundColor(ContextCompat.getColor(mContext, R.color.white)) + } } } - class VideoLabelViewHolder(val binding: VideoLabelItemBinding) : BaseRecyclerViewHolder(binding.root) - override fun getItemCount(): Int = entityList.size + + class VideoLabelViewHolder(val binding: VideoLabelItemBinding) : BaseRecyclerViewHolder(binding.root) } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelFragment.kt b/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelFragment.kt index 9c3d6e277d..f753a16cd7 100644 --- a/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelFragment.kt @@ -36,9 +36,10 @@ class VideoLabelFragment : NormalFragment() { mRefresh.isEnabled = false mViewModel = viewModelProvider() + val selectTagActivityId = arguments?.getString(VideoLabelActivity.TAG_ACTIVITY_ID)?:"" mListRv.apply { layoutManager = LinearLayoutManager(requireContext()) - mAdapter = VideoLabelAdapter(requireContext()) { + mAdapter = VideoLabelAdapter(requireContext(),selectTagActivityId) { val intent = Intent() intent.putExtra(ActivityLabelEntity::class.java.simpleName, it) requireActivity().setResult(Activity.RESULT_OK, intent) diff --git a/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt b/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt index dcfb4e6a06..7a64f5a738 100644 --- a/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt @@ -168,7 +168,8 @@ class UploadVideoActivity : ToolBarActivity() { return@setOnClickListener } - startActivityForResult(VideoLabelActivity.getIntent(this), REQUEST_CODE_CHOOSE_LABEL) + startActivityForResult(VideoLabelActivity.getIntent(this, mActivityLabelEntity?.id + ?: ""), REQUEST_CODE_CHOOSE_LABEL) } mBinding.deleteActivity.setOnClickListener { mActivityLabelEntity = null @@ -185,12 +186,12 @@ class UploadVideoActivity : ToolBarActivity() { } mBinding.reprintTv.setOnClickListener { if (mActivityLabelEntity != null) { - DialogUtils.showAlertDialog(this, "提示", "转载无法参与活动，确定切换为转载吗？", "确定", "暂不", { + DialogUtils.showUploadVideoChangeLabelDialog(this) { switchVideoSource(false) mActivityLabelEntity = null mBinding.activityContainer.visibility = View.GONE mBinding.activityTv.text = "" - }, {}) + } } else { switchVideoSource(false) } diff --git a/app/src/main/res/drawable-xxhdpi/ic_activity_delete.png b/app/src/main/res/drawable-xxhdpi/ic_activity_delete.png new file mode 100644 index 0000000000000000000000000000000000000000..3dacb3f777e14b38c654462d16cf7f40c388102d GIT binary patch literal 1015 zcmVPx#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91B%lKT1ONa40RR91Bme*a04fgS`~Uz0VM#O6iB)d?#K}y|X@M%SAFpiZV@s|XxkPt76bLpjcHW6B9 z=F3w`(NiWd8KLT&W^!vn(7la^nN^o!XoPMqs)6;*@-y=2w#z}{IY}>a6PejpGolt` z8%QYkyfXUhx3|d4lMga#drVN_$YD9NemA{i`)VNsGP}Fp8gJUOwsI%m8Tixiu$;6> zNk0gd36beG8DIhfSitmiXdfg@ykB1LyD zj?liR=*e=GK78AETAV*VME9?ZFd6KMD!u!>=hW9#fM`jgHlZB2wTZrzYnluI00h7= z!Q6xYWbg-I8!5~IT;w06uE(iOU$<*IG5~OqGLac%;wGA~jS_GG7hYWzI~!w}uv}rJ z3>gqMWTKX~nW)N3PEg~`gYLI5Qtgw`$#Ps|=eIZb*k#=`T4!wn&^UNx>i+pQP?Wr( z>zAumOy`IlsdmX|Fyb5TLJO>VV7`5!<@@mwb$mn+ZiJq6jj4n)@_-HVEMb9VIVf0l#}9jHNMsV2wRw#`>yJ1Sxcq=qS4yDUM7~ z*9!cmCBpy&q;jV+S9!McdkP;L*tgw6*O7h4-VE5!zWE$u6YHA~RyHxTD(DW-9N<14 l_(_lG2M51^I+^s7-aql1*SmwM#-jiL002ovPDHLkV1gJ`v`7E| literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/activity_video_uplaod.xml b/app/src/main/res/layout/activity_video_uplaod.xml index 8bd36107f4..d85046cb73 100644 --- a/app/src/main/res/layout/activity_video_uplaod.xml +++ b/app/src/main/res/layout/activity_video_uplaod.xml @@ -305,7 +305,7 @@ android:background="@drawable/bg_upload_video_activity" android:gravity="center_vertical" android:orientation="horizontal" - android:paddingLeft="8dp" + android:paddingLeft="12dp" android:paddingRight="8dp" android:visibility="gone" tools:visibility="visible"> @@ -327,7 +327,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="4dp" - android:src="@drawable/ic_activty_delete" /> + android:src="@drawable/ic_activity_delete" /> diff --git a/app/src/main/res/layout/dialog_upload_video_change_label.xml b/app/src/main/res/layout/dialog_upload_video_change_label.xml new file mode 100644 index 0000000000..87c325edc6 --- /dev/null +++ b/app/src/main/res/layout/dialog_upload_video_change_label.xml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index a951a5a16c..88bdb8b454 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -117,6 +117,7 @@ #303030 #EBF5FF #3797FF + #EFF7FF #b2b2b2 #9a9a9a #3a3a3a