From 90d5f028ccdaaaf64286f9d632cb335a4d0544b9 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 07 一月 2025 09:40:52 +0800
Subject: [PATCH] Merge branch '1.5.1'
---
app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java | 60 +++++++++++++++++++++++++-----------------------------------
1 files changed, 25 insertions(+), 35 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 fbc13a5..4d8d701 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
@@ -19,7 +19,6 @@
import java.util.List;
-
/**
* App鍚姩椤碉紙鐩殑鏄负浜嗚鐢ㄦ埛鐐瑰嚮APP鍥炬爣鐨勬椂鍊欐湁涓�涓灛闂村搷搴旂殑浜や簰浣撻獙銆傦級
*/
@@ -32,48 +31,39 @@
@Override
public void onBindView(Bundle savedInstanceState) {
-// setStatusBarTranslucent();
- setNotificationBarBackgroundColor(CustomColor.white);
- setStatusBarTextColor();
-
+ setStatusBarTranslucent();
+ getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
//鍒濆鍖栨湇鍔″櫒鍩熷悕锛堢敤鎴锋敞鍐屾墍鍦ㄦ湇鍔″櫒鍩熷悕鍦板潃锛�
AppConfigManage.setUserRegionUrl(HDLLinkPMUser.getInstance().getUserRegionUrl());
//鍒ゆ柇AccessToken鏄惁null
if (!TextUtils.isEmpty(HDLLinkPMUser.getInstance().getAccessToken())) {
-// showLoading();
- HdlResidenceLogic.getInstance().getResidenceIdList("", "", new CloudCallBeak<List<HouseIdBean>>() {
- @Override
- public void onSuccess(List<HouseIdBean> obj) {
-// hideLoading();
- HdlResidenceLogic.getInstance().setHouseIdList(obj);
-
- Intent intent = new Intent();
- if (UserConfigManage.getInstance().isBAccount()) {
- //瀹夎鍟嗚烦杞晫闈�
- intent.setClass(StartActivity.this, BPowerStationActivity.class);
- } else {
- //C绔敤鎴疯烦杞晫闈�
+ if (UserConfigManage.getInstance().isBAccount()) {
+ //瀹夎鍟嗚烦杞晫闈�
+ Intent intent = new Intent();
+ intent.setClass(StartActivity.this, BPowerStationActivity.class);
+ openActivity(intent);
+ } else {
+ //C绔敤鎴疯烦杞晫闈�
+// showLoading();
+ HdlResidenceLogic.getInstance().getResidenceIdList("", "", new CloudCallBeak<List<HouseIdBean>>() {
+ @Override
+ public void onSuccess(List<HouseIdBean> obj) {
+// hideLoading();
+ HdlResidenceLogic.getInstance().setHouseIdList(obj);
+ Intent intent = new Intent();
intent.setClass(StartActivity.this, CPowerStationActivity.class);
-
+ openActivity(intent);
}
- openActivity(intent);
- }
- @Override
- public void onFailure(HDLException e) {
-// hideLoading();
- Intent intent = new Intent();
- if (UserConfigManage.getInstance().isBAccount()) {
- //瀹夎鍟嗚烦杞晫闈�
- intent.setClass(StartActivity.this, BPowerStationActivity.class);
- } else {
- //C绔敤鎴疯烦杞晫闈�
+ @Override
+ public void onFailure(HDLException e) {
+// hideLoading();
+ Intent intent = new Intent();
intent.setClass(StartActivity.this, CPowerStationActivity.class);
+ openActivity(intent);
}
- openActivity(intent);
- }
- });
-
+ });
+ }
} else {
Intent intent = new Intent();
intent.setClass(this, LoginActivity.class);
@@ -94,12 +84,12 @@
startActivity(intent);
finish();
}
+
@Override
protected void onDestroy() {
super.onDestroy();
overridePendingTransition(0, 0);
}
-
}
--
Gitblit v1.8.0