From a97bfc5b68649e36f7ad425211a98bdb8923c651 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期四, 11 四月 2024 17:56:16 +0800
Subject: [PATCH] 完善打开跳的问题
---
app/src/main/res/anim/dcloud_unimp_close_exit.xml | 2
app/src/main/res/anim/dcloud_unimp_open_enter.xml | 2
app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java | 14 +++---
app/src/main/AndroidManifest.xml | 1
app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java | 41 ++++++++------------
app/src/main/res/anim/dcloud_unimp_host_close_exit.xml | 2
app/src/main/res/anim/dcloud_unimp_host_open_enter.xml | 2
7 files changed, 28 insertions(+), 36 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f0e4c06..bdce55a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -144,7 +144,6 @@
android:exported="false" />
<activity
android:name=".ui.MyPowerStationActivity"
- android:theme="@style/DCloudMPHostActivityTheme"
android:exported="false" />
<activity
android:name=".ui.HomeLoginActivity"
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
index 9238a58..87db5a5 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
@@ -77,7 +77,7 @@
setNotificationBarBackgroundColor(CustomColor.white);
setStatusBarTextColor();
//C绔惎鍔ˋpp鑷姩鎵撳紑灏忕▼搴忕數绔欒鎯呯晫闈�
-// startAppAutomaticallyOpenUni();
+ startAppAutomaticallyOpenUni();
//娉ㄥ唽鐩戝惉
this.registerAllTopicsListener();
//鍒濆鍖杕qtt瀹㈡埛绔�
@@ -87,37 +87,30 @@
}
@Override
- protected void onCreate(@Nullable Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setTheme(R.style.NoAnimationTheme);
- }
-
- @Override
protected void onResume() {
super.onResume();
//鍚姩椤典笌mainActivity鏍峰紡涓�鏍凤紝杩欐牱鍚姩椤靛拰mainActivity鐪嬩笂鍘绘槸涓�涓晫闈紝鐩殑鏄负浜唌ainActivity閬綇涓嬩竴椤碉紱
// AppManagerUtils.getAppManager().finishActivity(StartActivity.class);
- this.portConflictDialog();
- startAppAutomaticallyOpenUni();
+// this.portConflictDialog();
}
public void startAppAutomaticallyOpenUni() {
- //浣庝簬瀹夊崜14鐗堟湰
- if (android.os.Build.VERSION.SDK_INT < 34) {
- startAppAutomaticallyOpenUni(false);
- } else {
- new Thread(new Runnable() {
- @Override
- public void run() {
- SystemClock.sleep(10);
- runOnUiThread(new Runnable() {
- @Override
- public void run() {
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ SystemClock.sleep(10);
+ runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ //浣庝簬瀹夊崜14鐗堟湰
+ if (android.os.Build.VERSION.SDK_INT < 34) {
+ startAppAutomaticallyOpenUni(false);
+ } else {
startAppAutomaticallyOpenUni(true);
}
- });
- }
- }).start();
- }
+ }
+ });
+ }
+ }).start();
}
@Subscribe(threadMode = ThreadMode.MAIN)
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 c6d9263..0fab7ea 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
@@ -4,6 +4,7 @@
import android.content.Intent;
import android.os.Bundle;
import android.os.SystemClock;
+import android.text.TextUtils;
import android.util.Log;
import androidx.annotation.Nullable;
@@ -83,18 +84,17 @@
}
}
+ @Override
+ public void startActivity(Intent intent) {
+ super.startActivity(intent);
+ overridePendingTransition(0, 0);
+ }
+
void openActivity(Intent intent) {
intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
startActivity(intent);
finish();
}
-
- @Override
- protected void onCreate(@Nullable Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setTheme(R.style.NoAnimationTheme);
- }
-
@Override
protected void onDestroy() {
super.onDestroy();
diff --git a/app/src/main/res/anim/dcloud_unimp_close_exit.xml b/app/src/main/res/anim/dcloud_unimp_close_exit.xml
index d3ee64d..2b148e2 100644
--- a/app/src/main/res/anim/dcloud_unimp_close_exit.xml
+++ b/app/src/main/res/anim/dcloud_unimp_close_exit.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<translate xmlns:android="http://schemas.android.com/apk/res/android"
- android:duration="200"
+ android:duration="10"
android:fromXDelta="0%p"
android:toXDelta="0%p" />
diff --git a/app/src/main/res/anim/dcloud_unimp_host_close_exit.xml b/app/src/main/res/anim/dcloud_unimp_host_close_exit.xml
index d3ee64d..2b148e2 100644
--- a/app/src/main/res/anim/dcloud_unimp_host_close_exit.xml
+++ b/app/src/main/res/anim/dcloud_unimp_host_close_exit.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<translate xmlns:android="http://schemas.android.com/apk/res/android"
- android:duration="200"
+ android:duration="10"
android:fromXDelta="0%p"
android:toXDelta="0%p" />
diff --git a/app/src/main/res/anim/dcloud_unimp_host_open_enter.xml b/app/src/main/res/anim/dcloud_unimp_host_open_enter.xml
index d3ee64d..2b148e2 100644
--- a/app/src/main/res/anim/dcloud_unimp_host_open_enter.xml
+++ b/app/src/main/res/anim/dcloud_unimp_host_open_enter.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<translate xmlns:android="http://schemas.android.com/apk/res/android"
- android:duration="200"
+ android:duration="10"
android:fromXDelta="0%p"
android:toXDelta="0%p" />
diff --git a/app/src/main/res/anim/dcloud_unimp_open_enter.xml b/app/src/main/res/anim/dcloud_unimp_open_enter.xml
index d3ee64d..2b148e2 100644
--- a/app/src/main/res/anim/dcloud_unimp_open_enter.xml
+++ b/app/src/main/res/anim/dcloud_unimp_open_enter.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<translate xmlns:android="http://schemas.android.com/apk/res/android"
- android:duration="200"
+ android:duration="10"
android:fromXDelta="0%p"
android:toXDelta="0%p" />
--
Gitblit v1.8.0