diff --git a/app/src/main/java/com/shunzhi/parent/AppContext.java b/app/src/main/java/com/shunzhi/parent/AppContext.java index 83e6c0e..8b25300 100644 --- a/app/src/main/java/com/shunzhi/parent/AppContext.java +++ b/app/src/main/java/com/shunzhi/parent/AppContext.java @@ -14,7 +14,6 @@ import com.netease.nimlib.sdk.SDKOptions; import com.netease.nimlib.sdk.StatusBarNotificationConfig; import com.netease.nimlib.sdk.auth.LoginInfo; import com.share.mvpsdk.global.GlobalApplication; -import com.amap.api.location.AMapLocationClientOption.AMapLocationMode; import com.share.mvpsdk.helper.RetrofitCreateHelper; import com.shunzhi.parent.bean.message.DaoMaster; import com.shunzhi.parent.bean.message.DaoMaster.DevOpenHelper; @@ -24,6 +23,8 @@ import com.shunzhi.parent.ui.MainActivity; import org.greenrobot.greendao.database.Database; +import timber.log.Timber; + /** * Created by Administrator on 2018/3/7 0007. */ @@ -97,6 +98,7 @@ public class AppContext extends GlobalApplication { SharedPreferences sp = getSharedPreferences("info", Context.MODE_PRIVATE); String account = sp.getString("account", ""); String token = sp.getString("token", ""); + Timber.i("---===account: %s token : %s",account,token); if (account.length() > 0 && token.length() > 0) { return new LoginInfo(account, token); } 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 247fcab..6458bd9 100644 --- a/app/src/main/java/com/shunzhi/parent/manager/MessageManager.java +++ b/app/src/main/java/com/shunzhi/parent/manager/MessageManager.java @@ -78,6 +78,7 @@ public class MessageManager { @Override public void onEvent(StatusCode statusCode) { if (statusCode == StatusCode.KICKOUT) { + MessageManager.getInstance().logout(); Context context = AppContext.getInstance(); Intent i = new Intent(context, LoginAndRegistActivity.class); i.putExtra("type", "登录"); @@ -175,7 +176,7 @@ public class MessageManager { sp.edit().putString("token", password).apply(); NIMClient.getService(AuthService.class) .login(new LoginInfo(account, password)) - .setCallback(new RequestCallback() { + .setCallback(new RequestCallback() { @Override public void onSuccess(Object o) { NIMLoginResultBean bean = new NIMLoginResultBean(true, 200, null); @@ -204,9 +205,13 @@ public class MessageManager { public void logout() { + SharedPreferences sp = AppContext.getInstance().getApplicationContext().getSharedPreferences("info", Context.MODE_PRIVATE); + sp.edit().putString("account", "").apply(); + sp.edit().putString("token", "").apply(); NIMClient.getService(MsgServiceObserve.class).observeReceiveMessage(messageObserver, false); NIMClient.getService(MsgServiceObserve.class).observeCustomNotification(customNotificationObserver, false); NIMClient.getService(AuthService.class).logout(); + } public interface NIMLoginCallback { diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java index 6afad89..641ae2d 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java +++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java @@ -21,6 +21,7 @@ import com.shunzhi.parent.AppContext; import com.shunzhi.parent.R; import com.shunzhi.parent.contract.loginandregister.LoginAndRegisterContract; import com.shunzhi.parent.contract.mine.MineContract; +import com.shunzhi.parent.manager.MessageManager; import com.shunzhi.parent.presenter.mine.MinePresenter; import com.shunzhi.parent.ui.activity.LoginAndRegistActivity; import com.shunzhi.parent.ui.activity.MyChildActivity; @@ -190,6 +191,7 @@ public class MineFragment extends BaseMVPCompatFragment