From 1311774b7c71fe94016a7b2cdf508e3d39114422 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 12 四月 2024 09:46:06 +0800
Subject: [PATCH] Merge branch 'dev-hxb' into wjc_new
---
app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 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..0fab7ea 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
@@ -3,7 +3,11 @@
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;
@@ -12,10 +16,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;
@@ -53,8 +59,7 @@
intent.setClass(StartActivity.this, CPowerStationActivity.class);
}
- startActivity(intent);
-// finish();
+ openActivity(intent);
}
@Override
@@ -68,20 +73,31 @@
//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();
+ 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