From 1ef9c12f9e1edd46fd3edac5363d3519a5e0c05f Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 30 五月 2024 21:12:37 +0800
Subject: [PATCH] Merge branch 'wjc_new' into develop_new
---
app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java | 76 +++++++++++++++++++++++++++-----------
1 files changed, 54 insertions(+), 22 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 3b8f630..f610bff 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
@@ -1,29 +1,27 @@
package com.hdl.photovoltaic.ui;
-import android.content.ComponentName;
-import android.content.Context;
import android.content.Intent;
-import android.content.ServiceConnection;
import android.os.Bundle;
-import android.os.IBinder;
+import android.text.TextUtils;
import com.hdl.linkpm.sdk.core.exception.HDLException;
-import com.hdl.photovoltaic.HDLApp;
+import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
+import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
-import com.hdl.photovoltaic.internet.HttpServer.MyNanoHttpServer;
-import com.hdl.photovoltaic.internet.HttpServer.MyNanoHttpService;
import com.hdl.photovoltaic.listener.CloudCallBeak;
-import com.hdl.photovoltaic.other.HdlOtaLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
-import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.ui.bean.HouseIdBean;
-import com.hdl.photovoltaic.utils.AppManagerUtils;
import java.util.List;
+
+
+/**
+ * App鍚姩椤碉紙鐩殑鏄负浜嗚鐢ㄦ埛鐐瑰嚮APP鍥炬爣鐨勬椂鍊欐湁涓�涓灛闂村搷搴旂殑浜や簰浣撻獙銆傦級
+ */
public class StartActivity extends CustomBaseActivity {
@Override
@@ -33,39 +31,73 @@
@Override
public void onBindView(Bundle savedInstanceState) {
- //7澶╁唴鍏嶇櫥褰�
- if (UserConfigManage.getInstance().isAutoLogin()) {
+ setNotificationBarBackgroundColor(CustomColor.white);
+ setStatusBarTextColor();
+
+ //鍒濆鍖栨湇鍔″櫒鍩熷悕锛堢敤鎴锋敞鍐屾墍鍦ㄦ湇鍔″櫒鍩熷悕鍦板潃锛�
+ 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();
- intent.setClass(StartActivity.this, MyPowerStationActivity.class);
- startActivity(intent);
- finish();
+ if (UserConfigManage.getInstance().isBAccount()) {
+ //瀹夎鍟嗚烦杞晫闈�
+ intent.setClass(StartActivity.this, BPowerStationActivity.class);
+ } else {
+ //C绔敤鎴疯烦杞晫闈�
+ intent.setClass(StartActivity.this, CPowerStationActivity.class);
+
+ }
+ openActivity(intent);
}
@Override
public void onFailure(HDLException e) {
// hideLoading();
Intent intent = new Intent();
- intent.setClass(StartActivity.this, MyPowerStationActivity.class);
- startActivity(intent);
- finish();
+ if (UserConfigManage.getInstance().isBAccount()) {
+ //瀹夎鍟嗚烦杞晫闈�
+ intent.setClass(StartActivity.this, BPowerStationActivity.class);
+ } else {
+ //C绔敤鎴疯烦杞晫闈�
+ intent.setClass(StartActivity.this, CPowerStationActivity.class);
+ }
+ 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