From 15f5680b532238290d0adf095a93e5af1c5f1203 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 07 二月 2025 17:14:57 +0800
Subject: [PATCH] 1.添加显示隐藏取水口、分水房功能 2.完善图例自定义控件功能和显示 3.处理工单添加选择时间功能
---
app/src/main/java/com/dayu/pipirrapp/activity/SplashScreenActivity.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/app/src/main/java/com/dayu/pipirrapp/activity/SplashScreenActivity.java b/app/src/main/java/com/dayu/pipirrapp/activity/SplashScreenActivity.java
index a08a729..ba7e4ac 100644
--- a/app/src/main/java/com/dayu/pipirrapp/activity/SplashScreenActivity.java
+++ b/app/src/main/java/com/dayu/pipirrapp/activity/SplashScreenActivity.java
@@ -12,7 +12,7 @@
import com.dayu.pipirrapp.bean.db.LoginBean;
import com.dayu.pipirrapp.dao.DaoSingleton;
import com.dayu.pipirrapp.databinding.ActivitySplashScreenBinding;
-import com.dayu.pipirrapp.utils.CommonData;
+import com.dayu.pipirrapp.utils.CommonKeyName;
import com.dayu.pipirrapp.utils.SharedPreferencesHelper;
/**
@@ -30,15 +30,24 @@
binding = ActivitySplashScreenBinding.inflate(LayoutInflater.from(this));
setContentView(binding.getRoot());
new Handler().postDelayed(() -> {
- LoginBean loginBean = DaoSingleton.getInstance(SplashScreenActivity.this).loginDao().findFirst();
- String token = SharedPreferencesHelper.getInstance(SplashScreenActivity.this).get(CommonData.Token, "");
- if (loginBean != null && !TextUtils.isEmpty(token)) {
- startMainActivity();
- MyApplication.myApplication.token = token;
- } else {
+ try {
+ LoginBean loginBean = DaoSingleton.getInstance(SplashScreenActivity.this).loginDao().findFirst();
+ String token = SharedPreferencesHelper.getInstance(SplashScreenActivity.this).get(CommonKeyName.Token, "");
+ if (loginBean != null && !TextUtils.isEmpty(token)) {
+ startMainActivity();
+ MyApplication.myApplication.token = token;
+ MyApplication.myApplication.userId = loginBean.getUserID();
+ } else {
+ startLoginActivity();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
startLoginActivity();
}
SplashScreenActivity.this.finish();
+// Intent intent = new Intent(this, OrderDealActivity.class);
+// startActivity(intent);
+// SplashScreenActivity.this.finish();
}, 1000);
}
--
Gitblit v1.8.0