From 4598b51c90c695c9ccbe5350a84e4a46b9d8e587 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 22 五月 2024 20:19:02 +0800
Subject: [PATCH] 2024年05月22日20:18:54

---
 app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java |   39 +++++++++++++++++++++++++++------------
 1 files changed, 27 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 a8a220e..a448287 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
@@ -13,11 +13,11 @@
 import com.hdl.photovoltaic.config.UserConfigManage;
 import com.hdl.photovoltaic.listener.CloudCallBeak;
 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 java.util.List;
+
+
 
 /**
  * App鍚姩椤碉紙鐩殑鏄负浜嗚鐢ㄦ埛鐐瑰嚮APP鍥炬爣鐨勬椂鍊欐湁涓�涓灛闂村搷搴旂殑浜や簰浣撻獙銆傦級
@@ -47,14 +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
@@ -63,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