diff --git a/.idea/modules.xml b/.idea/modules.xml
index eac7886..45d1910 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -4,8 +4,8 @@
+
-
diff --git a/app/src/main/java/com/shunzhi/parent/manager/MessageManager.java b/app/src/main/java/com/shunzhi/parent/manager/MessageManager.java
index 7550404..520b903 100644
--- a/app/src/main/java/com/shunzhi/parent/manager/MessageManager.java
+++ b/app/src/main/java/com/shunzhi/parent/manager/MessageManager.java
@@ -60,12 +60,14 @@ public class MessageManager {
NIMClient.getService(AuthServiceObserver.class).observeOnlineStatus(new Observer() {
@Override
public void onEvent(StatusCode statusCode) {
- if (statusCode==StatusCode.KICKOUT){
- Intent i = new Intent(AppContext.getInstance(), LoginAndRegistActivity.class);
- i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK|Intent.FLAG_ACTIVITY_NEW_TASK);
+ if (statusCode == StatusCode.KICKOUT) {
+ Context context = AppContext.getInstance();
+ Intent i = new Intent(context, LoginAndRegistActivity.class);
+ i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
+ context.startActivity(i);
}
}
- },true);
+ }, true);
}
@@ -89,11 +91,12 @@ public class MessageManager {
public void onSuccess(Object o) {
NIMLoginResultBean bean = new NIMLoginResultBean(true, 200, null);
subject.onNext(bean);
+ Timber.i("----===onSuccess : %s",o);
}
@Override
public void onFailed(int i) {
- Timber.i("------nim login failed : %s", i);
+ Timber.i("----===nim login failed : %s", i);
ToastUtils.showToast("云信服务器登录失败:" + i);
NIMLoginResultBean bean = new NIMLoginResultBean(false, i, null);
subject.onNext(bean);
@@ -101,6 +104,7 @@ public class MessageManager {
@Override
public void onException(Throwable throwable) {
+ Timber.i("----===onException");
if (throwable != null) throwable.printStackTrace();
NIMLoginResultBean bean = new NIMLoginResultBean(false, 0, throwable);
subject.onNext(bean);
diff --git a/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
index 398e650..318135b 100644
--- a/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
+++ b/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
@@ -23,6 +23,7 @@ import java.util.regex.Pattern;
import io.reactivex.functions.Consumer;
import retrofit2.HttpException;
+import timber.log.Timber;
/**
* Created by Administrator on 2018/3/6 0006.
@@ -45,6 +46,7 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
mRxManager.register(mIModel.getLoginResult(loginName, loginPwd).subscribe(new Consumer() {
@Override
public void accept(JsonObject jsonObject) throws Exception {
+ Timber.i("---=== loginResult :%s",jsonObject);
try {
if (jsonObject != null && !TextUtils.isEmpty(jsonObject.get("access_token").getAsString())) {
AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.ACCESS_TOKEN, jsonObject.get("access_token").getAsString());
--
libgit2 0.21.0