denghuan/GLDriver
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

一键登录调试（与交通厅初始化冲突，注释掉交通厅初始化代码!?）

Browse Source
This commit is contained in:
lijia 2024-06-18 11:14:27 +08:00
parent 9b2afe852e
commit b271ec0566
7 changed files with 137 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/com/arpa/hndahesudintocctmsdriver/base/App.kt
View File

@ -49,7 +49,7 @@ class App : Application() {
initUmeng()
initJpush()
//
initThird()
// var pendingIntent: PendingIntent = getActivity(
@ -92,24 +92,24 @@ class App : Application() {
}
private fun initThird() {
val state: String = SPUtil.getSP(this, "state_data", "authorization_state")
if ("1" == state) {
// val state: String = SPUtil.getSP(this, "state_data", "authorization_state")
// if ("1" != state) {
try {
//安联初始化
if (packageName == getCurrentProcessName(this)) {
//Log.e("--使用的测试环境--",BuildConfig.OPEN_API_URL);
MDPLocationCollectionManager.initialize(applicationContext, BuildConfig.OPEN_AL_URL)
MDPLocationCollectionManager.initServiceProcessProguard(applicationContext) // 保活代码
startService(Intent(this, PlayerMusicService::class.java)) // 保活代码
// MDPLocationCollectionManager.initServiceProcessProguard(applicationContext) // 保活代码
// startService(Intent(this, PlayerMusicService::class.java)) // 保活代码
}
//初始化交通厅
JTTProcess.init(this)
// SPUtil.insSP(this, "state_data", "authorization_state", "1")
// JTTProcess.init(this)
SPUtil.insSP(this, "state_data", "authorization_state", "1")
} catch (e: Exception) {
// SPUtil.insSP(this, "state_data", "authorization_state", "0")
SPUtil.insSP(this, "state_data", "authorization_state", "0")
}
}
// }
}

6
app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/HomeActivity.kt
View File

@ -83,13 +83,13 @@ class HomeActivity : BaseActivity<ActivityHomeBinding>(), OnTabSelectListener,
private fun getPermissions() {
PermissionX.init(this)
.permissions(
Manifest.permission.CAMERA,
// Manifest.permission.CAMERA,
Manifest.permission.ACCESS_FINE_LOCATION,
Manifest.permission.WRITE_EXTERNAL_STORAGE,
Manifest.permission.READ_EXTERNAL_STORAGE,
Manifest.permission.ACCESS_COARSE_LOCATION,
Manifest.permission.RECORD_AUDIO,
Manifest.permission.ACCESS_BACKGROUND_LOCATION,
// Manifest.permission.RECORD_AUDIO,
// Manifest.permission.ACCESS_BACKGROUND_LOCATION,
)
.request { allGranted, grantedList, deniedList ->
if (allGranted) {

7
app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/LauncherActivity.kt
View File

@ -65,7 +65,7 @@ class LauncherActivity : BaseActivity<ActivityLauncherBinding>() {
AMapLocationClient.updatePrivacyShow(mContext, true, true)
AMapLocationClient.updatePrivacyAgree(mContext, true)
MapsInitializer.updatePrivacyAgree(this, true)
initThird()
// initThird()
initPush()
goNext()
}
@ -75,8 +75,9 @@ class LauncherActivity : BaseActivity<ActivityLauncherBinding>() {
}
private fun initThird() {
//appcation中初始化失败，重新初始化？，是否需要？？？
val state: String = SPUtil.getSP(mContext, "state_data", "authorization_state")
if ("1" != state) {
if ("0" == state) {
try {
//安联初始化
if (packageName == getCurrentProcessName(this)) {
@ -87,7 +88,7 @@ class LauncherActivity : BaseActivity<ActivityLauncherBinding>() {
)
}
//初始化交通厅
JTTProcess.init(application)
// JTTProcess.init(application)
SPUtil.insSP(mContext, "state_data", "authorization_state", "1")
} catch (e: Exception) {
SPUtil.insSP(mContext, "state_data", "authorization_state", "0")

69
app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/LoginActivity.kt
View File

@ -1,19 +1,37 @@
package com.arpa.hndahesudintocctmsdriver.ui.account
import android.Manifest
import android.content.Context
import android.content.Intent
import android.os.Bundle
import android.util.Log
import android.view.View
import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
import com.arpa.glex.bean.UserBean
import com.arpa.hndahesudintocctmsdriver.base.AppConfig
import com.arpa.hndahesudintocctmsdriver.databinding.ActivityLoginBinding
import com.arpa.hndahesudintocctmsdriver.event.RefreshEvent
import com.arpa.hndahesudintocctmsdriver.net.BaseObserver
import com.arpa.hndahesudintocctmsdriver.net.DataManager
import com.arpa.hndahesudintocctmsdriver.net.RxHttpCallBack
import com.arpa.hndahesudintocctmsdriver.temp.AuthPageConfig
import com.arpa.hndahesudintocctmsdriver.temp.FullPortConfig
import com.arpa.hndahesudintocctmsdriver.utils.CommonPopUtils
import com.arpa.hndahesudintocctmsdriver.utils.OneKeyLoginUtils
import com.arpa.hndahesudintocctmsdriver.utils.SPUtils
import com.arpa.hndahesudintocctmsdriver.utils.UserUtils
import com.arpa.mylibrary.base.BaseActivity
import com.arpa.mylibrary.net.CommonResponseBean
import com.arpa.mylibrary.utils.ActivityUtils
import com.arpa.mylibrary.utils.ToastUtils
import com.permissionx.guolindev.PermissionX
import com.umeng.umverify.UMResultCode
import com.umeng.umverify.UMVerifyHelper
import com.umeng.umverify.listener.UMTokenResultListener
import com.umeng.umverify.model.UMTokenRet
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
import io.reactivex.rxjava3.schedulers.Schedulers
import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe
@ -58,35 +76,38 @@ class LoginActivity : BaseActivity<ActivityLoginBinding>(), View.OnClickListener
// ActivityUtils.startActivity(mContext, HomeActivity::class.java)
return@setOnLongClickListener true
}
}
override fun initDate() {
getPermissions()
// oneLogin(this,this)
}
private fun getPermissions() {
PermissionX.init(this)
.permissions(
Manifest.permission.CAMERA,
Manifest.permission.ACCESS_FINE_LOCATION,
Manifest.permission.WRITE_EXTERNAL_STORAGE,
Manifest.permission.READ_EXTERNAL_STORAGE,
Manifest.permission.ACCESS_COARSE_LOCATION,
Manifest.permission.RECORD_AUDIO,
Manifest.permission.ACCESS_BACKGROUND_LOCATION,
)
.request { allGranted, grantedList, deniedList ->
if (allGranted) {
} else {
Toast.makeText(
mContext,
"开启权限失败,请在应用设置-权限-定位-始终允许",
Toast.LENGTH_SHORT
).show()
}
}
// PermissionX.init(this)
// .permissions(
// Manifest.permission.CAMERA,
// Manifest.permission.ACCESS_FINE_LOCATION,
// Manifest.permission.WRITE_EXTERNAL_STORAGE,
// Manifest.permission.READ_EXTERNAL_STORAGE,
// Manifest.permission.ACCESS_COARSE_LOCATION,
// Manifest.permission.RECORD_AUDIO,
// Manifest.permission.ACCESS_BACKGROUND_LOCATION,
// )
// .request { allGranted, grantedList, deniedList ->
// if (allGranted) {
//
// } else {
// Toast.makeText(
// mContext,
// "开启权限失败,请在应用设置-权限-定位-始终允许",
// Toast.LENGTH_SHORT
// ).show()
// }
// }
}
override fun onClick(view: View?) {
@ -155,7 +176,8 @@ class LoginActivity : BaseActivity<ActivityLoginBinding>(), View.OnClickListener
}
} else {
OneKeyLoginUtils.getInstance().oneLogin(mContext, this)
// oneLogin(applicationContext, this@LoginActivity)
OneKeyLoginUtils.getInstance().oneLogin(applicationContext, this)
// ActivityUtils.startActivity(mContext, SelectRoleActivity::class.java)
}
}
@ -181,7 +203,8 @@ class LoginActivity : BaseActivity<ActivityLoginBinding>(), View.OnClickListener
}
} else {
OneKeyLoginUtils.getInstance().oneLogin(mContext, this)
// oneLogin(applicationContext, this@LoginActivity)
OneKeyLoginUtils.getInstance().oneLogin(applicationContext, this)
// ActivityUtils.startActivity(mContext, SelectRoleActivity::class.java)
}
}

131
app/src/main/java/com/arpa/hndahesudintocctmsdriver/utils/OneKeyLoginUtils.kt
View File

@ -10,8 +10,10 @@ import com.arpa.hndahesudintocctmsdriver.net.RxHttpCallBack
import com.arpa.hndahesudintocctmsdriver.temp.AuthPageConfig
import com.arpa.hndahesudintocctmsdriver.temp.FullPortConfig
import com.arpa.glex.bean.UserBean
import com.arpa.hndahesudintocctmsdriver.ui.HomeActivity
import com.arpa.mylibrary.base.SingletonNoPHolder
import com.arpa.mylibrary.net.CommonResponseBean
import com.arpa.mylibrary.utils.ActivityUtils
import com.umeng.umverify.UMResultCode
import com.umeng.umverify.UMVerifyHelper
import com.umeng.umverify.listener.UMTokenResultListener
@ -38,86 +40,97 @@ class OneKeyLoginUtils private constructor() {
mPhoneNumberAuthHelper =
UMVerifyHelper.getInstance(context, object : UMTokenResultListener {
override fun onTokenSuccess(p0: String?) {
mPhoneNumberAuthHelper.setAuthListener(object : UMTokenResultListener {
override fun onTokenSuccess(p0: String?) {
var tokenRet: UMTokenRet? = null
try {
mUIConfig.release()
tokenRet = UMTokenRet.fromJson(p0)
if (UMResultCode.CODE_GET_TOKEN_SUCCESS == tokenRet.code) {
DataManager.getInstance().oneClickLogin(tokenRet.token)
.flatMap {
//两个接口token字段名称不一致，先进行保存
SPUtils.instance.setUserToken(context,it.data.access_token)
DataManager.getInstance().getUserInfo()
}
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(BaseObserver(context,
object : RxHttpCallBack<UserBean>() {
override fun onSuccess(t: CommonResponseBean<UserBean>) {
super.onSuccess(t)
mPhoneNumberAuthHelper.quitLoginPage()
var tokenRet: UMTokenRet? = null
try {
tokenRet = UMTokenRet.fromJson(p0)
if (UMResultCode.CODE_GET_TOKEN_SUCCESS == tokenRet.code) {
mUIConfig.release()
UserUtils.instance.loginIn(context,t.data)
DataManager.getInstance().oneClickLogin(tokenRet.token)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(
BaseObserver(context,
object : RxHttpCallBack<UserBean>() {
override fun onSuccess(t: CommonResponseBean<UserBean>) {
super.onSuccess(t)
println(t.data.access_token)
SPUtils.instance.setUserToken(
context,
t.data.access_token
)
DataManager.getInstance().getUserInfo()
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(
BaseObserver(context,
object : RxHttpCallBack<UserBean>() {
override fun onSuccess(t: CommonResponseBean<UserBean>) {
super.onSuccess(t)
UserUtils.instance.loginIn(
activity,
t.data
)
mPhoneNumberAuthHelper.quitLoginPage()
}
}
}))
}
} catch (e: Exception) {
e.printStackTrace();
}
})
)
}
})
)
// .flatMap {
// //两个接口token字段名称不一致，先进行保存
// SPUtils.instance.setUserToken(context, it.data.access_token)
// DataManager.getInstance().getUserInfo()
// }
// .subscribeOn(Schedulers.io())
// .observeOn(AndroidSchedulers.mainThread())
// .subscribe(
// BaseObserver(context,
// object : RxHttpCallBack<UserBean>() {
// override fun onSuccess(t: CommonResponseBean<UserBean>) {
// super.onSuccess(t)
// UserUtils.instance.loginIn(context, t.data)
// mPhoneNumberAuthHelper.quitLoginPage()
// }
// })
// )
}
override fun onTokenFailed(p0: String?) {
try {
mUIConfig.release()
var tokenRet = UMTokenRet.fromJson(p0)
if (UMResultCode.CODE_ERROR_USER_CANCEL == tokenRet.getCode()) {
//模拟的是必须登录 否则直接退出app的场景
// finish()
} else {
// Toast.makeText(
// context,
// "一键登录失败切换到其他登录方式",
// Toast.LENGTH_SHORT
// ).show()
//获取token失败，去获取验证码页面
EventBus.getDefault().post(RefreshEvent(1))
}
} catch (e: java.lang.Exception) {
e.printStackTrace()
}
}
})
mUIConfig!!.configAuthPage()
mPhoneNumberAuthHelper?.getLoginToken(context, 5000)
} catch (e: Exception) {
e.printStackTrace();
}
}
override fun onTokenFailed(p0: String?) {
try {
mUIConfig.release()
var tokenRet = UMTokenRet.fromJson(p0)
if (UMResultCode.CODE_ERROR_USER_CANCEL == tokenRet.getCode()) {
//模拟的是必须登录 否则直接退出app的场景
// finish()
} else {
// Toast.makeText(
// context,
// "一键登录失败切换到其他登录方式",
// Toast.LENGTH_SHORT
// ).show()
// Toast.makeText(
// context,
// "一键登录失败切换到其他登录方式",
// Toast.LENGTH_SHORT
// ).show()
//获取token失败，去获取验证码页面
EventBus.getDefault().post(RefreshEvent(1))
mPhoneNumberAuthHelper.quitLoginPage()
}
} catch (e: java.lang.Exception) {
e.printStackTrace()
}
}
}).apply {
checkEnvAvailable(UMVerifyHelper.SERVICE_TYPE_LOGIN)
}
})
mUIConfig = FullPortConfig(activity, mPhoneNumberAuthHelper)
mUIConfig!!.configAuthPage()
mPhoneNumberAuthHelper?.getLoginToken(context, 5000)
// mUIConfig = DialogPortConfig(activity, mPhoneNumberAuthHelper)
}

4
app/src/main/java/com/arpa/hndahesudintocctmsdriver/utils/UserUtils.kt
View File

@ -50,7 +50,7 @@ class UserUtils private constructor() {
fun loginIn(context: Context, userBean: UserBean) {
SPUtils.instance.setUserInfo(context, Gson().toJson(userBean))
//设置推送别名
PushHelper.setAlias(context, userBean)
// PushHelper.setAlias(context, userBean)
// ActivityUtils.startActivity(
// context,
@ -68,7 +68,7 @@ class UserUtils private constructor() {
HomeActivity::class.java
)
}
ActivityUtils.finishToActivity(LoginActivity::class.java, true)
// ActivityUtils.finishToActivity(LoginActivity::class.java, true)
}

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Wed Dec 27 15:25:22 CST 2023
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-7.3.3-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME