From 4f7f99c6ea914bcd38de78bd8371be566026b905 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 26 二月 2025 15:54:14 +0800
Subject: [PATCH] -为按钮和列表项添加波纹效果，以获得更好的视觉反馈 -改进MapFragment中的底部布局动画 -在MapFragment中添加设备状态和RTU地址显示 -更新BaseListResult以支持泛型类型 -为设备数据添加IntakeListResult和IntakeResult -通过数据库支持增强标记位置更新功能 -添加电话拨号意图以分隔标记详细信息 -通过过期检查改进磁贴缓存 -添加问题报告的确认对话框 -更新登录活动以限制用户名长度 -为波纹效果和UI元素添加新颜色 -重构XML布局以使用新的波纹图 -改进MapFragment中的错误处理和用户反馈
---
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