From 2888ab56cdad91bb328d77b6c7ddb43c7ea76750 Mon Sep 17 00:00:00 2001 From: leafwai Date: Tue, 28 Sep 2021 15:30:45 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8BV5?= =?UTF-8?q?.3.0=E3=80=91=E5=AE=A2=E6=88=B7=E7=AB=AF=E5=86=85=E9=83=A8?= =?UTF-8?q?=E9=9C=80=E6=B1=82=EF=BC=88=E6=95=B4=E7=90=86=E7=AE=80=E5=8D=95?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E6=A0=B7=E5=BC=8F=E6=B5=8B=E8=AF=95=EF=BC=89?= =?UTF-8?q?https://git.ghzs.com/pm/halo-app-issues/-/issues/1527?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/base/BaseRichEditorActivity.kt | 3 +- .../com/gh/common/util/DownloadObserver.kt | 2 +- .../java/com/gh/common/util/ErrorHelper.kt | 3 +- .../common/util/GhMatisseVideoApplyFilter.kt | 2 +- .../com/gh/gamecenter/SuggestionActivity.java | 4 +- .../gamecenter/collection/AnswerAdapter.java | 4 +- .../collection/ArticleFragment.java | 4 +- .../collection/CommunityArticleAdapter.kt | 2 +- .../libao/Libao3FragmentAdapter.java | 2 +- .../qa/comment/base/BaseCommentAdapter.kt | 6 +-- .../qa/editor/LocalMediaFragment.kt | 50 +++++++------------ .../SimulatorManagementAdapter.kt | 3 +- 12 files changed, 37 insertions(+), 48 deletions(-) diff --git a/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt b/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt index 317beed33d..14c2c4c47e 100644 --- a/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt +++ b/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt @@ -382,7 +382,8 @@ abstract class BaseRichEditorActivity : ToolBarAct this, "警告", "当前使用移动网络，上传图片会消耗手机流量", - "我知道了", "", { startMediaStore() } + "我知道了", "", { startMediaStore() }, + extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true) ) return } diff --git a/app/src/main/java/com/gh/common/util/DownloadObserver.kt b/app/src/main/java/com/gh/common/util/DownloadObserver.kt index 0f9fd50b69..51a77cabc7 100644 --- a/app/src/main/java/com/gh/common/util/DownloadObserver.kt +++ b/app/src/main/java/com/gh/common/util/DownloadObserver.kt @@ -85,7 +85,7 @@ object DownloadObserver { SuggestType.gameQuestion, "notfound", StringUtils.buildString(downloadEntity.name, "，问题反馈：下载链接失效"), SimpleGameEntity(gameId, downloadEntity.name, "")) - }) + }, extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)) return } else if (DownloadStatus.neterror == downloadEntity.status || DownloadStatus.timeout == downloadEntity.status) { if (downloadEntity.meta[Constants.MARK_RETRY_DOWNLOAD].isNullOrEmpty() 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 cf2e7db73a..35b3466546 100644 --- a/app/src/main/java/com/gh/common/util/ErrorHelper.kt +++ b/app/src/main/java/com/gh/common/util/ErrorHelper.kt @@ -141,7 +141,8 @@ object ErrorHelper { context, "提醒", "提问过于频繁，请先休息一下哦", - "知道了", "" + "知道了", "", + extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true) ) } else { Utils.toast(context, R.string.comment_failed_toofrequent) diff --git a/app/src/main/java/com/gh/common/util/GhMatisseVideoApplyFilter.kt b/app/src/main/java/com/gh/common/util/GhMatisseVideoApplyFilter.kt index d5a794450f..ff69355283 100644 --- a/app/src/main/java/com/gh/common/util/GhMatisseVideoApplyFilter.kt +++ b/app/src/main/java/com/gh/common/util/GhMatisseVideoApplyFilter.kt @@ -14,7 +14,7 @@ class GhMatisseVideoApplyFilter : ApplyFilter() { DialogHelper.showDialog(context, "提示", "您当前正在使用移动网络上传视频，确定继续上传吗？", "继续上传", "暂时不了", - { callBack.onApply() }) + { callBack.onApply() }, extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)) } else { callBack.onApply() } diff --git a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java index 3e342ef065..b4bb1b2dce 100644 --- a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java @@ -1398,7 +1398,7 @@ public class SuggestionActivity extends ToolBarActivity implements OnRequestCall public void onListClick(View view, int position, T data) { if (!mAgreePostPic && !NetworkUtils.isWifiConnected(this)) { mAgreePostPic = true; - DialogHelper.showDialog(this, + DialogHelper.showCenterDialog(this, "警告", "当前使用移动网络，上传图片会消耗手机流量", "我知道了", "", () -> { @@ -1408,7 +1408,7 @@ public class SuggestionActivity extends ToolBarActivity implements OnRequestCall intent.setDataAndType(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, "image/*"); startActivityForResult(intent, MEDIA_STORE_REQUEST); } - }, () -> { }, false, "", ""); + }, () -> { }); return; } List picList = (List) data; diff --git a/app/src/main/java/com/gh/gamecenter/collection/AnswerAdapter.java b/app/src/main/java/com/gh/gamecenter/collection/AnswerAdapter.java index 5d906873dc..68b89dd3a3 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/AnswerAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/collection/AnswerAdapter.java @@ -125,7 +125,7 @@ public class AnswerAdapter extends ListAdapter implements ISyncAda } private void showDeleteDialog(String answerId) { - DialogHelper.showDialog(mContext, "提示" + DialogHelper.showCenterDialog(mContext, "提示" , "内容已被删除，是否取消收藏？" , "取消收藏", "暂不" , () -> CollectionUtils.INSTANCE.deleteCollection(mContext, answerId @@ -141,7 +141,7 @@ public class AnswerAdapter extends ListAdapter implements ISyncAda Utils.toast(mContext, R.string.collection_cancel_failure); } }), () -> { - }, false, "", ""); + }); } diff --git a/app/src/main/java/com/gh/gamecenter/collection/ArticleFragment.java b/app/src/main/java/com/gh/gamecenter/collection/ArticleFragment.java index 3d573c9e4f..f3cfacf992 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/ArticleFragment.java +++ b/app/src/main/java/com/gh/gamecenter/collection/ArticleFragment.java @@ -83,7 +83,7 @@ public class ArticleFragment extends ListFragment } private void showDeleteDialog(String articleId) { - DialogHelper.showDialog(requireContext(), "提示" + DialogHelper.showCenterDialog(requireContext(), "提示" , "内容已被删除，是否取消收藏？" , "取消收藏", "暂不" , () -> CollectionUtils.INSTANCE.deleteCollection(requireContext(), articleId @@ -99,6 +99,6 @@ public class ArticleFragment extends ListFragment toast(R.string.collection_cancel_failure); } }), () -> { - }, false, "", ""); + }); } } diff --git a/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleAdapter.kt b/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleAdapter.kt index 74c46a9eb8..56edc7c728 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleAdapter.kt @@ -83,7 +83,7 @@ class CommunityArticleAdapter(context: Context, } else { DialogHelper.showDialog(mContext, "提示", "内容已被删除，是否取消收藏？", "取消收藏", "暂不", { mViewModel.deleteCollection(entity.community.id, entity.id) - }) + }, extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)) } } diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java index edc9fb19a0..98e66b7d20 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java @@ -289,7 +289,7 @@ class Libao3FragmentAdapter extends BaseRecyclerAdapter } private void showDeleteDialog(LibaoEntity libaoEntity) { - DialogHelper.showWarningDialog(mContext, "删除礼包", Html.fromHtml(mContext.getString(R.string.libao_delete_dialog)) + DialogHelper.showCenterWarningDialog(mContext, "删除礼包", Html.fromHtml(mContext.getString(R.string.libao_delete_dialog)) , "取消", "确定删除" , () -> { LibaoUtils.deleteLibaoCode(mContext, libaoEntity.getCode(), new LibaoUtils.PostLibaoListener() { diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentAdapter.kt index aab3b771df..d9bba2eae6 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentAdapter.kt @@ -776,9 +776,9 @@ abstract class BaseCommentAdapter( binding.root.context, "提示", "是否将此条评论置顶？", - "取消", "确认", - cancelClickCallback = { + "取消", + confirmClickCallback = { commentTop( binding.root.context, viewModel, @@ -892,8 +892,8 @@ abstract class BaseCommentAdapter( binding.root.context, "提示", "是否将此条评论置顶？", - "取消", "确认", + "取消", confirmClickCallback = { commentTop( binding.root.context, diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/LocalMediaFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/LocalMediaFragment.kt index 45cdce6ef4..71724e6efd 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/LocalMediaFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/LocalMediaFragment.kt @@ -14,7 +14,6 @@ import com.gh.common.view.GridSpacingItemDecoration import com.gh.gamecenter.R import com.gh.gamecenter.databinding.FragmentLocalMediaBinding import com.gh.gamecenter.entity.LocalVideoEntity -import com.lightgame.utils.Utils import com.zhihu.matisse.internal.entity.Album import com.zhihu.matisse.internal.model.AlbumMediaCollection import com.zhihu.matisse.internal.utils.PathUtils @@ -69,40 +68,27 @@ class LocalMediaFragment : BaseFragment(), AlbumMediaCollection.AlbumMediaC } mBinding.confirmTv.setOnClickListener { NewLogUtils.logChooseMedia("click_confirm", publishContentType, publishMediaType) - if (!NetworkUtils.isNetworkConnected(context)) { - Utils.toast(context, "网络异常，请检查手机网络状态") - } else if (!NetworkUtils.isWifiConnected(context)) { - DialogHelper.showDialog(requireContext(), "提示", - "您当前正在使用移动网络上传视频，确定继续上传吗？", - "继续上传", "暂时不了", - { uploadVideo() }) - } else { - uploadVideo() - } - } - } - - private fun uploadVideo() { - val intent = Intent() - if (mChooseType == LocalMediaActivity.ChooseType.VIDEO.value) { - val localVideoList = arrayListOf() - mAdapter.getSelectedMediaList().forEach { - val path = PathUtils.getPath(requireContext(), it.contentUri) - if (path == null) { - toast("视频已不存在，请重新选择") - return + val intent = Intent() + if (mChooseType == LocalMediaActivity.ChooseType.VIDEO.value) { + val localVideoList = arrayListOf() + mAdapter.getSelectedMediaList().forEach { + val path = PathUtils.getPath(requireContext(), it.contentUri) + if (path == null) { + toast("视频已不存在，请重新选择") + return@forEach + } + val id = MD5Utils.getUrlMD5(path) + System.currentTimeMillis() + val format = getFileFormat(it.mimeType) + localVideoList.add(LocalVideoEntity(id, path, contentUri = it.contentUri, duration = it.duration, format = format, size = it.size)) } - val id = MD5Utils.getUrlMD5(path) + System.currentTimeMillis() - val format = getFileFormat(it.mimeType) - localVideoList.add(LocalVideoEntity(id, path, contentUri = it.contentUri, duration = it.duration, format = format, size = it.size)) + intent.putExtra(LocalVideoEntity::class.java.name, localVideoList) + } else { + val data = mAdapter.getSelectedMediaList().map { it.contentUri }.toList() + intent.putParcelableArrayListExtra(MatisseActivity.EXTRA_RESULT_SELECTION, ArrayList(data)) } - intent.putExtra(LocalVideoEntity::class.java.name, localVideoList) - } else { - val data = mAdapter.getSelectedMediaList().map { it.contentUri }.toList() - intent.putParcelableArrayListExtra(MatisseActivity.EXTRA_RESULT_SELECTION, ArrayList(data)) + requireActivity().setResult(Activity.RESULT_OK, intent) + requireActivity().finish() } - requireActivity().setResult(Activity.RESULT_OK, intent) - requireActivity().finish() } private fun getFileFormat(mimeType: String?): String { diff --git a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementAdapter.kt b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementAdapter.kt index 0386b742ec..f4009e453f 100644 --- a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementAdapter.kt @@ -138,7 +138,8 @@ class SimulatorManagementAdapter(context: Context, confirmClickCallback = { unInstallSimulator() }, uiModificationCallback = { binding -> binding.contentTv.setTextColor(R.color.text_333333.toColor()) - }) + }, + extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)) } } }