From 1311774b7c71fe94016a7b2cdf508e3d39114422 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 12 四月 2024 09:46:06 +0800
Subject: [PATCH] Merge branch 'dev-hxb' into wjc_new
---
app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
index 976caa2..0fab7ea 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
@@ -4,6 +4,7 @@
import android.content.Intent;
import android.os.Bundle;
import android.os.SystemClock;
+import android.text.TextUtils;
import android.util.Log;
import androidx.annotation.Nullable;
@@ -40,8 +41,8 @@
setStatusBarTextColor();
//鍒濆鍖栨湇鍔″櫒鍩熷悕锛堢敤鎴锋敞鍐屾墍鍦ㄦ湇鍔″櫒鍩熷悕鍦板潃锛�
AppConfigManage.setUserRegionUrl(HDLLinkPMUser.getInstance().getUserRegionUrl());
- //7澶╁唴鍏嶇櫥褰�
- if (UserConfigManage.getInstance().isAutoLogin()) {
+ //鍒ゆ柇AccessToken鏄惁null
+ if (!TextUtils.isEmpty(HDLLinkPMUser.getInstance().getAccessToken())) {
// showLoading();
HdlResidenceLogic.getInstance().getResidenceIdList("", "", new CloudCallBeak<List<HouseIdBean>>() {
@Override
@@ -83,21 +84,20 @@
}
}
+ @Override
+ public void startActivity(Intent intent) {
+ super.startActivity(intent);
+ overridePendingTransition(0, 0);
+ }
+
void openActivity(Intent intent) {
intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
startActivity(intent);
finish();
}
-
- @Override
- protected void onCreate(@Nullable Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setTheme(R.style.NoAnimationTheme);
- }
-
@Override
protected void onDestroy() {
super.onDestroy();
overridePendingTransition(0, 0);
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0