From 21e38bfe17d3077d7ab0e05ee065f59547536692 Mon Sep 17 00:00:00 2001 From: zuoxiao <470321431@qq.com> Date: 星期二, 03 十二月 2024 10:33:19 +0800 Subject: [PATCH] 1.添加当前巡检状态的功能。 2.修复工单界面刷新已完成列表导致未完成列表数据被清除的bug --- app/src/main/java/com/dayu/pipirrapp/activity/SplashScreenActivity.java | 29 +++++++++++++++++------------ 1 files changed, 17 insertions(+), 12 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 c9602bd..1fe2024 100644 --- a/app/src/main/java/com/dayu/pipirrapp/activity/SplashScreenActivity.java +++ b/app/src/main/java/com/dayu/pipirrapp/activity/SplashScreenActivity.java @@ -30,18 +30,23 @@ 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(CommonKeyName.Token, ""); -// if (loginBean != null && !TextUtils.isEmpty(token)) { -// startMainActivity(); -// MyApplication.myApplication.token = token; -// MyApplication.myApplication.userId = loginBean.getUserID(); -// } else { -// startLoginActivity(); -// } - Intent intent = new Intent(this, OrderDealActivity.class); - startActivity(intent); - SplashScreenActivity.this.finish(); + 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(); + } +// Intent intent = new Intent(this, OrderDealActivity.class); +// startActivity(intent); +// SplashScreenActivity.this.finish(); }, 1000); } -- Gitblit v1.8.0