From a7a48ccf772344029f03962df6fcd2346e876bc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= <1484288157@qq.com> Date: Mon, 7 Sep 2020 14:36:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8BV4.3.0-?= =?UTF-8?q?=E8=A7=86=E9=A2=91=E4=BC=98=E5=8C=96=E4=B8=8E=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=B1=87=E6=80=BB=20(5,7-9)=20https://gitlab?= =?UTF-8?q?.ghzs.com/pm/halo-app-issues/-/issues/983?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/common/util/CommentHelper.kt | 30 ++-- .../java/com/gh/common/util/DialogUtils.java | 93 ++++++++++- .../com/gh/common/view/CircleProgressBar.java | 9 +- .../qa/comment/StairsCommentViewHolder.kt | 2 +- .../video/upload/view/UploadVideoActivity.kt | 14 +- .../videomanager/VideoManagerActivity.kt | 18 +-- .../main/res/drawable-xxhdpi/upload_pause.png | Bin 375 -> 344 bytes .../res/drawable-xxhdpi/upload_resume.png | Bin 1175 -> 469 bytes .../res/drawable-xxhdpi/upload_warning.png | Bin 1753 -> 1264 bytes .../res/drawable/bg_shape_f5_radius_4.xml | 6 + .../res/drawable/ic_complaint_arrow_right.png | Bin 0 -> 412 bytes .../main/res/layout/activity_video_uplaod.xml | 152 +++++++++--------- .../res/layout/dialog_video_complaint.xml | 104 ++++++++++++ app/src/main/res/values/attrs.xml | 12 +- 14 files changed, 320 insertions(+), 120 deletions(-) create mode 100644 app/src/main/res/drawable/bg_shape_f5_radius_4.xml create mode 100644 app/src/main/res/drawable/ic_complaint_arrow_right.png create mode 100644 app/src/main/res/layout/dialog_video_complaint.xml diff --git a/app/src/main/java/com/gh/common/util/CommentHelper.kt b/app/src/main/java/com/gh/common/util/CommentHelper.kt index 2e0a01b807..9ac4273872 100644 --- a/app/src/main/java/com/gh/common/util/CommentHelper.kt +++ b/app/src/main/java/com/gh/common/util/CommentHelper.kt @@ -128,7 +128,7 @@ object CommentHelper { "投诉" -> { context.ifLogin("回答详情-评论-投诉") { - showReportTypeDialog(context) { reportType -> + showReportTypeDialog(context, !videoId.isNullOrEmpty()) { reportType -> val commentListener = object : PostCommentUtils.PostCommentListener { override fun postSuccess(response: JSONObject?) { @@ -346,16 +346,28 @@ object CommentHelper { } } - private fun showReportTypeDialog(context: Context, reportCallback: (reportType: String) -> Unit) { + private fun showReportTypeDialog(context: Context, isVideoComment: Boolean, reportCallback: (reportType: String) -> Unit) { val reportTypes = arrayListOf("垃圾广告营销", "恶意攻击谩骂", "淫秽色情信息", "违法有害信息", "其它") - DialogUtils.showListDialog(context, reportTypes, null) { text -> - val jsonObject = JSONObject() - try { - jsonObject.put("reason", text) - reportCallback.invoke(jsonObject.toString()) - } catch (e: JSONException) { - e.printStackTrace() + if (!isVideoComment) { + DialogUtils.showListDialog(context, reportTypes, null) { text -> + val jsonObject = JSONObject() + try { + jsonObject.put("reason", text) + reportCallback.invoke(jsonObject.toString()) + } catch (e: JSONException) { + e.printStackTrace() + } + } + } else { + DialogUtils.showVideoComplaintDialog(context, reportTypes, null) { text -> + val jsonObject = JSONObject() + try { + jsonObject.put("reason", text) + reportCallback.invoke(jsonObject.toString()) + } catch (e: JSONException) { + e.printStackTrace() + } } } } 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 bedd09900d..825d129e0d 100644 --- a/app/src/main/java/com/gh/common/util/DialogUtils.java +++ b/app/src/main/java/com/gh/common/util/DialogUtils.java @@ -8,6 +8,7 @@ import android.content.Intent; import android.content.SharedPreferences; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; +import android.graphics.drawable.Drawable; import android.os.CountDownTimer; import android.preference.PreferenceManager; import android.text.Html; @@ -25,16 +26,11 @@ import android.view.ViewGroup; import android.view.Window; import android.view.WindowManager; import android.widget.Button; +import android.widget.EditText; 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; @@ -69,6 +65,13 @@ 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.constraintlayout.widget.ConstraintLayout; +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) { @@ -1603,6 +1606,84 @@ public class DialogUtils { dialog.show(); } + public static void showVideoComplaintDialog(Context context, + List options, + List disabledOptions, + OptionCallback callback) { + context = checkDialogContext(context); + + Dialog dialog = new Dialog(context); + + View view = LayoutInflater.from(context).inflate(R.layout.dialog_video_complaint, null, false); + LinearLayout complaintContainer = view.findViewById(R.id.complaintContainer); + ConstraintLayout otherComplaintContainer = view.findViewById(R.id.otherComplaintContainer); + EditText complaintCommentEt = view.findViewById(R.id.complaintCommentEt); + TextView backTv = view.findViewById(R.id.backTv); + TextView commitTv = view.findViewById(R.id.commitTv); + Context finalContext = context; + ExtensionsKt.setTextChangedListener(complaintCommentEt, (s, start, before, count) -> { + commitTv.setTextColor(ContextCompat.getColor(finalContext, s.toString().trim().isEmpty() ? R.color.text_999999 : R.color.theme_font)); + return null; + }); + + for (String option : options) { + TextView reportTv = new TextView(context); + reportTv.setText(option); + reportTv.setTextSize(16f); + if (disabledOptions != null && disabledOptions.contains(option)) { + reportTv.setTextColor(ContextCompat.getColor(context, R.color.btn_gray)); + } else { + reportTv.setTextColor(ContextCompat.getColor(context, R.color.title)); + reportTv.setBackgroundResource(R.drawable.textview_white_style); + } + reportTv.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, + LinearLayout.LayoutParams.WRAP_CONTENT)); + reportTv.setPadding(DisplayUtils.dip2px(context, 20f), DisplayUtils.dip2px(context, 17f), + DisplayUtils.dip2px(context, 20f), DisplayUtils.dip2px(context, 17f)); + if (option.equals("其它")) { + Drawable drawable = ContextCompat.getDrawable(context, R.drawable.ic_complaint_arrow_right); + drawable.setBounds(0, 0, DisplayUtils.dip2px(6f), DisplayUtils.dip2px(10f)); + reportTv.setCompoundDrawables(null, null, drawable, null); + } + complaintContainer.addView(reportTv); + + reportTv.setOnClickListener(v -> { + if (option.equals("其它")) { + complaintContainer.setVisibility(View.GONE); + otherComplaintContainer.setVisibility(View.VISIBLE); + } else { + dialog.cancel(); + callback.onClicked(reportTv.getText().toString()); + } + }); + } + + backTv.setOnClickListener(v -> { + Util_System_Keyboard.hideSoftKeyboard(finalContext, complaintCommentEt); + complaintContainer.setVisibility(View.VISIBLE); + otherComplaintContainer.setVisibility(View.GONE); + }); + commitTv.setOnClickListener(v -> { + if (complaintCommentEt.getText().toString().isEmpty()) { + ToastUtils.INSTANCE.showToast("请先输入说明~"); + return; + } + dialog.cancel(); + callback.onClicked(complaintCommentEt.getText().toString()); + }); + + dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); + dialog.setContentView(view); + dialog.show(); + Window window = dialog.getWindow(); + if (window != null) { + window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); + WindowManager.LayoutParams params = window.getAttributes(); + params.width = context.getResources().getDisplayMetrics().widthPixels - DisplayUtils.dip2px(40f); + window.setAttributes(params); + } + } + /** * @param context may be is application context * @return activity context diff --git a/app/src/main/java/com/gh/common/view/CircleProgressBar.java b/app/src/main/java/com/gh/common/view/CircleProgressBar.java index fe5dbc325b..0d188713dd 100644 --- a/app/src/main/java/com/gh/common/view/CircleProgressBar.java +++ b/app/src/main/java/com/gh/common/view/CircleProgressBar.java @@ -28,9 +28,9 @@ public class CircleProgressBar extends View { private int disableProgressColor = Color.parseColor("#999999");//禁用已经走了的进度条颜色 private int disableTextColor = Color.parseColor("#999999");//禁用文字颜色 - private int currentNormalColor = normalColor; - private int currentProgressColor = progressColor; - private int currentTextColor = textColor; + private int currentNormalColor; + private int currentProgressColor; + private int currentTextColor; private float textSize = 20;//文字大小 private int progress = 0;//进度条 @@ -64,6 +64,9 @@ public class CircleProgressBar extends View { progress = array.getInt(R.styleable.CircleProgressBar_progress, progress); progress_style = array.getInt(R.styleable.CircleProgressBar_progress_style, 0) == 0 ? Paint.Style.STROKE : Paint.Style.FILL; + currentNormalColor = normalColor; + currentProgressColor = progressColor; + currentTextColor = textColor; array.recycle(); initPaint(); } diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/StairsCommentViewHolder.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/StairsCommentViewHolder.kt index e06447db1a..b34815340c 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/StairsCommentViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/StairsCommentViewHolder.kt @@ -154,7 +154,7 @@ class StairsCommentViewHolder(val binding: StairsCommentItemBinding, val isReply holder.itemView.setOnLongClickListener(View.OnLongClickListener { isChildLongClick = true - CommentHelper.showVideoCommentOptions(it, + CommentHelper.showVideoCommentOptions(holder.binding.commentLikeContainer, commentEntity, mIsShowingConversation, mViewModel.videoId, 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 608fe52495..77b2c3ca26 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 @@ -159,7 +159,7 @@ class UploadVideoActivity : ToolBarActivity() { verifyData(false) LogUtils.logVideoStreamingUpload("点击提交", mPath, mEntranceLink, "") } - mBinding.videoPoster.setOnClickListener { + mBinding.videoPosterPatchHint.setOnClickListener { startMediaStore() MtaHelper.onEvent("上传视频", "上传视频", "换封面") LogUtils.logVideoStreamingUpload("换封面", mPath, mEntranceLink, "") @@ -678,7 +678,6 @@ class UploadVideoActivity : ToolBarActivity() { mBinding.uploadButton.setOnClickListener { if (UploadManager.isUploading(videoPath)) { mBinding.uploadStatus.text = "上传已暂停" - mBinding.uploadStatus.setTextColor(R.color.text_333333.toColor()) mBinding.uploadSpeed.visibility = View.GONE mBinding.uploadButton.setImageResource(R.drawable.upload_resume) mBinding.uploadButton.visibility = View.VISIBLE @@ -687,7 +686,6 @@ class UploadVideoActivity : ToolBarActivity() { LogUtils.logVideoStreamingUpload("暂停上传", mPath, mEntranceLink, "") } else if (File(videoPath).exists()) { mBinding.uploadStatus.text = "视频上传中" - mBinding.uploadStatus.setTextColor(R.color.text_333333.toColor()) mBinding.uploadButton.setImageResource(R.drawable.upload_pause) mBinding.uploadButton.visibility = View.VISIBLE createUploadTask(videoPath) @@ -733,7 +731,7 @@ class UploadVideoActivity : ToolBarActivity() { mBinding.uploadSpeed.visibility = View.VISIBLE mBinding.uploadButton.visibility = View.VISIBLE mBinding.uploadSpeed.text = (SpeedUtils.getSpeed(speed) + "预计还需" + SpeedUtils.getRemainTime(totalSize, currentSize, speed)) - mBinding.uploadProgress.progress = (100 * currentSize / totalSize).toInt() + mBinding.uploadProgress.update(((360 * currentSize) / totalSize).toInt(), "") } } @@ -752,7 +750,6 @@ class UploadVideoActivity : ToolBarActivity() { toast("上传失败，视频文件不存在") } else { mBinding.uploadStatus.text = "网络错误，中断上传" - mBinding.uploadStatus.setTextColor(R.color.text_FF700F.toColor()) mBinding.uploadButton.setImageResource(R.drawable.upload_resume) mBinding.uploadButton.visibility = View.VISIBLE MtaHelper.onEvent("上传视频", "上传视频", "网络错误") @@ -766,15 +763,16 @@ class UploadVideoActivity : ToolBarActivity() { private fun handleUploadSuccess(url: String) { mBinding.uploadStatus.text = "视频已上传完成" - mBinding.uploadSpeed.visibility = View.GONE + mBinding.uploadStatusContainer.visibility = View.GONE + mBinding.uploadProgress.visibility = View.GONE mBinding.uploadButton.visibility = View.GONE - mBinding.uploadProgress.progress = 100 + mBinding.videoPosterMask.visibility = View.GONE + mBinding.uploadProgress.update(360, "") mVideoFileEntity?.url = url } private fun handleFileNotFound() { mBinding.uploadStatus.text = "上传失败，视频文件不存在" - mBinding.uploadStatus.setTextColor(R.color.text_EA3333.toColor()) mBinding.uploadButton.setImageResource(R.drawable.upload_warning) mBinding.uploadButton.visibility = View.VISIBLE } diff --git a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoManagerActivity.kt b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoManagerActivity.kt index 2b2d338de4..d9bddc5586 100644 --- a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoManagerActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoManagerActivity.kt @@ -1,6 +1,5 @@ package com.gh.gamecenter.video.videomanager -import android.app.Activity import android.content.Context import android.content.Intent import android.os.Bundle @@ -14,7 +13,6 @@ import com.gh.common.util.* import com.gh.gamecenter.R import com.gh.gamecenter.entity.SimpleGameEntity import com.gh.gamecenter.entity.VideoLinkEntity -import com.gh.gamecenter.video.poster.PosterClipActivity import com.gh.gamecenter.video.upload.view.UploadVideoActivity import com.zhihu.matisse.Matisse import com.zhihu.matisse.MimeType @@ -31,17 +29,13 @@ class VideoManagerActivity : BaseActivity_TabLayout() { val uris = Matisse.obtainResult(data) if (uris.size > 0) { val videoPath = PathUtils.getPath(this, uris[0]) ?: "" - startActivityForResult(PosterClipActivity.getIntent(this, videoPath), REQUEST_CODE_CLIP) + val intent = if (mVideoLink != null) { + UploadVideoActivity.getIntent(this, videoPath, mVideoLink!!, mSimpleGameEntity, mEntrance, "视频投稿", "") + } else { + UploadVideoActivity.getIntent(this, videoPath, mEntrance, "视频投稿", "") + } + startActivityForResult(intent, REQUEST_CODE_VIDEO) } - } else if (REQUEST_CODE_CLIP == requestCode && resultCode == Activity.RESULT_OK && data != null) { - val videoPath = data.getStringExtra(EntranceUtils.KEY_PATH_VIDEO) - val videoPoster = data.getStringExtra(EntranceUtils.KEY_POSTER_PATH) - val intent = if (mVideoLink != null) { - UploadVideoActivity.getIntent(this, videoPath, mVideoLink!!, mSimpleGameEntity, mEntrance, "视频投稿", videoPoster) - } else { - UploadVideoActivity.getIntent(this, videoPath, mEntrance, "视频投稿", videoPoster) - } - startActivityForResult(intent, REQUEST_CODE_VIDEO) } if (UploadVideoActivity.RESULT_CODE_VIDEO == resultCode) { diff --git a/app/src/main/res/drawable-xxhdpi/upload_pause.png b/app/src/main/res/drawable-xxhdpi/upload_pause.png index 431f71a3f1bd6d6ee8c556deca3cdca4d820beb9..49266f793197dd0fb5d6eec77d0441f1f11d7917 100644 GIT binary patch literal 344 zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3jKx9jP7LeL$-D$|Tv8)E(|mmy zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uw}2VJ1}Qw{XwC|x4tcsbhIsJ4 zopzAxkb!`U^v8SmKl1PSxl-s)v^CI=fu&xR~wV+;@5`q8szQa z5@BfnddSdTRmbiyzG6K?P^uj^D N@^tlcS?83{1OS8|b*lgX literal 375 zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL1|)l2v+e>Z#^NA%Cx&(BWL^TYA7_6}kb5l}wMOR56NAqlk<*V>8RTD9*>&UDf?W@fUg3OLqt@2BB3n3E zz2);v3AIJ*e0}B$oJ&ud(Xq?Su++(7erKZ6t6N7XQMmX>9RKnJ$!Ct9+f!_3Y|j*l zTC=b0@Z>XxXT_bZGU)%xxwme$|BqMM+rK%ij*GJ`dpPgj`d{yMHoyP%n`K_a^YE^4 THNkJdkYw<5^>bP0l+XkKh1ROy diff --git a/app/src/main/res/drawable-xxhdpi/upload_resume.png b/app/src/main/res/drawable-xxhdpi/upload_resume.png index 878b0e3864ed05140907239f75cdc930dbe3cc8d..dd4c29897ea08c93447014f9169ebed15fc572eb 100644 GIT binary patch literal 469 zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3jKx9jP7LeL$-D$|Tv8)E(|mmy zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uw}2VJ1}Qw{XwC{$X7B0Z7~;YE zHZ+j0$$%%dE&9jW=LT}k#f47SWu-!e3u^^|E_dOm!^H#>2U zXT}+m{jXYV5fYY2xBGPR^RCZfpX~M=3h`R`Jm`%?uwtKOVbiMY#i?iYd|2MhmGzb> zULd6vbb97>rCUGGH*a=LV*LKlXV*lQn48YmG_SP_f9eh1F?XlE>z&A38-D5}cIxr? zGK*#kJ$!WO;Hx=*ESA)lJd+M+I-lS6HSXKY9P`Q$hb+I9KG}NKf4HvPcxfBlu6N_{ o_qcT*&qar4O8(Kc+;0}6Um4b@zi5u=R8Ww5y85}Sb4q9e0P3QzqW}N^ literal 1175 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 v^V6)wio?#_^gt|~VQ1 + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_complaint_arrow_right.png b/app/src/main/res/drawable/ic_complaint_arrow_right.png new file mode 100644 index 0000000000000000000000000000000000000000..598fdda4bb6bbf74ae91ac076f2a5e4a9cb2bcd1 GIT binary patch literal 412 zcmeAS@N?(olHy`uVBq!ia0vp^LO?9X!3HE1dHi&M6k~CayA#8@b22Z19GBDx&op0O z1}z|)gMqO8I~&%$)_ZKRuVCiy-zL87noB0IHiRZbU;i4Z`8D$FX6I8UK5sFcX{$PO zYG~-*v#0uFd>9X$I&t8RnOwp3Y@sjwXB>ClU^;csEI{j7YmkB1q$Ed=rb26JHq$Ab zr;hU6s(iIQ``5nxiAu93_HyM$t^KMwYhr8CUp=8>Aos-1xJmWvHI<*m95&v5)1bq2or?>H*v99#uCD92 iHF4f1vuVHX*bBz*wtpwe;;=gt6f&N!elF{r5}E+?rIc9! 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 843b929d86..ffb8bd3970 100644 --- a/app/src/main/res/layout/activity_video_uplaod.xml +++ b/app/src/main/res/layout/activity_video_uplaod.xml @@ -20,69 +20,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - - - - - - - - - - - - - - + + + + + + + + + + + + + + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" + tools:visibility="visible"> + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index ca102d0601..7d09d1e1e2 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -80,17 +80,17 @@ - + - + - + - + - + - +