From 52cd04a466d9201dff10546400f0b3551bba016f Mon Sep 17 00:00:00 2001 From: xiaoyan Date: Wed, 14 Sep 2022 14:44:17 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20M18=E7=89=88=E6=9C=AC=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E6=9C=80=E7=BB=88=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 6 +++--- .../outdoor/activity/HomeActivity.java | 2 ++ .../com/navinfo/outdoor/api/Constant.java | 21 +++++++++++++++++++ .../outdoor/fragment/GatheringFragment.java | 2 +- .../navinfo/outdoor/http/HttpInterface.java | 4 ++-- 5 files changed, 29 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 77302d7..4fe1f52 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,10 +7,10 @@ android { defaultConfig { applicationId "com.navinfo.outdoor" - minSdkVersion 24 + minSdkVersion 23 targetSdkVersion 30 - versionCode 26 - versionName "8.220816" + versionCode 27 + versionName "8.220907" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } lintOptions { diff --git a/app/src/main/java/com/navinfo/outdoor/activity/HomeActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/HomeActivity.java index 57cb98d..cb0d2a7 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/HomeActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/HomeActivity.java @@ -523,5 +523,7 @@ public class HomeActivity extends BaseActivity { EventBus.getDefault().unregister(this); super.onDestroy(); PoiDatabase.destroy(); + // 清空登录信息 + Constant.clearLoginInfo(); } } \ No newline at end of file diff --git a/app/src/main/java/com/navinfo/outdoor/api/Constant.java b/app/src/main/java/com/navinfo/outdoor/api/Constant.java index 6d28cdf..c70c055 100644 --- a/app/src/main/java/com/navinfo/outdoor/api/Constant.java +++ b/app/src/main/java/com/navinfo/outdoor/api/Constant.java @@ -245,4 +245,25 @@ public class Constant { public static Set submitIdSet = new HashSet<>(); public static final String SUBMIT_TOAST_MSG= "当前POI已经在提交列表中，无需重复提交！"; + + public static void clearLoginInfo() { + ACCESS_TOKEN = null; + REFRESH_TOKEN = null; + USHERED = null; + USER_NAME = null;//登录账号/修改账号/注册 + PASS_WORD = null;//登录密码/修改密码/注册密码 + AUDITING = null;//身份证审核信息 + AUDIOTAPES = -1;//身份证审核状态 //0：不通過，1：通過，-1：待审核 + ID_NUM = null;//身份证号 + NAME = null;//身份证姓名 + ID_NUMBER = null;//身份证号 + BACKGROUND = null;//银行卡号 + BACKGROUND_NAME = null;//银行卡名称 + SEX = -1;//性别 + QQ = null; + WCHAR = null; + MOBILE = null;//手机号 + FILE_PATH = null;//银行卡图片途径 + LEVEL = 0;//用户等级 + } } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java index 15912d2..8b48849 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java @@ -312,7 +312,7 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - ToastUtils.Message(getActivity(), "绑定失败！"); + ToastUtils.Message(getActivity(), response.getMessage()); } } diff --git a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java index cd32671..4bdc105 100644 --- a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java +++ b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java @@ -1,9 +1,9 @@ package com.navinfo.outdoor.http; public class HttpInterface { - public static final String IP = "http://172.23.138.133:9999/m4";//测试接口 + public static final String IP1 = "http://172.23.138.133:9999/m4";//测试接口 public static final String IP2 = "http://dtxbmaps.navinfo.com/dtxb/dev/m4";//测试接口-外网 - public static final String IP1 = "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口 + public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口 public static final String USER_PATH = "/user/";//我的 public static final String MSG_LIST_PATH = "/msgList/";//发现 public static final String USER_LOGIN_PATH = "/userlogin/";//登录