From 399ac289f80b7a40aa4210341db6b447cacdcf14 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 09 八月 2022 17:42:33 +0800
Subject: [PATCH] 广告升级，隐私政策整改
---
app/src/main/java/com/tejia/lijin/app/util/user/UserUtil.java | 39 +++++++++++++++++++++++++++------------
1 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/app/src/main/java/com/tejia/lijin/app/util/user/UserUtil.java b/app/src/main/java/com/tejia/lijin/app/util/user/UserUtil.java
index ef3f2b6..08ce308 100644
--- a/app/src/main/java/com/tejia/lijin/app/util/user/UserUtil.java
+++ b/app/src/main/java/com/tejia/lijin/app/util/user/UserUtil.java
@@ -7,6 +7,7 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
+import com.tejia.lijin.app.ui.mine.LoginSelectActivity;
import com.xiaomi.mipush.sdk.MiPushClient;
import com.tejia.lijin.app.R;
import com.tejia.lijin.app.entity.UserInfo;
@@ -32,16 +33,10 @@
*/
public static UserInfo getUserInfo(Context context) {
SharedPreferences sp = context.getSharedPreferences("user", MODE_PRIVATE);
- String userInfo = sp.getString("userinfo", "");
+ String userInfo = sp.getString("userinfo_new", "");
if (StringUtils.isNullOrEmpty(userInfo))
return null;
- JSONObject jsonObject = null;
- try {
- jsonObject = new JSONObject(userInfo);
- } catch (JSONException e) {
- return null;
- }
- UserInfo info = gson.fromJson(jsonObject.optJSONObject("data").optJSONObject("user").toString(), new TypeToken<UserInfo>() {
+ UserInfo info = gson.fromJson(userInfo, new TypeToken<UserInfo>() {
}.getType());
return info;
}
@@ -129,14 +124,14 @@
return sp.getBoolean("isLogin", false);
}
- public static void setInviteCode(Context context, String uid, String inviteCode) {
+ public static void setInviteCode(Context context, String inviteCode) {
SharedPreferences sp = context.getSharedPreferences("user-info", Context.MODE_PRIVATE);
SharedPreferences.Editor editor = sp.edit();
editor.putString("inviteCode", inviteCode);
editor.commit();
}
- public static String getInviteCode(Context context, String uid) {
+ public static String getInviteCode(Context context) {
SharedPreferences sp = context.getSharedPreferences("user-info", Context.MODE_PRIVATE);
return sp.getString("inviteCode", "");
}
@@ -150,7 +145,7 @@
public static UserLoginStatus getLoginState(Context context) {
boolean isLogin = isLogin(context);
if (isLogin) {
- String inviteCode = getInviteCode(context, getUid(context) + "");
+ String inviteCode = getInviteCode(context);
if (StringUtils.isNullOrEmpty(inviteCode))
return UserLoginStatus.LOINGED_NO_ACTIVE;
else
@@ -168,6 +163,7 @@
editor.putBoolean("isWxBind", false);
editor.putString("uid", "0");
editor.remove("userinfo");
+ editor.remove("userinfo_new");
editor.commit();
//娓呴櫎涓汉淇℃伅缂撳瓨
@@ -214,9 +210,28 @@
return resourceId;
}
+ /**
+ * 鐧诲綍鎴愬姛
+ *
+ * @param context
+ * @param info
+ */
+ public static void loginSuccess(Context context, UserInfo info) {
+ SharedPreferences sp = context.getSharedPreferences("user", MODE_PRIVATE);
+ SharedPreferences.Editor editor = sp.edit();
+ editor.putBoolean("isLogin", true);
+ editor.putBoolean("isFirstInput", false);
+ editor.putString("uid", info.getId());
+ editor.putString("openid", info.getOpenid());
+ editor.putString("portrait", info.getPortrait());
+ editor.putString("userinfo_new", new Gson().toJson(info));
+ editor.commit();
+ MiPushClient.setAlias(context, info.getId(), null);
+ }
+
public static void jumpLogin(Context context) {
- context.startActivity(new Intent(context, LoginActivity.class));
+ context.startActivity(new Intent(context, LoginSelectActivity.class));
}
--
Gitblit v1.8.0