Merge branch 'dev-hxb' into wjc_new

mac

2024-04-12 1311774b7c71fe94016a7b2cdf508e3d39114422

 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)