hxb
2024-04-11 a97bfc5b68649e36f7ad425211a98bdb8923c651
完善打开跳的问题
7个文件已修改
64 ■■■■■ 已修改文件
app/src/main/AndroidManifest.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/anim/dcloud_unimp_close_exit.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/anim/dcloud_unimp_host_close_exit.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/anim/dcloud_unimp_host_open_enter.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/anim/dcloud_unimp_open_enter.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
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"
app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
@@ -77,7 +77,7 @@
        setNotificationBarBackgroundColor(CustomColor.white);
        setStatusBarTextColor();
        //C端启动App自动打开小程序电站详情界面
//        startAppAutomaticallyOpenUni();
        startAppAutomaticallyOpenUni();
        //注册监听
        this.registerAllTopicsListener();
        //初始化mqtt客户端
@@ -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看上去是一个界面,目的是为了mainActivity遮住下一页;
//        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)
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();
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" />
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" />
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" />
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" />