diff --git a/app/src/main/assets/0e8d843545cb1ed5cf072079392841cb b/app/src/main/assets/0e8d843545cb1ed5cf072079392841cb new file mode 100644 index 0000000..e69de29 diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/base/App.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/base/App.kt index 209d9cf..b66c182 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/base/App.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/base/App.kt @@ -104,7 +104,7 @@ class App : Application() { } //初始化交通厅 -// JTTProcess.init(this) + JTTProcess.init(this) SPUtil.insSP(this, "state_data", "authorization_state", "1") } catch (e: Exception) { SPUtil.insSP(this, "state_data", "authorization_state", "0") diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/LauncherActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/LauncherActivity.kt index a2dadcd..118497f 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/LauncherActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/LauncherActivity.kt @@ -65,7 +65,7 @@ class LauncherActivity : BaseActivity() { AMapLocationClient.updatePrivacyShow(mContext, true, true) AMapLocationClient.updatePrivacyAgree(mContext, true) MapsInitializer.updatePrivacyAgree(this, true) -// initThird() + initThird() initPush() goNext() } @@ -88,7 +88,7 @@ class LauncherActivity : BaseActivity() { ) } //初始化交通厅 -// 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") diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/utils/OneKeyLoginUtils.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/utils/OneKeyLoginUtils.kt index 157bc67..76ba2a7 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/utils/OneKeyLoginUtils.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/utils/OneKeyLoginUtils.kt @@ -1,19 +1,17 @@ package com.arpa.hndahesudintocctmsdriver.utils import android.content.Context -import android.widget.Toast import androidx.appcompat.app.AppCompatActivity +import com.arpa.glex.bean.UserBean 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.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.arpa.mylibrary.utils.LoadingUtils.Companion.instance import com.umeng.umverify.UMResultCode import com.umeng.umverify.UMVerifyHelper import com.umeng.umverify.listener.UMTokenResultListener @@ -40,6 +38,7 @@ class OneKeyLoginUtils private constructor() { mPhoneNumberAuthHelper = UMVerifyHelper.getInstance(context, object : UMTokenResultListener { override fun onTokenSuccess(p0: String?) { + instance.dissLoading() var tokenRet: UMTokenRet? = null try { tokenRet = UMTokenRet.fromJson(p0) @@ -77,6 +76,14 @@ class OneKeyLoginUtils private constructor() { }) ) } + + override fun onFailure( + mContext: Context?, + e: Throwable + ) { + super.onFailure(mContext, e) + mPhoneNumberAuthHelper.quitLoginPage() + } }) ) @@ -106,6 +113,7 @@ class OneKeyLoginUtils private constructor() { override fun onTokenFailed(p0: String?) { try { + instance.dissLoading() mUIConfig.release() var tokenRet = UMTokenRet.fromJson(p0) if (UMResultCode.CODE_ERROR_USER_CANCEL == tokenRet.getCode()) { @@ -130,6 +138,8 @@ class OneKeyLoginUtils private constructor() { mUIConfig = FullPortConfig(activity, mPhoneNumberAuthHelper) mUIConfig!!.configAuthPage() + + instance.showLoading(activity, "一键登录请求中......") mPhoneNumberAuthHelper?.getLoginToken(context, 5000) // mUIConfig = DialogPortConfig(activity, mPhoneNumberAuthHelper) }