diff --git a/app/libs/processor.jar b/app/libs/processor.jar index 46b1996..adae491 100644 Binary files a/app/libs/processor.jar and b/app/libs/processor.jar differ diff --git a/app/src/main/java/com/shunzhi/parent/AppContext.java b/app/src/main/java/com/shunzhi/parent/AppContext.java index 60fb2bc..bcd1330 100644 --- a/app/src/main/java/com/shunzhi/parent/AppContext.java +++ b/app/src/main/java/com/shunzhi/parent/AppContext.java @@ -100,7 +100,6 @@ public class AppContext extends GlobalApplication { return options; } - private LoginInfo loginInfo() { SharedPreferences sp = getSharedPreferences("info", Context.MODE_PRIVATE); String account = sp.getString("account", ""); diff --git a/app/src/main/java/com/shunzhi/parent/bean/NIMLoginResultBean.java b/app/src/main/java/com/shunzhi/parent/bean/NIMLoginResultBean.java index ef19e1a..c618867 100644 --- a/app/src/main/java/com/shunzhi/parent/bean/NIMLoginResultBean.java +++ b/app/src/main/java/com/shunzhi/parent/bean/NIMLoginResultBean.java @@ -41,4 +41,13 @@ public class NIMLoginResultBean { public void setThrowable(Throwable throwable) { this.throwable = throwable; } + + @Override + public String toString() { + return "NIMLoginResultBean{" + + "isSuccess=" + isSuccess + + ", resultCode=" + resultCode + + ", throwable=" + throwable + + '}'; + } } 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 526abfa..cc21219 100644 --- a/app/src/main/java/com/shunzhi/parent/manager/MessageManager.java +++ b/app/src/main/java/com/shunzhi/parent/manager/MessageManager.java @@ -61,18 +61,21 @@ public class MessageManager { private Observer> messageObserver = new Observer>() { @Override public void onEvent(List imMessages) { + Log.d("77777","IMMessage="+imMessages.toString()); onMessageReceive(imMessages); } }; private Observer customNotificationObserver = new Observer() { @Override public void onEvent(CustomNotification customNotification) { + Log.d("77777","customNotification="+customNotification.getContent()); onCustomNotificationReceive(customNotification); } }; private MessageManager() { + Log.d("77777","messageObserver="+messageObserver); NIMClient.getService(MsgServiceObserve.class).observeReceiveMessage(messageObserver, true); NIMClient.getService(MsgServiceObserve.class).observeCustomNotification(customNotificationObserver, true); NIMClient.getService(AuthServiceObserver.class).observeOnlineStatus(new Observer() { @@ -184,12 +187,10 @@ public class MessageManager { NIMLoginResultBean bean = new NIMLoginResultBean(true, 200, null); subject.onNext(bean); // Timber.i("----===onSuccess : %s", o); - Log.d("66666","云信服务器登录失败:" + o.toString()); } @Override public void onFailed(int i) { - Log.d("66666","云信服务器登录失败:" + i); // Timber.i("----===nim login failed : %s", i); NIMLoginResultBean bean = new NIMLoginResultBean(false, i, null); subject.onNext(bean); @@ -197,7 +198,6 @@ public class MessageManager { @Override public void onException(Throwable throwable) { - Log.d("66666","onException:" + throwable.toString()); // Timber.i("----===onException"); if (throwable != null) throwable.printStackTrace(); NIMLoginResultBean bean = new NIMLoginResultBean(false, 0, throwable); 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 c5c8172..1c2bafd 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 @@ -203,10 +203,11 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre } @Override - public void nimLogin(String account, String password) { + public void nimLogin(final String account, final String password) { mRxManager.register(mIModel.nimLoginResult(account, password).subscribe(new Consumer() { @Override public void accept(NIMLoginResultBean bean) throws Exception { + Log.d("77777","NIMLoginResultBean="+bean); if (bean.isSuccess()) { AppConfig.ISLOGIN = true; mIView.getUserInfo(0); diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java index 0dac4ec..bad1ee9 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java +++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java @@ -195,7 +195,7 @@ public class ReportFragment extends BaseMVPCompatFragment