From fd9b8144509ab05595113d5ed6496311471b0ca6 Mon Sep 17 00:00:00 2001
From: haomingming <haomingming@igandan.org>
Date: Tue, 3 Nov 2026 16:45:18 +0800
Subject: [PATCH] 2

---
 .../gdxzExpert/activity/SettingAndHelpActivity.java    |  7 +++++--
 .../gdxzExpert/netease/config/LogoutHelper.java        |  3 +++
 .../netease/config/preference/Preferences.java         |  4 +++-
 .../cn/shangyu/gdxzExpert/utils/DataCleanManager.java  | 10 ++++++++--
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/cn/shangyu/gdxzExpert/activity/SettingAndHelpActivity.java b/app/src/main/java/cn/shangyu/gdxzExpert/activity/SettingAndHelpActivity.java
index 759abad..8e6a68d 100644
--- a/app/src/main/java/cn/shangyu/gdxzExpert/activity/SettingAndHelpActivity.java
+++ b/app/src/main/java/cn/shangyu/gdxzExpert/activity/SettingAndHelpActivity.java
@@ -711,7 +711,10 @@ public class SettingAndHelpActivity extends BaseActivity implements OnCallBackFr
 //				LogUtil.i("容联连接失败");
 //			}
 //			PatientSqlManager.delAllPatientInfo(Constant.typePatient);
+			String logoutPhone = SharePrefUtil.getString(ctx, Constant.mobile, "");
+			BaseActivity.foreBack(mMainActivity != null ? mMainActivity : ctx, 2);
 			LogoutHelper.logout();
+			Badger.clearAllBadges(ctx);
 			SharePrefUtil.saveBoolean(ctx, Constant.IS_LOGIN, false);
 			SharePrefUtil.saveString(ctx, Constant.uuid, "");
 			SharePrefUtil.saveString(ctx, Constant.USERID, "");
@@ -725,11 +728,11 @@ public class SettingAndHelpActivity extends BaseActivity implements OnCallBackFr
 			addUMToken("");
 			Intent intent = new Intent(ctx, LoginNewActivity.class);
 			intent.putExtra("flag", true);
-			intent.putExtra("phone",SharePrefUtil.getString(ctx, Constant.mobile, ""));
+			intent.putExtra("phone", logoutPhone);
 			startActivity(intent);
 			Constant.islogout =1;
 			// 1登入系统 2退出系统 3患者客户端在手机前台运行 4.客户端在手机后台运行
-			BaseActivity.foreBack(mMainActivity, 2);
+			// BaseActivity.foreBack 已在清空 uuid 前执行
 
 			ctx.finish();
 		}
diff --git a/app/src/main/java/cn/shangyu/gdxzExpert/netease/config/LogoutHelper.java b/app/src/main/java/cn/shangyu/gdxzExpert/netease/config/LogoutHelper.java
index 718c14f..9959a14 100644
--- a/app/src/main/java/cn/shangyu/gdxzExpert/netease/config/LogoutHelper.java
+++ b/app/src/main/java/cn/shangyu/gdxzExpert/netease/config/LogoutHelper.java
@@ -15,6 +15,7 @@ import java.util.List;
 
 import cn.shangyu.gdxzExpert.ecdemo.ui.SDKCoreHelper;
 import cn.shangyu.gdxzExpert.netease.DemoCache;
+import cn.shangyu.gdxzExpert.netease.config.preference.Preferences;
 import cn.shangyu.gdxzExpert.report.ReportService;
 import cn.shangyu.gdxzExpert.report.reportBean;
 import cn.shangyu.gdxzExpert.utils.CommonUtil;
@@ -53,6 +54,8 @@ public class LogoutHelper {
         DataCleanManager.cleanApplicationData(UIUtils.getContext());
         SDKCoreHelper.logout(true);
         // 清理缓存&注销监听&清除状态
+        Preferences.saveUserAccount("");
+        Preferences.saveUserToken("");
         NimUIKit.logout();
         DemoCache.clear();
         NIMClient.getService(AuthService.class).logout();
diff --git a/app/src/main/java/cn/shangyu/gdxzExpert/netease/config/preference/Preferences.java b/app/src/main/java/cn/shangyu/gdxzExpert/netease/config/preference/Preferences.java
index 284e653..da1eb11 100644
--- a/app/src/main/java/cn/shangyu/gdxzExpert/netease/config/preference/Preferences.java
+++ b/app/src/main/java/cn/shangyu/gdxzExpert/netease/config/preference/Preferences.java
@@ -9,6 +9,7 @@ import com.netease.nimlib.push.packet.symmetry.SymmetryType;
 import com.netease.nimlib.sdk.NimHandshakeType;
 
 import cn.shangyu.gdxzExpert.netease.DemoCache;
+import cn.shangyu.gdxzExpert.utils.UIUtils;
 
 /**
  * Created by hzxuwen on 2015/4/13.
@@ -94,6 +95,7 @@ public class Preferences {
     }
 
     static SharedPreferences getSharedPreferences() {
-        return DemoCache.getContext().getSharedPreferences("Demo", Context.MODE_PRIVATE);
+        Context context = DemoCache.getContext() != null ? DemoCache.getContext() : UIUtils.getContext();
+        return context.getSharedPreferences("Demo", Context.MODE_PRIVATE);
     }
 }
diff --git a/app/src/main/java/cn/shangyu/gdxzExpert/utils/DataCleanManager.java b/app/src/main/java/cn/shangyu/gdxzExpert/utils/DataCleanManager.java
index 377b7f2..cc3a10d 100644
--- a/app/src/main/java/cn/shangyu/gdxzExpert/utils/DataCleanManager.java
+++ b/app/src/main/java/cn/shangyu/gdxzExpert/utils/DataCleanManager.java
@@ -9,7 +9,8 @@ import com.nostra13.universalimageloader.utils.StorageUtils;
 import java.io.File;
 import java.math.BigDecimal;
 
-import cn.shangyu.gdxzExpert.ecdemo.storage.PatientSqlManager;
+import cn.shangyu.gdxzExpert.ecdemo.storage.PatientSqlManager;
+import cn.shangyu.gdxzExpert.netease.config.preference.Preferences;
 
 public class DataCleanManager {
 
@@ -87,7 +88,12 @@ public class DataCleanManager {
 	   */
 	  public static void cleanSharedPreference(Context context) {
 		  /** 删除SharedPreferences文件 **/  
-		  SharePrefUtil.clear(context);
+		  SharePrefUtil.clear(context);
+		  Preferences.saveUserAccount("");
+		  Preferences.saveUserToken("");
+		  Constant.Repotr_token = "";
+		  Constant.Report_userId = "";
+		  Constant.Repotr_app_key = "";
 	       File file = new File("/data/data/"
 	    	        + context.getPackageName() + "/shared_prefs", Constant.SP_NAME);  
 	       deleteDir(file);