diff --git a/app/src/main/java/com/chwl/app/ui/login/LoginPasswordActivity.java b/app/src/main/java/com/chwl/app/ui/login/LoginPasswordActivity.java index 09bdebae6..abacfb4d0 100644 --- a/app/src/main/java/com/chwl/app/ui/login/LoginPasswordActivity.java +++ b/app/src/main/java/com/chwl/app/ui/login/LoginPasswordActivity.java @@ -29,6 +29,7 @@ import com.chwl.app.common.widget.OriginalDrawStatusClickSpan; import com.chwl.app.ui.webview.CommonWebViewActivity; import com.chwl.core.UriProvider; import com.coorchice.library.SuperTextView; +import com.example.module_base.support.login.ILoginService; import com.netease.nim.uikit.StatusBarUtil; import com.trello.rxlifecycle3.android.ActivityEvent; import com.chwl.app.MainActivity; @@ -313,7 +314,10 @@ public class LoginPasswordActivity extends BaseActivity { @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); - AuthModel.get().getGoogleLoginService().onActivityResult(requestCode, resultCode, data); + ILoginService loginService = AuthModel.get().getGoogleLoginService(); + if (loginService != null) { + loginService.onActivityResult(requestCode, resultCode, data); + } if (requestCode == 100 && resultCode == RESULT_OK) { String areaCode = data.getStringExtra(AreaCodeActivity.COUNTRY_NUMBER); if (areaCode != null) {