From 984fca183fbcbe069e34facc2299da8b798cce6d Mon Sep 17 00:00:00 2001 From: juntao Date: Thu, 13 Jan 2022 17:21:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=90=88=E5=B9=B6=E5=86=B2?= =?UTF-8?q?=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../util/GameCollectionSquareBrowseTaskHelper.kt | 2 +- .../main/java/com/gh/common/util/LogUtils.java | 2 +- .../forum/home/CommunityHomeFragment.kt | 15 --------------- .../detail/GameCollectionDetailViewModel.kt | 2 +- app/src/main/java/com/halo/assistant/HaloApp.java | 1 - 5 files changed, 3 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/com/gh/common/util/GameCollectionSquareBrowseTaskHelper.kt b/app/src/main/java/com/gh/common/util/GameCollectionSquareBrowseTaskHelper.kt index 30d2557267..7d9e019e82 100644 --- a/app/src/main/java/com/gh/common/util/GameCollectionSquareBrowseTaskHelper.kt +++ b/app/src/main/java/com/gh/common/util/GameCollectionSquareBrowseTaskHelper.kt @@ -213,7 +213,7 @@ object GameCollectionSquareBrowseTaskHelper { @SuppressLint("CheckResult") private fun postBrowseFinish() { - RetrofitManager.getInstance(HaloApp.getInstance()) + RetrofitManager.getInstance() .newApi .postGameCollectionTask("browse_game_list_square", "0") .compose(singleToMain()) diff --git a/app/src/main/java/com/gh/common/util/LogUtils.java b/app/src/main/java/com/gh/common/util/LogUtils.java index e83d123001..20beffc0f0 100644 --- a/app/src/main/java/com/gh/common/util/LogUtils.java +++ b/app/src/main/java/com/gh/common/util/LogUtils.java @@ -599,7 +599,7 @@ public class LogUtils { gameCollectionActivityUrl = Constants.GAME_COLLECTION_ACTIVITY_ADDRESS; } if (url.contains(gameCollectionActivityUrl)) { - RetrofitManager.getInstance(HaloApp.getInstance().getApplication()).getNewApi() + RetrofitManager.getInstance().getNewApi() .postGameCollectionTask("repost_activity", "0") .subscribeOn(Schedulers.io()) .subscribe(new EmptyResponse<>()); diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/CommunityHomeFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/home/CommunityHomeFragment.kt index ab1e2c7aa9..d269bbf4ea 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/CommunityHomeFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/CommunityHomeFragment.kt @@ -17,7 +17,6 @@ import com.gh.base.adapter.FragmentAdapter import com.gh.base.fragment.LazyFragment import com.gh.common.dialog.TrackableDialog import com.gh.common.util.* -import com.gh.common.util.EntranceUtils.KEY_LAST_SELECTED_POSITION import com.gh.gamecenter.R import com.gh.gamecenter.databinding.FragmentCommunityHomeBinding import com.gh.gamecenter.databinding.TabItemCommunityBinding @@ -46,20 +45,6 @@ class CommunityHomeFragment : LazyFragment() { private var mTabList = arrayListOf() private var mDefaultSelectedTab = -1 - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - savedInstanceState?.run { - mDefaultSelectedTab = getInt(KEY_LAST_SELECTED_POSITION) - } - } - - override fun onSaveInstanceState(outState: Bundle) { - mBinding?.viewPager?.run { - outState.putInt(KEY_LAST_SELECTED_POSITION, currentItem) - } - super.onSaveInstanceState(outState) - } - override fun getRealLayoutId(): Int { return R.layout.fragment_community_home } diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailViewModel.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailViewModel.kt index ca80eff8e9..1b8b705ea5 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailViewModel.kt @@ -366,7 +366,7 @@ open class GameCollectionDetailViewModel(application: Application, @SuppressLint("CheckResult") fun postGameCollectionTask(event: String, gameCollectionId: String = "0") { - RetrofitManager.getInstance(HaloApp.getInstance()) + RetrofitManager.getInstance() .newApi .postGameCollectionTask(event, gameCollectionId) .compose(singleToMain()) diff --git a/app/src/main/java/com/halo/assistant/HaloApp.java b/app/src/main/java/com/halo/assistant/HaloApp.java index 24e245ab76..44595dc3c6 100644 --- a/app/src/main/java/com/halo/assistant/HaloApp.java +++ b/app/src/main/java/com/halo/assistant/HaloApp.java @@ -89,7 +89,6 @@ public class HaloApp extends MultiDexApplication { public boolean isNewForThisVersion = false; // 当前用户是否是安装当前版本后第一次打开 (包括全新和更新) public boolean isReinstallTheSameVersion = false; // 当前用户是否重新安装了一次当前版本后的第一次打开 public boolean isRunningForeground = false; // 标记当前 APP 是否处于前台运行中 - public boolean isEmulator = false; // 当前设备是否为模拟器 public int mCacheKeyboardHeight = 0;