From cb6aca0642ac8dd5de877ade168066d85acb589c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 17 十月 2025 15:54:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/MApplication.java | 48 +++++++++++++++++++++++++-----------------------
1 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/MApplication.java b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/MApplication.java
index 72c7af9..fb4269e 100644
--- a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/MApplication.java
+++ b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/MApplication.java
@@ -9,13 +9,15 @@
import android.widget.ImageView;
import androidx.annotation.Nullable;
+
+import com.doumee.keyCabinet.bean.DevConfigBean;
+import com.doumee.keyCabinet.bean.LoginBean;
import com.doumee.keyCabinet.utils.CrashHandler;
import com.bumptech.glide.Glide;
import com.doumee.keyCabinet.utils.TimeUtils;
import com.doumee.lib_coremodel.base.CoreConfig;
import com.doumee.lib_coremodel.http.other.OkHttpNetworkFetcher;
import com.doumee.lib_coremodel.util.SpUtil;
-import com.doumee.keyCabinet.bean.ConfigBean;
import com.doumee.keyCabinet.bean.MemberBean;
import com.doumee.keyCabinet.utils.LanguageUtil;
import com.facebook.fresco.helper.Phoenix;
@@ -38,6 +40,7 @@
import java.io.File;
import java.util.HashSet;
+import java.util.Random;
import java.util.Set;
import dagger.hilt.android.HiltAndroidApp;
@@ -151,7 +154,7 @@
return;
}
timerCallBack = callBack;
- countTimer = new CountDownTimer(configBean.getBackHomeTime()*1000, 1*1000) {
+ countTimer = new CountDownTimer(60*1000, 1*1000) {
@Override
public void onTick(long millisUntilFinished) {
//Timber.tag("CountTimer==>").d(millisUntilFinished+"");
@@ -192,28 +195,16 @@
}
}
- private static ConfigBean configBean;
- public static void saveConfigBean(ConfigBean bean){
+ private static DevConfigBean configBean;
+ public static void saveConfigBean(DevConfigBean bean){
configBean = bean;
}
- public static ConfigBean getConfigBean(){
+ public static DevConfigBean getConfigBean(){
if(configBean==null){
- configBean = new ConfigBean();
+ configBean = new DevConfigBean();
}
return configBean;
- }
-
- private static MemberBean memberBean;
- public static void saveMemberBean(MemberBean bean){
- memberBean = bean;
- }
-
- public static MemberBean getMemberBean(){
- if(memberBean==null){
- memberBean = new MemberBean();
- }
- return memberBean;
}
private static UsbDevice customDevice;
@@ -226,13 +217,24 @@
customDevice = device;
}
- private static String cookie;
+ private static LoginBean loginBean;
- public static String getCookie() {
- return cookie;
+ public static LoginBean getLoginBean() {
+ if(loginBean==null){
+ loginBean = new LoginBean();
+ }
+ return loginBean;
}
- public static void setCookie(String cookie) {
- MApplication.cookie = cookie;
+ public static void setLoginBean(LoginBean cookie) {
+ MApplication.loginBean = cookie;
+ }
+
+ private static Random random;
+ public static boolean nextBoolean(){
+ if(random==null){
+ random = new Random();
+ }
+ return random.nextBoolean();
}
}
--
Gitblit v1.9.3