Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

处理合并冲突

Browse Source
This commit is contained in:
juntao
2022-01-13 17:21:45 +08:00
parent fc1710f3b9
commit 984fca183f
5 changed files with 3 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/gh/common/util/GameCollectionSquareBrowseTaskHelper.kt
View File

@ -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())

2
app/src/main/java/com/gh/common/util/LogUtils.java
View File

@ -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<>());

15
app/src/main/java/com/gh/gamecenter/forum/home/CommunityHomeFragment.kt
View File

@ -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<TextView>()
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
}

2
app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailViewModel.kt
View File

@ -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())

1
app/src/main/java/com/halo/assistant/HaloApp.java
View File

@ -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;