From bf016c64043b3901f23b5ff7aa6e71e3bbf10d37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= Date: Wed, 4 Jan 2023 16:14:35 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A4=84=E7=90=86=20sonar=20=E6=96=B0?= =?UTF-8?q?=E5=8F=98=E5=8A=A8=E4=BB=A3=E7=A0=81=E7=9A=84=E5=BC=82=E5=91=B3?= =?UTF-8?q?=20https://jira.shanqu.cc/browse/GHZS-921?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gh/common/provider/AdHelperProviderImpl.kt | 2 +- .../provider/BindingAdaptersProviderImpl.kt | 2 +- .../provider/FixedRateJobHelperProviderImpl.kt | 2 +- .../common/provider/GameDetailProviderImpl.kt | 2 +- .../provider/PackagesManagerProviderImpl.kt | 2 +- .../RegionSettingHelperProviderImpl.kt | 2 +- .../gh/common/provider/VHelperProviderImpl.kt | 2 +- .../java/com/gh/common/util/CommentHelper.kt | 1 - .../com/gh/download/dialog/DownloadDialog.kt | 8 +++----- .../java/com/gh/gamecenter/MainActivity.java | 18 +++++++++--------- .../gamedetail/GameDetailFragment.kt | 7 ++++--- .../rating/RatingCommentItemViewHolder.kt | 1 - .../gamedetail/rating/RatingReplyAdapter.kt | 1 - .../video/detail/ForumVideoDetailFragment.kt | 1 - .../retrofit/service/ApiService.java | 2 +- .../gh/gamecenter/video/detail/VideoAdapter.kt | 9 ++++----- 16 files changed, 28 insertions(+), 34 deletions(-) diff --git a/app/src/main/java/com/gh/common/provider/AdHelperProviderImpl.kt b/app/src/main/java/com/gh/common/provider/AdHelperProviderImpl.kt index e933ff657a..52107684b9 100644 --- a/app/src/main/java/com/gh/common/provider/AdHelperProviderImpl.kt +++ b/app/src/main/java/com/gh/common/provider/AdHelperProviderImpl.kt @@ -14,6 +14,6 @@ class AdHelperProviderImpl : IAdHelperProvider { } override fun init(context: Context?) { - + // Do nothing } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/provider/BindingAdaptersProviderImpl.kt b/app/src/main/java/com/gh/common/provider/BindingAdaptersProviderImpl.kt index ffb5bd403c..4a3db5af4b 100644 --- a/app/src/main/java/com/gh/common/provider/BindingAdaptersProviderImpl.kt +++ b/app/src/main/java/com/gh/common/provider/BindingAdaptersProviderImpl.kt @@ -25,6 +25,6 @@ class BindingAdaptersProviderImpl : IBindingAdaptersProvider { } override fun init(context: Context?) { - + // Do nothing } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/provider/FixedRateJobHelperProviderImpl.kt b/app/src/main/java/com/gh/common/provider/FixedRateJobHelperProviderImpl.kt index 9337aaef66..23ce3e3b66 100644 --- a/app/src/main/java/com/gh/common/provider/FixedRateJobHelperProviderImpl.kt +++ b/app/src/main/java/com/gh/common/provider/FixedRateJobHelperProviderImpl.kt @@ -13,6 +13,6 @@ class FixedRateJobHelperProviderImpl : IFixedRateJobHelperProvider { } override fun init(context: Context?) { - + // Do nothing } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/provider/GameDetailProviderImpl.kt b/app/src/main/java/com/gh/common/provider/GameDetailProviderImpl.kt index f41c09dc36..314a053a40 100644 --- a/app/src/main/java/com/gh/common/provider/GameDetailProviderImpl.kt +++ b/app/src/main/java/com/gh/common/provider/GameDetailProviderImpl.kt @@ -41,6 +41,6 @@ class GameDetailProviderImpl : IGameDetailProvider { } override fun init(context: Context?) { - + // Do nothing } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/provider/PackagesManagerProviderImpl.kt b/app/src/main/java/com/gh/common/provider/PackagesManagerProviderImpl.kt index 49d8746f77..a3ad83b80e 100644 --- a/app/src/main/java/com/gh/common/provider/PackagesManagerProviderImpl.kt +++ b/app/src/main/java/com/gh/common/provider/PackagesManagerProviderImpl.kt @@ -13,6 +13,6 @@ class PackagesManagerProviderImpl: IPackagesManagerProvider { } override fun init(context: Context?) { - + // Do nothing } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/provider/RegionSettingHelperProviderImpl.kt b/app/src/main/java/com/gh/common/provider/RegionSettingHelperProviderImpl.kt index 829cb5d219..d42d9eac31 100644 --- a/app/src/main/java/com/gh/common/provider/RegionSettingHelperProviderImpl.kt +++ b/app/src/main/java/com/gh/common/provider/RegionSettingHelperProviderImpl.kt @@ -22,6 +22,6 @@ class RegionSettingHelperProviderImpl: IRegionSettingHelperProvider { } override fun init(context: Context?) { - + // Do nothing } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/provider/VHelperProviderImpl.kt b/app/src/main/java/com/gh/common/provider/VHelperProviderImpl.kt index 1a42933f8a..7d21de14bb 100644 --- a/app/src/main/java/com/gh/common/provider/VHelperProviderImpl.kt +++ b/app/src/main/java/com/gh/common/provider/VHelperProviderImpl.kt @@ -21,6 +21,6 @@ class VHelperProviderImpl: IVHelperProvider { } override fun init(context: Context?) { - + // Do nothing } } \ No newline at end of file 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 88aca55568..0f40be1cf2 100644 --- a/app/src/main/java/com/gh/common/util/CommentHelper.kt +++ b/app/src/main/java/com/gh/common/util/CommentHelper.kt @@ -10,7 +10,6 @@ import com.gh.gamecenter.CommentDetailActivity import com.gh.gamecenter.R import com.gh.gamecenter.common.constant.Constants import com.gh.gamecenter.common.json.json -import com.gh.gamecenter.common.utils.DialogHelper import com.gh.gamecenter.common.utils.ifLogin import com.gh.gamecenter.common.utils.showAutoOrientation import com.gh.gamecenter.common.view.BugFixedPopupWindow diff --git a/app/src/main/java/com/gh/download/dialog/DownloadDialog.kt b/app/src/main/java/com/gh/download/dialog/DownloadDialog.kt index 71fb78d6db..6962879eb4 100644 --- a/app/src/main/java/com/gh/download/dialog/DownloadDialog.kt +++ b/app/src/main/java/com/gh/download/dialog/DownloadDialog.kt @@ -178,11 +178,9 @@ class DownloadDialog : BaseDraggableDialogFragment() { for (i in 0 until it.itemCount) { val apkEntity = itemList[i].normal ?: continue val apkCollection = apkEntity.apkCollection - if (apkCollection != null) { - if (apkCollection.name == mPlatformName) { - scrollAndDownload(recyclerView, false, i) - break - } + if (apkCollection != null && apkCollection.name == mPlatformName) { + scrollAndDownload(recyclerView, false, i) + break } if (apkEntity.getPlatformName() == mPlatformName || apkEntity.packageName == mPackageName) { scrollAndDownload(recyclerView, true, i) diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index 68272c78cd..bd08136c0d 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -167,15 +167,15 @@ import tv.danmaku.ijk.media.exo2.ExoSourceManager; public class MainActivity extends BaseActivity { - public final static String EB_SKIP_MAIN = "MainActivity"; - public final static String SWITCH_TO_COMMUNITY = "switch_to_community"; - public final static String SWITCH_TO_VIDEO = "switch_to_video"; - public final static String SHOW_AD = "show_ad"; - private final static int COUNTDOWN_AD = 100; - private final static int countdownMaxCount = 3; + public static final String EB_SKIP_MAIN = "MainActivity"; + public static final String SWITCH_TO_COMMUNITY = "switch_to_community"; + public static final String SWITCH_TO_VIDEO = "switch_to_video"; + public static final String SHOW_AD = "show_ad"; + private static final int COUNTDOWN_AD = 100; + private static final int COUNTDOWN_MAX_COUNT = 3; private int countdownCount = 0; - private final static String CURRENT_PAGE = "current_page"; + private static final String CURRENT_PAGE = "current_page"; private PackageViewModel mPackageViewModel; @@ -547,8 +547,8 @@ public class MainActivity extends BaseActivity { if (msg.what == COUNTDOWN_AD) { countdownCount++; TextView jumpBtn = findViewById(R.id.jumpBtn); - jumpBtn.setText(String.format(Locale.CHINA, "跳过 %d", countdownMaxCount - countdownCount)); - if (countdownMaxCount < countdownCount) { + jumpBtn.setText(String.format(Locale.CHINA, "跳过 %d", COUNTDOWN_MAX_COUNT - countdownCount)); + if (COUNTDOWN_MAX_COUNT < countdownCount) { hideStartUpAd(); } else { mBaseHandler.sendEmptyMessageDelayed(COUNTDOWN_AD, 1000); diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt index 0f7b78722f..3fd41277cb 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt @@ -260,6 +260,7 @@ class GameDetailFragment : ToolbarFragment(), IScrollable { contentCardEntity.link ?: "", contentCardEntity.text ?: "" ) + val path = "游戏详情->内容卡片" when (contentCardEntity.type) { "func_server" -> { if (contentCardEntity.server != null) { @@ -303,7 +304,7 @@ class GameDetailFragment : ToolbarFragment(), IScrollable { "func_bbs" -> { val funcBbs = contentCardEntity.funcBbs funcBbs?.let { - DirectUtils.directForumDetail(requireContext(), it.link, "游戏详情->内容卡片") + DirectUtils.directForumDetail(requireContext(), it.link, path) } } "func_tool_kit" -> { @@ -312,7 +313,7 @@ class GameDetailFragment : ToolbarFragment(), IScrollable { val url = it.url if (url != null && url.contains(Config.URL_ARTICLE)) { val newsId = url.substring(url.lastIndexOf("/") + 1, url.length - 5) // 5: ".html" - val intent = NewsDetailActivity.getIntentById(requireContext(), newsId, "游戏详情->内容卡片") + val intent = NewsDetailActivity.getIntentById(requireContext(), newsId, path) requireContext().startActivity(intent) } else { requireContext().startActivity( @@ -330,7 +331,7 @@ class GameDetailFragment : ToolbarFragment(), IScrollable { requireContext(), contentCardEntity.toLinkEntity(), mEntrance, - "游戏详情->内容卡片", + path, ExposureEvent.createEvent( null, listOf(ExposureSource("游戏详情", mGameEntity?.id ?: ""), ExposureSource("内容卡片", contentCardEntity.id)) diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingCommentItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingCommentItemViewHolder.kt index e47d68cdef..eae74a3814 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingCommentItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingCommentItemViewHolder.kt @@ -34,7 +34,6 @@ import com.gh.gamecenter.common.view.DrawableView import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.RatingCommentItemBinding import com.gh.gamecenter.entity.RatingComment -import com.gh.gamecenter.feature.entity.GameEntity import com.gh.gamecenter.gamedetail.rating.edit.RatingEditActivity import com.gh.gamecenter.gamedetail.rating.edit.RatingEditActivity.Companion.LABEL_REGEX import com.gh.gamecenter.gamedetail.rating.logs.CommentLogsActivity diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyAdapter.kt index 4c802965af..bf0c4ea099 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyAdapter.kt @@ -39,7 +39,6 @@ import com.gh.gamecenter.databinding.PieceArticleDetailCommentFilterBinding import com.gh.gamecenter.databinding.RatingReplyHeadItemBinding import com.gh.gamecenter.entity.RatingComment import com.gh.gamecenter.entity.RatingReplyEntity -import com.gh.gamecenter.feature.entity.PluginLocation import com.gh.gamecenter.feature.exposure.ExposureEvent import com.gh.gamecenter.feature.exposure.ExposureSource import com.gh.gamecenter.gamedetail.rating.edit.RatingEditActivity diff --git a/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailFragment.kt index 2fbdd0541e..662217fc4a 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailFragment.kt @@ -44,7 +44,6 @@ import com.gh.gamecenter.eventbus.EBPackage import com.gh.gamecenter.feature.entity.ForumVideoEntity import com.gh.gamecenter.feature.entity.GameEntity import com.gh.gamecenter.feature.entity.Permissions -import com.gh.gamecenter.feature.entity.PluginLocation import com.gh.gamecenter.forum.home.ForumScrollCalculatorHelper import com.gh.gamecenter.gamedetail.GameDetailFragment import com.gh.gamecenter.login.user.UserManager diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java b/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java index de9e7499fe..3daee922df 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java +++ b/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java @@ -3017,6 +3017,6 @@ public interface ApiService { * 获取专题游戏 用于游戏详情换一批 */ @GET("columns/{column_id}/games?sort=publish%3A-1&filter=type:全部,tags:全部") - Observable> getSubjectGame(@Path("column_id") String column_id, @Query("page") int page); + Observable> getSubjectGame(@Path("column_id") String columnId, @Query("page") int page); } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/video/detail/VideoAdapter.kt b/app/src/main/java/com/gh/gamecenter/video/detail/VideoAdapter.kt index 803ac9ad11..074742d31d 100644 --- a/app/src/main/java/com/gh/gamecenter/video/detail/VideoAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/video/detail/VideoAdapter.kt @@ -8,14 +8,11 @@ import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment import androidx.recyclerview.widget.RecyclerView import androidx.swiperefreshlayout.widget.SwipeRefreshLayout -import com.gh.gamecenter.feature.exposure.ExposureEvent -import com.gh.gamecenter.feature.exposure.ExposureSource import com.airbnb.lottie.LottieAnimationView import com.gh.common.exposure.IExposable import com.gh.common.util.DownloadItemUtils import com.gh.common.util.LogUtils import com.gh.common.videolog.VideoRecordUtils -import com.gh.gamecenter.feature.view.DownloadButton import com.gh.download.cache.ExoCacheManager import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.GameViewHolder @@ -26,10 +23,12 @@ import com.gh.gamecenter.common.utils.goneIf import com.gh.gamecenter.common.utils.safelyGetInRelease import com.gh.gamecenter.core.utils.EmptyCallback import com.gh.gamecenter.core.utils.MtaHelper -import com.gh.gamecenter.feature.entity.GameEntity -import com.gh.gamecenter.feature.entity.PluginLocation import com.gh.gamecenter.entity.VideoEntity import com.gh.gamecenter.eventbus.EBDownloadStatus +import com.gh.gamecenter.feature.entity.GameEntity +import com.gh.gamecenter.feature.exposure.ExposureEvent +import com.gh.gamecenter.feature.exposure.ExposureSource +import com.gh.gamecenter.feature.view.DownloadButton import com.gh.gamecenter.game.GameAndPosition import com.halo.assistant.HaloApp import com.lightgame.download.DownloadEntity