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

Merge branch 'hotfix-v5.7.1-492-crashes' into 'dev'

Browse Source 
修复sentry上的闪退问题

See merge request halo/android/assistant-android!233
This commit is contained in:
叶子维
2022-04-11 14:20:44 +08:00
parent 6c6a7f0677 8be52f7bdd
commit 25a325f7f7
2 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/com/gh/common/util/QuickLoginHelper.kt
View File

@ -16,6 +16,7 @@ import com.cmic.sso.sdk.auth.LoginClickListener
import com.cmic.sso.sdk.auth.TokenListener
import com.gh.common.constant.Config
import com.gh.common.constant.Constants
import com.gh.common.runOnUiThread
import com.gh.common.util.PermissionHelper.checkReadPhoneStatePermissionBeforeAction
import com.gh.common.util.ToastUtils.toast
import com.gh.gamecenter.LoginActivity
@ -29,7 +30,6 @@ import com.gh.gamecenter.user.UserRepository
import com.lightgame.utils.AppManager
import com.lightgame.utils.Utils
import org.json.JSONObject
import java.util.*
/**
* 一键登录辅助类
@ -163,14 +163,16 @@ object QuickLoginHelper {
}
private fun loginAuth(context: Context) {
mPreDialog = Dialog(context, R.style.DialogWindowTransparent).apply {
val binding = SetWaitDialogBinding.inflate(LayoutInflater.from(context)).apply {
setWaitMessage.text = "请求登录中"
runOnUiThread {
mPreDialog = Dialog(context, R.style.DialogWindowTransparent).apply {
val binding = SetWaitDialogBinding.inflate(LayoutInflater.from(context)).apply {
setWaitMessage.text = "请求登录中"
}
requestWindowFeature(Window.FEATURE_NO_TITLE)
setContentView(binding.root)
setCanceledOnTouchOutside(false)
show()
}
requestWindowFeature(Window.FEATURE_NO_TITLE)
setContentView(binding.root)
setCanceledOnTouchOutside(false)
show()
}
// 2.授权请求
mAuthnHelper?.loginAuth(Config.QUICK_LOGIN_APPID, Config.QUICK_LOGIN_APPKEY, mTokenListener, REQUEST_LOGIN_AUTH_CODE)

15
app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeFragment.kt
View File

@ -4,6 +4,7 @@ import android.os.Bundle
import android.view.View
import androidx.constraintlayout.widget.ConstraintLayout
import com.gh.common.constant.Constants
import com.gh.common.util.ClickUtils
import com.gh.common.util.SPUtils
import com.gh.common.util.SpanBuilder
import com.gh.common.util.dip2px
@ -27,16 +28,18 @@ class TeenagerModeFragment : NormalFragment() {
if (SPUtils.getBoolean(Constants.SP_TEENAGER_MODE, false)) {
bundle.putString(TeenagerModeActivity.TYPE, TeenagerModeActivity.TYPE_DISABLE)
showDisable()
} else {
} else {
bundle.putString(TeenagerModeActivity.TYPE, TeenagerModeActivity.TYPE_ENABLE)
showEnable()
}
mBinding?.switchTv?.setOnClickListener {
val mContainerFragment = requireActivity().supportFragmentManager.findFragmentByTag(PasswordSettingFragment::class.java.simpleName)
?: PasswordSettingFragment().with(bundle)
requireActivity().supportFragmentManager.beginTransaction().run {
addToBackStack(null)
add(R.id.placeholder, mContainerFragment!!, PasswordSettingFragment::class.java.simpleName).commitAllowingStateLoss()
if (!ClickUtils.isFastDoubleClick(R.id.switchTv)) {
val mContainerFragment = requireActivity().supportFragmentManager.findFragmentByTag(PasswordSettingFragment::class.java.simpleName)
?: PasswordSettingFragment().with(bundle)
requireActivity().supportFragmentManager.beginTransaction().run {
addToBackStack(null)
add(R.id.placeholder, mContainerFragment!!, PasswordSettingFragment::class.java.simpleName).commitAllowingStateLoss()
}
}
}
}