From dab2d40ba45e0e27a60e3fedf53c44e4baa01c1f Mon Sep 17 00:00:00 2001 From: juntao Date: Fri, 7 Jan 2022 11:58:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=83=A8=E5=88=86=20SonarQub?= =?UTF-8?q?e=20=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/simulator/SimulatorDownloadManager.kt | 4 ++-- .../java/com/gh/common/util/CommentUtils.java | 4 ++-- .../com/gh/common/util/PostCommentUtils.java | 6 +++--- .../gh/gamecenter/gamedetail/desc/DescAdapter.kt | 16 ---------------- .../manager/DataCollectionManager.java | 10 +++++----- .../java/com/gh/gamecenter/room/AppDatabase.java | 9 +++------ .../servers/GameServersContentAdapter.kt | 2 ++ 7 files changed, 17 insertions(+), 34 deletions(-) diff --git a/app/src/main/java/com/gh/common/simulator/SimulatorDownloadManager.kt b/app/src/main/java/com/gh/common/simulator/SimulatorDownloadManager.kt index 1690b92d00..aad6f8f14f 100644 --- a/app/src/main/java/com/gh/common/simulator/SimulatorDownloadManager.kt +++ b/app/src/main/java/com/gh/common/simulator/SimulatorDownloadManager.kt @@ -198,7 +198,7 @@ class SimulatorDownloadManager private constructor() { params?.width = context.resources.displayMetrics.widthPixels - DisplayUtils.dip2px(60f) downloadDialog?.window?.attributes = params - download(context, simulator) + download(simulator) } private fun showNoneEmulatorDialog(context: Context) { @@ -217,7 +217,7 @@ class SimulatorDownloadManager private constructor() { extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)) } - private fun download(context: Context, simulator: SimulatorEntity?) { + private fun download(simulator: SimulatorEntity?) { val apkEntity = simulator?.apk ?: return val entity = DownloadManager.getInstance().getDownloadEntityByUrl(apkEntity.url) diff --git a/app/src/main/java/com/gh/common/util/CommentUtils.java b/app/src/main/java/com/gh/common/util/CommentUtils.java index eff8bca2b2..aad2c6c007 100644 --- a/app/src/main/java/com/gh/common/util/CommentUtils.java +++ b/app/src/main/java/com/gh/common/util/CommentUtils.java @@ -190,7 +190,7 @@ public class CommentUtils { e.printStackTrace(); } - PostCommentUtils.addReportData(context, commentEntity.getId(), jsonObject.toString(), + PostCommentUtils.addReportData(commentEntity.getId(), jsonObject.toString(), new PostCommentUtils.PostCommentListener() { @Override public void postSuccess(JSONObject response) { @@ -225,7 +225,7 @@ public class CommentUtils { commentLikeCountTv.setText(NumberUtils.transSimpleCount(commentEntity.getVote())); commentLikeCountTv.setVisibility(View.VISIBLE); - PostCommentUtils.addCommentVote(context, commentEntity.getId(), + PostCommentUtils.addCommentVote(commentEntity.getId(), new PostCommentUtils.PostCommentListener() { @Override public void postSuccess(JSONObject response) { diff --git a/app/src/main/java/com/gh/common/util/PostCommentUtils.java b/app/src/main/java/com/gh/common/util/PostCommentUtils.java index 8ae6f9a0a3..e7a5f4eb47 100644 --- a/app/src/main/java/com/gh/common/util/PostCommentUtils.java +++ b/app/src/main/java/com/gh/common/util/PostCommentUtils.java @@ -73,7 +73,7 @@ public class PostCommentUtils { }); } - public static void addAnswerComment(final Context context, final String answerId, final String articleId, + public static void addAnswerComment(final String answerId, final String articleId, final String articleCommunityId, final String content, final CommentEntity commentEntity, final PostCommentListener listener) { @@ -151,7 +151,7 @@ public class PostCommentUtils { }); } - public static void addCommentVote(final Context context, final String commentId, + public static void addCommentVote(final String commentId, final PostCommentListener listener) { RetrofitManager.getInstance().getApi() .postCommentVote(commentId) @@ -174,7 +174,7 @@ public class PostCommentUtils { }); } - public static void addReportData(final Context context, final String commentId, final String reportData, + public static void addReportData(final String commentId, final String reportData, final PostCommentListener listener) { RequestBody body = RequestBody.create(MediaType.parse("application/json"), reportData); RetrofitManager.getInstance().getApi() diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt index 2765a4ee76..ca283fbcf4 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt @@ -608,23 +608,7 @@ class DescAdapter(context: Context, val infoAdapter = GameDetailInfoItemAdapter(mContext, info, mViewModel, gameName ?: "") adapter = infoAdapter -// val gridLayoutManager = GridLayoutManager(mContext, 2) -// gridLayoutManager.spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() { -// override fun getSpanSize(position: Int): Int { -// return if (infoAdapter.itemCount % 2 == 0) { -// 1 -// } else { -// if (position == infoAdapter.itemCount - 1) { -// 2 -// } else { -// 1 -// } -// } -// -// } -// } layoutManager = LinearLayoutManager(context) -// addItemDecoration(GridSpacingItemColorDecoration(context, 24, 10, R.color.transparent)) viewHolder.binding.dividerView.goneIf(info.topTags.isEmpty() || infoAdapter.datas.size == 0) } } diff --git a/app/src/main/java/com/gh/gamecenter/manager/DataCollectionManager.java b/app/src/main/java/com/gh/gamecenter/manager/DataCollectionManager.java index e7d7b19b50..e7b9f444c9 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/DataCollectionManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/DataCollectionManager.java @@ -41,7 +41,7 @@ public class DataCollectionManager { if (isUpload) { DataCollectionManager.getInstance().realTimeUpload(type, map); } else { - onEvent(context, type, new JSONObject(map).toString(), false); + onEvent(type, new JSONObject(map).toString(), false); } }); } @@ -75,17 +75,17 @@ public class DataCollectionManager { return SingletonHolder.INSTANCE; } - public static void onEvent(Context context, String type, String data, boolean isUpload) { + public static void onEvent(String type, String data, boolean isUpload) { String id = UUID.randomUUID().toString().replace("-", ""); DataCollectionInfo entity = new DataCollectionInfo(); entity.setId(id); entity.setType(type); entity.setData(data); - onEvent(context, entity, isUpload); + onEvent(entity, isUpload); } // 添加事件 - public static void onEvent(Context context, DataCollectionInfo entity, boolean isUpload) { + public static void onEvent(DataCollectionInfo entity, boolean isUpload) { DataCollectionManager.getInstance().add(entity, isUpload); } @@ -210,7 +210,7 @@ public class DataCollectionManager { DataCollectionManager.getInstance().realTimeUpload(type, map); return; } - onEvent(context, type, new JSONObject(map).toString(), true); + onEvent(type, new JSONObject(map).toString(), true); } private static class SingletonHolder { diff --git a/app/src/main/java/com/gh/gamecenter/room/AppDatabase.java b/app/src/main/java/com/gh/gamecenter/room/AppDatabase.java index 084ff0b536..1809cfd195 100644 --- a/app/src/main/java/com/gh/gamecenter/room/AppDatabase.java +++ b/app/src/main/java/com/gh/gamecenter/room/AppDatabase.java @@ -224,8 +224,9 @@ public abstract class AppDatabase extends RoomDatabase { } }; - private static AppDatabase buildDatabase() { - return Room.databaseBuilder(HaloApp.getInstance().getApplicationContext(), AppDatabase.class, DATABASE_NAME) + private static class SingletonHolder { + private static final AppDatabase INSTANCE = + Room.databaseBuilder(HaloApp.getInstance().getApplicationContext(), AppDatabase.class, DATABASE_NAME) .addMigrations( MIGRATION_2_4, MIGRATION_4_5, @@ -252,8 +253,4 @@ public abstract class AppDatabase extends RoomDatabase { // .fallbackToDestructiveMigration() .build(); } - - private static class SingletonHolder { - private static final AppDatabase INSTANCE = buildDatabase(); - } } diff --git a/app/src/main/java/com/gh/gamecenter/servers/GameServersContentAdapter.kt b/app/src/main/java/com/gh/gamecenter/servers/GameServersContentAdapter.kt index e5bc8d2fa2..25bd3bd0e0 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/GameServersContentAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/GameServersContentAdapter.kt @@ -87,6 +87,7 @@ class GameServersContentAdapter( mPrevIsNetworkError = true } else -> { + // do nothing } } notifyItemChanged(0) @@ -113,6 +114,7 @@ class GameServersContentAdapter( mNextIsNetworkError = true } else -> { + // do nothing } } notifyItemChanged(itemCount - 1)