From 1078968985ae81e79ea149e3251841cd9bd54a1e Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期四, 11 四月 2024 15:24:20 +0800
Subject: [PATCH] Merge branch 'wxw_new' into dev-hxb
---
app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 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..c6d9263 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,10 @@
import android.content.Intent;
import android.os.Bundle;
-import android.text.TextUtils;
+import android.os.SystemClock;
+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 +15,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 +58,7 @@
intent.setClass(StartActivity.this, CPowerStationActivity.class);
}
- startActivity(intent);
-// finish();
+ openActivity(intent);
}
@Override
@@ -68,20 +72,32 @@
//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);
}
-
-
}
+ void openActivity(Intent intent) {
+ intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
+ startActivity(intent);
+ finish();
+ }
-}
\ No newline at end of file
+ @Override
+ protected void onCreate(@Nullable Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setTheme(R.style.NoAnimationTheme);
+ }
+
+ @Override
+ protected void onDestroy() {
+ super.onDestroy();
+ overridePendingTransition(0, 0);
+ }
+}
--
Gitblit v1.8.0