From e808338698915f51ff128e8861d7d580ae1a84b1 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 22 五月 2024 16:24:20 +0800
Subject: [PATCH] Merge branch 'wjc_new' into wxw_new
---
app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java | 46 ++++++++++++++++++++++++++++++++++------------
1 files changed, 34 insertions(+), 12 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 8040f0b..a448287 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
@@ -3,6 +3,7 @@
import android.content.Intent;
import android.os.Bundle;
+import android.text.TextUtils;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
@@ -16,6 +17,11 @@
import java.util.List;
+
+
+/**
+ * App鍚姩椤碉紙鐩殑鏄负浜嗚鐢ㄦ埛鐐瑰嚮APP鍥炬爣鐨勬椂鍊欐湁涓�涓灛闂村搷搴旂殑浜や簰浣撻獙銆傦級
+ */
public class StartActivity extends CustomBaseActivity {
@Override
@@ -29,8 +35,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
@@ -41,13 +47,13 @@
Intent intent = new Intent();
if (UserConfigManage.getInstance().isBAccount()) {
//瀹夎鍟嗚烦杞晫闈�
- intent.setClass(StartActivity.this, MyPowerStationActivity.class);
+ intent.setClass(StartActivity.this, BPowerStationActivity.class);
} else {
//C绔敤鎴疯烦杞晫闈�
intent.setClass(StartActivity.this, CPowerStationActivity.class);
+
}
- startActivity(intent);
- finish();
+ openActivity(intent);
}
@Override
@@ -56,25 +62,41 @@
Intent intent = new Intent();
if (UserConfigManage.getInstance().isBAccount()) {
//瀹夎鍟嗚烦杞晫闈�
- intent.setClass(StartActivity.this, MyPowerStationActivity.class);
+ intent.setClass(StartActivity.this, BPowerStationActivity.class);
} else {
//C绔敤鎴疯烦杞晫闈�
intent.setClass(StartActivity.this, CPowerStationActivity.class);
}
- startActivity(intent);
- finish();
+ openActivity(intent);
}
});
} else {
Intent intent = new Intent();
- intent.setClass(this, HomeLoginActivity.class);
- startActivity(intent);
- finish();
+ intent.setClass(this, LoginActivity.class);
+ openActivity(intent);
}
}
+ @Override
+ public void startActivity(Intent intent) {
+ super.startActivity(intent);
+ overridePendingTransition(0, 0);
+ }
-}
\ No newline at end of file
+ void openActivity(Intent intent) {
+ intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
+ startActivity(intent);
+ finish();
+ }
+ @Override
+ protected void onDestroy() {
+ super.onDestroy();
+ overridePendingTransition(0, 0);
+ }
+
+
+
+}
--
Gitblit v1.8.0