From 5dfed3cf524a2bcacc19643c9af6d9fedc182420 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 06 八月 2024 09:03:12 +0800
Subject: [PATCH] 2024年08月06日09:03:10
---
app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java | 42 ++++++++++++++++++++++--------------------
1 files changed, 22 insertions(+), 20 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..ff89ce8 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
@@ -3,10 +3,8 @@
import android.content.Intent;
import android.os.Bundle;
-import android.os.SystemClock;
+import android.text.TextUtils;
import android.util.Log;
-
-import androidx.annotation.Nullable;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
@@ -15,14 +13,12 @@
import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.listener.CloudCallBeak;
-import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
-import com.hdl.photovoltaic.other.HdlUniLogic;
import com.hdl.photovoltaic.ui.bean.HouseIdBean;
-import com.hdl.photovoltaic.uni.HDLUniMP;
-import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
import java.util.List;
+
+
/**
* App鍚姩椤碉紙鐩殑鏄负浜嗚鐢ㄦ埛鐐瑰嚮APP鍥炬爣鐨勬椂鍊欐湁涓�涓灛闂村搷搴旂殑浜や簰浣撻獙銆傦級
@@ -36,12 +32,14 @@
@Override
public void onBindView(Bundle savedInstanceState) {
+
setNotificationBarBackgroundColor(CustomColor.white);
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
@@ -52,7 +50,7 @@
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);
@@ -67,7 +65,7 @@
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);
@@ -78,9 +76,17 @@
} else {
Intent intent = new Intent();
- intent.setClass(this, HomeLoginActivity.class);
+ intent.setClass(this, LoginActivity.class);
openActivity(intent);
}
+
+
+ }
+
+ @Override
+ public void startActivity(Intent intent) {
+ super.startActivity(intent);
+ overridePendingTransition(0, 0);
}
void openActivity(Intent intent) {
@@ -88,16 +94,12 @@
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