From bd2871788f3726b7f8ae6ebce4c33a3f4561ee37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B6=E5=AD=90=E7=BB=B4?= Date: Mon, 6 Mar 2023 17:16:58 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D5.0=E4=BB=A5?= =?UTF-8?q?=E4=B8=8B=E7=B3=BB=E7=BB=9F=E7=9F=A2=E9=87=8F=E5=9B=BE=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E9=97=AA=E9=80=80=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/gamecenter/MainActivity.java | 4 +- .../search/AmwaySearchDefaultFragment.kt | 13 ++++--- .../ForumOrUserSearchDefaultFragment.kt | 13 ++++--- .../gh/gamecenter/game/rank/RankGameItemUi.kt | 8 +--- .../gh/gamecenter/game/vertical/GameItemUi.kt | 8 +--- .../personal/HaloPersonalFragment.kt | 37 ++++++++++++++++--- .../search/SearchDefaultFragment.kt | 9 ++--- .../common/view/ClearEditTextNormal.java | 4 +- .../login/utils/QuickLoginHelper.kt | 8 ++-- 9 files changed, 61 insertions(+), 43 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index b14280983c..c7644441f7 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -36,10 +36,10 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.appcompat.content.res.AppCompatResources; import androidx.constraintlayout.widget.ConstraintLayout; import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProviders; -import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat; import com.facebook.drawee.view.SimpleDraweeView; import com.gh.common.DefaultUrlHandler; @@ -592,7 +592,7 @@ public class MainActivity extends BaseActivity { SimpleDraweeView adImage = findViewById(R.id.adImage); startAdContainer.setVisibility(View.VISIBLE); jumpDetailBtn.setText(ad.getDesc()); - ExtensionsKt.setDrawableEnd(jumpDetailBtn, VectorDrawableCompat.create(getResources(), R.drawable.ic_startup_ad_arrow, null), null, null); + ExtensionsKt.setDrawableEnd(jumpDetailBtn, AppCompatResources.getDrawable(this, R.drawable.ic_startup_ad_arrow), null, null); ImageUtils.display(adImage, ad.getImg()); startAdContainer.setOnClickListener(v -> { // do nothing 只是为了点击拦截事件，避免传递到下面的页面 diff --git a/app/src/main/java/com/gh/gamecenter/amway/search/AmwaySearchDefaultFragment.kt b/app/src/main/java/com/gh/gamecenter/amway/search/AmwaySearchDefaultFragment.kt index 3b9a29bcc7..9a43acb6c5 100644 --- a/app/src/main/java/com/gh/gamecenter/amway/search/AmwaySearchDefaultFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/amway/search/AmwaySearchDefaultFragment.kt @@ -2,8 +2,8 @@ package com.gh.gamecenter.amway.search import android.os.Bundle import android.view.View +import androidx.appcompat.content.res.AppCompatResources import androidx.recyclerview.widget.LinearLayoutManager -import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat import com.gh.gamecenter.R import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.databinding.FragmentAmwaySearchDefaultBinding @@ -65,11 +65,12 @@ class AmwaySearchDefaultFragment : SearchDefaultFragment() { headTitle.textSize = 16F headActionTv.text = "清空" headActionTv.setTextColor(R.color.text_subtitleDesc.toColor(requireContext())) - headActionTv.setDrawableStart(VectorDrawableCompat.create( - resources, - R.drawable.search_history_delete, - null - )) + headActionTv.setDrawableStart( + AppCompatResources.getDrawable( + requireContext(), + R.drawable.search_history_delete + ) + ) headActionTv.setOnClickListener { DialogHelper.showCenterWarningDialog(requireContext(), "清空记录", "确定清空历史搜索记录？", confirmClickCallback = { mSearchDao.deleteAll() diff --git a/app/src/main/java/com/gh/gamecenter/forum/search/ForumOrUserSearchDefaultFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/search/ForumOrUserSearchDefaultFragment.kt index cfe313d4c8..e05eb7838b 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/search/ForumOrUserSearchDefaultFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/search/ForumOrUserSearchDefaultFragment.kt @@ -2,8 +2,8 @@ package com.gh.gamecenter.forum.search import android.os.Bundle import android.view.View +import androidx.appcompat.content.res.AppCompatResources import androidx.constraintlayout.widget.ConstraintLayout -import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat import com.gh.gamecenter.R import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.databinding.FragmentSearchDefaultBinding @@ -75,11 +75,12 @@ class ForumOrUserSearchDefaultFragment : SearchDefaultFragment() { headTitle.textSize = 16F headActionTv.text = "清空" headActionTv.setTextColor(R.color.text_subtitleDesc.toColor(requireContext())) - headActionTv.setDrawableStart(VectorDrawableCompat.create( - resources, - R.drawable.search_history_delete, - null - )) + headActionTv.setDrawableStart( + AppCompatResources.getDrawable( + requireContext(), + R.drawable.search_history_delete + ) + ) headActionTv.setOnClickListener { DialogHelper.showCenterWarningDialog(requireContext(), "清空记录", "确定清空历史搜索记录？", confirmClickCallback = { mSearchDao.deleteAll() diff --git a/app/src/main/java/com/gh/gamecenter/game/rank/RankGameItemUi.kt b/app/src/main/java/com/gh/gamecenter/game/rank/RankGameItemUi.kt index bf045559b7..056bf74e8c 100644 --- a/app/src/main/java/com/gh/gamecenter/game/rank/RankGameItemUi.kt +++ b/app/src/main/java/com/gh/gamecenter/game/rank/RankGameItemUi.kt @@ -8,11 +8,11 @@ import android.view.Gravity import android.view.View import android.widget.LinearLayout import android.widget.TextView +import androidx.appcompat.content.res.AppCompatResources import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.content.ContextCompat import com.gh.gamecenter.feature.view.DownloadButton import com.gh.gamecenter.feature.view.GameIconView -import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat import com.airbnb.lottie.LottieAnimationView import com.airbnb.lottie.LottieDrawable import com.gh.gamecenter.R @@ -147,11 +147,7 @@ class RankGameItemUi(override val ctx: Context) : Ui { gravity = Gravity.CENTER text = "展开" setTextColor(ContextCompat.getColor(context, R.color.white)) - setDrawableEnd( - VectorDrawableCompat.create( - resources, R.drawable.ic_jump_universal, null - ) - ) + setDrawableEnd(AppCompatResources.getDrawable(context, R.drawable.ic_jump_universal)) compoundDrawablePadding = dip(2) visibility = View.GONE } diff --git a/app/src/main/java/com/gh/gamecenter/game/vertical/GameItemUi.kt b/app/src/main/java/com/gh/gamecenter/game/vertical/GameItemUi.kt index fd8c296ad6..b8c6cef250 100644 --- a/app/src/main/java/com/gh/gamecenter/game/vertical/GameItemUi.kt +++ b/app/src/main/java/com/gh/gamecenter/game/vertical/GameItemUi.kt @@ -10,9 +10,9 @@ import android.view.View import android.widget.LinearLayout import android.widget.Space import android.widget.TextView +import androidx.appcompat.content.res.AppCompatResources import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.content.ContextCompat -import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat import com.airbnb.lottie.LottieAnimationView import com.airbnb.lottie.LottieDrawable import com.facebook.drawee.view.SimpleDraweeView @@ -299,11 +299,7 @@ class GameItemUi(override val ctx: Context) : Ui { gravity = Gravity.CENTER text = "展开" setTextColor(ContextCompat.getColor(context, R.color.white)) - setDrawableEnd( - VectorDrawableCompat.create( - resources, R.drawable.ic_jump_universal, null - ) - ) + setDrawableEnd(AppCompatResources.getDrawable(context, R.drawable.ic_jump_universal)) compoundDrawablePadding = dip(2) visibility = View.GONE } diff --git a/app/src/main/java/com/gh/gamecenter/personal/HaloPersonalFragment.kt b/app/src/main/java/com/gh/gamecenter/personal/HaloPersonalFragment.kt index 8f024798b3..322c34ff06 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/HaloPersonalFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personal/HaloPersonalFragment.kt @@ -7,6 +7,7 @@ import android.os.* import android.text.TextUtils import android.view.MotionEvent import android.view.View +import androidx.appcompat.content.res.AppCompatResources import androidx.constraintlayout.widget.ConstraintSet import androidx.core.content.ContextCompat import androidx.lifecycle.ViewModelProvider @@ -14,7 +15,6 @@ import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.PagerSnapHelper import androidx.recyclerview.widget.RecyclerView -import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat import androidx.viewpager2.widget.ViewPager2 import com.gh.common.constant.Config import com.gh.common.databind.BindingAdapters @@ -871,11 +871,36 @@ class HaloPersonalFragment : BaseLazyFragment() { myCollectionTv.setTextColor(R.color.text_title.toColor(requireContext())) historyTv.setTextColor(R.color.text_title.toColor(requireContext())) myPostTv.setTextColor(R.color.text_title.toColor(requireContext())) - myGameTv.setDrawableTop(VectorDrawableCompat.create(resources, R.drawable.ic_personal_my_game, null)) - myGameCollectionTv.setDrawableTop(VectorDrawableCompat.create(resources, R.drawable.ic_personal_my_game_collection, null)) - myCollectionTv.setDrawableTop(VectorDrawableCompat.create(resources, R.drawable.ic_personal_my_collection, null)) - historyTv.setDrawableTop(VectorDrawableCompat.create(resources, R.drawable.ic_personal_history, null)) - myPostTv.setDrawableTop(VectorDrawableCompat.create(resources, R.drawable.ic_personal_my_post, null)) + myGameTv.setDrawableTop( + AppCompatResources.getDrawable( + requireContext(), + R.drawable.ic_personal_my_game + ) + ) + myGameCollectionTv.setDrawableTop( + AppCompatResources.getDrawable( + requireContext(), + R.drawable.ic_personal_my_game_collection + ) + ) + myCollectionTv.setDrawableTop( + AppCompatResources.getDrawable( + requireContext(), + R.drawable.ic_personal_my_collection + ) + ) + historyTv.setDrawableTop( + AppCompatResources.getDrawable( + requireContext(), + R.drawable.ic_personal_history + ) + ) + myPostTv.setDrawableTop( + AppCompatResources.getDrawable( + requireContext(), + R.drawable.ic_personal_my_post + ) + ) } } } diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchDefaultFragment.kt b/app/src/main/java/com/gh/gamecenter/search/SearchDefaultFragment.kt index 48ab87d6da..bc62a8bbca 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchDefaultFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/search/SearchDefaultFragment.kt @@ -12,8 +12,8 @@ import android.view.View import android.view.ViewGroup import android.widget.CheckedTextView import android.widget.TextView +import androidx.appcompat.content.res.AppCompatResources import androidx.constraintlayout.widget.ConstraintLayout -import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat import com.gh.common.constant.Config import com.gh.common.exposure.ExposureManager import com.gh.common.filter.RegionSettingHelper @@ -144,10 +144,9 @@ open class SearchDefaultFragment : BaseFragment() { headActionTv.text = "清空" headActionTv.setTextColor(R.color.text_subtitleDesc.toColor(requireContext())) headActionTv.setDrawableStart( - VectorDrawableCompat.create( - resources, - R.drawable.search_history_delete, - null + AppCompatResources.getDrawable( + requireContext(), + R.drawable.search_history_delete ) ) headActionTv.setOnClickListener { diff --git a/module_common/src/main/java/com/gh/gamecenter/common/view/ClearEditTextNormal.java b/module_common/src/main/java/com/gh/gamecenter/common/view/ClearEditTextNormal.java index 50e3df5ca3..1ac4bfb58b 100644 --- a/module_common/src/main/java/com/gh/gamecenter/common/view/ClearEditTextNormal.java +++ b/module_common/src/main/java/com/gh/gamecenter/common/view/ClearEditTextNormal.java @@ -12,7 +12,7 @@ import android.view.animation.Animation; import android.view.animation.CycleInterpolator; import android.view.animation.TranslateAnimation; -import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat; +import androidx.appcompat.content.res.AppCompatResources; import com.gh.gamecenter.common.R; import com.gh.gamecenter.core.utils.DisplayUtils; @@ -49,7 +49,7 @@ public class ClearEditTextNormal extends androidx.appcompat.widget.AppCompatEdit mClearDrawable = getCompoundDrawables()[2]; if (mClearDrawable == null) { // throw new NullPointerException("You can add drawableRight attribute in XML"); - mClearDrawable = VectorDrawableCompat.create(getResources(), R.drawable.icon_input_close, null); + mClearDrawable = AppCompatResources.getDrawable(getContext(), R.drawable.icon_input_close); } // mClearDrawable.setBounds(0, 0, mClearDrawable.getIntrinsicWidth(), mClearDrawable.getIntrinsicHeight()); diff --git a/module_login/src/main/java/com/gh/gamecenter/login/utils/QuickLoginHelper.kt b/module_login/src/main/java/com/gh/gamecenter/login/utils/QuickLoginHelper.kt index f0b40c422c..cdc5804e75 100644 --- a/module_login/src/main/java/com/gh/gamecenter/login/utils/QuickLoginHelper.kt +++ b/module_login/src/main/java/com/gh/gamecenter/login/utils/QuickLoginHelper.kt @@ -14,9 +14,9 @@ import android.view.ViewGroup import android.view.Window import android.widget.CheckBox import android.widget.TextView +import androidx.appcompat.content.res.AppCompatResources import androidx.core.text.getSpans import androidx.core.view.doOnAttach -import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat import com.alibaba.android.arouter.launcher.ARouter import com.cmic.gen.sdk.auth.GenAuthnHelper import com.cmic.gen.sdk.auth.GenTokenListener @@ -362,13 +362,13 @@ object QuickLoginHelper { setOnCheckedChangeListener { buttonView, isChecked -> if (isChecked) { buttonView.background = - VectorDrawableCompat.create(context.resources, R.drawable.ic_selector_selected, null) + AppCompatResources.getDrawable(context, R.drawable.ic_selector_selected) } else { buttonView.background = - VectorDrawableCompat.create(context.resources, R.drawable.ic_selector_default, null) + AppCompatResources.getDrawable(context, R.drawable.ic_selector_default) } } - background = VectorDrawableCompat.create(context.resources, R.drawable.ic_selector_default, null) + background = AppCompatResources.getDrawable(context, R.drawable.ic_selector_default) } val privacyTv = getChildAt(1) as? TextView From 98e263f99aa7f54dc3ca1ee8b3ca17535b06bb45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B6=E5=AD=90=E7=BB=B4?= Date: Wed, 1 Feb 2023 16:46:22 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9?= =?UTF-8?q?=E6=89=8B=E3=80=91=E5=A4=9A=E7=89=88=E6=9C=AC=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E9=9D=A2=E6=9D=BF-=E7=89=88=E6=9C=AC=E8=AF=B4=E6=98=8E?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=20https://jira.shanqu.cc/b?= =?UTF-8?q?rowse/GHZS-1064?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/common/util/DialogUtils.java | 6 ++-- app/src/main/res/layout/imprint_dialog.xml | 4 +-- .../common/view/MaxHeightLinearLayout.kt | 31 +++++++++++++++++++ 3 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 module_common/src/main/java/com/gh/gamecenter/common/view/MaxHeightLinearLayout.kt 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 91ecf1fdfb..35315ae185 100644 --- a/app/src/main/java/com/gh/common/util/DialogUtils.java +++ b/app/src/main/java/com/gh/common/util/DialogUtils.java @@ -59,7 +59,7 @@ import com.gh.gamecenter.common.utils.NetworkUtils; import com.gh.gamecenter.common.view.CustomLinkMovementMethod; import com.gh.gamecenter.common.view.DrawableView; import com.gh.gamecenter.common.view.FixLinearLayoutManager; -import com.gh.gamecenter.common.view.LimitHeightLinearLayout; +import com.gh.gamecenter.common.view.MaxHeightLinearLayout; import com.gh.gamecenter.common.view.MaxHeightNestedScrollView; import com.gh.gamecenter.common.view.VerticalItemDecoration; import com.gh.gamecenter.core.AppExecutor; @@ -809,8 +809,8 @@ public class DialogUtils { ((TextView) inflate.findViewById(R.id.imprint_title)).setText(titleName); View head = LayoutInflater.from(context).inflate(R.layout.imprint_content_item, null); content.addView(head, LinearLayout.LayoutParams.MATCH_PARENT, DisplayUtils.dip2px(30)); - LimitHeightLinearLayout imprintContainer = inflate.findViewById(R.id.imprint_container); - imprintContainer.setLimitHeight((int) (context.getResources().getDisplayMetrics().heightPixels * 0.8)); + MaxHeightLinearLayout imprintContainer = inflate.findViewById(R.id.imprint_container); + imprintContainer.setMaxHeight((int) (context.getResources().getDisplayMetrics().heightPixels * 0.8)); ArrayList list = gameEntity.getApk(); SettingsEntity settings = Config.getSettings(); diff --git a/app/src/main/res/layout/imprint_dialog.xml b/app/src/main/res/layout/imprint_dialog.xml index d2ba950f2e..33f89575c5 100644 --- a/app/src/main/res/layout/imprint_dialog.xml +++ b/app/src/main/res/layout/imprint_dialog.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/module_common/src/main/java/com/gh/gamecenter/common/view/MaxHeightLinearLayout.kt b/module_common/src/main/java/com/gh/gamecenter/common/view/MaxHeightLinearLayout.kt new file mode 100644 index 0000000000..b422c056a4 --- /dev/null +++ b/module_common/src/main/java/com/gh/gamecenter/common/view/MaxHeightLinearLayout.kt @@ -0,0 +1,31 @@ +package com.gh.gamecenter.common.view + +import android.content.Context +import android.util.AttributeSet +import android.widget.LinearLayout + +class MaxHeightLinearLayout @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : LinearLayout(context, attrs, defStyleAttr) { + private var mMaxHeight = 0 + + override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { + val heightMode = MeasureSpec.getMode(heightMeasureSpec) + var heightSize = MeasureSpec.getSize(heightMeasureSpec) + if (mMaxHeight != 0 && (heightMode == MeasureSpec.EXACTLY || heightMode == MeasureSpec.AT_MOST || heightMode == MeasureSpec.UNSPECIFIED)) { + heightSize = heightSize.coerceAtMost(mMaxHeight) + } + val maxHeightMeasureSpec = MeasureSpec.makeMeasureSpec( + heightSize, + heightMode + ) + super.onMeasure(widthMeasureSpec, maxHeightMeasureSpec) + } + + fun setMaxHeight(maxHeight: Int) { + mMaxHeight = maxHeight + requestLayout() + } +} From 81b5b6b369f1240439257bf44f9ea71155a58b92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B6=E5=AD=90=E7=BB=B4?= Date: Wed, 1 Feb 2023 11:14:46 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9?= =?UTF-8?q?=E6=89=8B=E3=80=91=E8=B5=84=E8=AE=AF=E6=96=87=E7=AB=A0-?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20https://jira.shanqu.cc/browse/GHZS-1066?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/gamecenter/NewsDetailActivity.java | 18 +++++++- .../main/res/layout/activity_news_detail.xml | 41 +++++++++++++++++-- 2 files changed, 55 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java index dc420195d4..c33c30f0d7 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java @@ -62,6 +62,7 @@ import com.gh.gamecenter.newsdetail.NewsDetailAdapter; import com.gh.gamecenter.retrofit.RetrofitManager; import com.lightgame.download.DataWatcher; import com.lightgame.download.DownloadEntity; +import com.lightgame.download.DownloadStatus; import com.lightgame.utils.Utils; import org.greenrobot.eventbus.Subscribe; @@ -139,6 +140,21 @@ public class NewsDetailActivity extends DownloadToolbarActivity implements OnCli DetailDownloadUtils.detailInvalidate(getDetailViewHolder()); } } + } else if (gameEntity != null && gameEntity.getApk().size() > 1) { + if (DownloadStatus.downloading.equals(downloadEntity.getStatus())) { + if (getDetailViewHolder().mDownloadTips.getVisibility() == View.GONE || !getDetailViewHolder().mDownloadTips.isAnimating()) { + getDetailViewHolder().mDownloadTips.setVisibility(View.VISIBLE); + ExtensionsKt.setDownloadTipsAnimation(getDetailViewHolder().mDownloadTips, true); + } + } else if (DownloadStatus.waiting.equals(downloadEntity.getStatus()) || DownloadStatus.done.equals(downloadEntity.getStatus()) || + DownloadStatus.pause.equals(downloadEntity.getStatus()) || DownloadStatus.timeout.equals(downloadEntity.getStatus()) || + DownloadStatus.subscribe.equals(downloadEntity.getStatus()) || DownloadStatus.overflow.equals(downloadEntity.getStatus()) || + DownloadStatus.neterror.equals(downloadEntity.getStatus())) { + getDetailViewHolder().mDownloadTips.setVisibility(View.VISIBLE); + ExtensionsKt.setDownloadTipsAnimation(getDetailViewHolder().mDownloadTips, false); + } else { + getDetailViewHolder().mDownloadTips.setVisibility(View.GONE); + } } } @@ -405,6 +421,7 @@ public class NewsDetailActivity extends DownloadToolbarActivity implements OnCli protected void onDestroy() { super.onDestroy(); handler.removeCallbacksAndMessages(null); + DownloadManager.getInstance().removeObserver(dataWatcher); } @Override @@ -421,7 +438,6 @@ public class NewsDetailActivity extends DownloadToolbarActivity implements OnCli isSentReport = true; } - DownloadManager.getInstance().removeObserver(dataWatcher); } @Override diff --git a/app/src/main/res/layout/activity_news_detail.xml b/app/src/main/res/layout/activity_news_detail.xml index 1641cdde80..bf368e4bae 100644 --- a/app/src/main/res/layout/activity_news_detail.xml +++ b/app/src/main/res/layout/activity_news_detail.xml @@ -3,6 +3,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" android:orientation="vertical"> @@ -75,7 +76,7 @@ - + app:download_button_text_size="@dimen/primary_text_size" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - + + + + + From 1f211356fd217a6e59acce0fc72aaaa482d96af4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B6=E5=AD=90=E7=BB=B4?= Date: Mon, 6 Feb 2023 14:42:54 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9?= =?UTF-8?q?=E6=89=8B=E3=80=91=E8=B5=84=E8=AE=AF=E6=96=87=E7=AB=A0-?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98(0206=E6=B5=8B=E8=AF=951)=20https://jira.shanqu.cc/bro?= =?UTF-8?q?wse/GHZS-1066?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/activity_news_detail.xml | 5 +++++ app/src/main/res/layout/detail_download_item.xml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/app/src/main/res/layout/activity_news_detail.xml b/app/src/main/res/layout/activity_news_detail.xml index bf368e4bae..cb73414e5c 100644 --- a/app/src/main/res/layout/activity_news_detail.xml +++ b/app/src/main/res/layout/activity_news_detail.xml @@ -103,11 +103,16 @@ android:layout_width="wrap_content" android:layout_height="40dp" android:drawablePadding="4dp" + android:ellipsize="end" android:gravity="center" + android:paddingStart="8dp" + android:paddingEnd="8dp" + android:singleLine="true" android:textColor="@color/white" android:textSize="@dimen/primary_text_size" android:visibility="gone" app:drawableEndCompat="@drawable/ic_jump_universal" + app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@id/detail_progressbar" app:layout_constraintEnd_toEndOf="@id/detail_progressbar" app:layout_constraintStart_toStartOf="@id/detail_progressbar" diff --git a/app/src/main/res/layout/detail_download_item.xml b/app/src/main/res/layout/detail_download_item.xml index cc20b20436..657de16bae 100644 --- a/app/src/main/res/layout/detail_download_item.xml +++ b/app/src/main/res/layout/detail_download_item.xml @@ -314,11 +314,16 @@ android:layout_width="wrap_content" android:layout_height="40dp" android:drawablePadding="4dp" + android:ellipsize="end" android:gravity="center" + android:paddingStart="8dp" + android:paddingEnd="8dp" + android:singleLine="true" android:textColor="@color/white" android:textSize="@dimen/primary_text_size" android:visibility="gone" app:drawableEndCompat="@drawable/ic_jump_universal" + app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@id/detail_progressbar" app:layout_constraintEnd_toEndOf="@id/detail_progressbar" app:layout_constraintStart_toStartOf="@id/detail_progressbar" From 32210875da001fafbe0f6056de5728a338f57e39 Mon Sep 17 00:00:00 2001 From: juntao Date: Tue, 7 Mar 2023 17:36:38 +0800 Subject: [PATCH 5/5] =?UTF-8?q?chore:=20=E7=89=88=E6=9C=AC=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E8=87=B3=205.19.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dependencies.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index f87117b131..0de30302cc 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -7,8 +7,8 @@ ext { targetSdkVersion = 28 // application info (每个大版本之间的 versionCode 增加 20) - versionCode = 734 - versionName = "5.19.4" + versionCode = 735 + versionName = "5.19.5" applicationId = "com.gh.gamecenter" // AndroidX