Merge branch 'wxw_new' into dev-hxb

hxb

2024-04-11 1078968985ae81e79ea149e3251841cd9bd54a1e

 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客户端
@@ -89,7 +89,7 @@
    @Override
    protected void onCreate(@Nullable Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
//        setTheme(R.style.NoAnimationTheme);
        setTheme(R.style.NoAnimationTheme);
    }

    @Override
@@ -98,13 +98,25 @@
        //启动页与mainActivity样式一样，这样启动页和mainActivity看上去是一个界面，目的是为了mainActivity遮住下一页；
//        AppManagerUtils.getAppManager().finishActivity(StartActivity.class);
        this.portConflictDialog();
       startAppAutomaticallyOpenUni();
    }
    public void startAppAutomaticallyOpenUni() {
        //低于安卓14版本
        if (android.os.Build.VERSION.SDK_INT < 34) {
            startAppAutomaticallyOpenUni(false);
        } else {
            startAppAutomaticallyOpenUni(true);
            new Thread(new Runnable() {
                @Override
                public void run() {
                    SystemClock.sleep(10);
                    runOnUiThread(new Runnable() {
                        @Override
                        public void run() {
                            startAppAutomaticallyOpenUni(true);
                        }
                    });
                }
            }).start();
        }
    }

@@ -334,7 +346,7 @@
                @Override
                public void onSuccess(MqttInfo info) {
                    if (info != null) {
                        MqttRecvClient.getInstance().setConnectParam(info.getUrl(), info.getClientId(), info.getUserName(), info.getPassWord());
                        MqttRecvClient.getInstance().setConnectParam(info.getUrl(), info.getClientId(), info.getUserName(), info.getPassWord(),null);
                        MqttRecvClient.getInstance().connect();
                    }
                }
@@ -416,22 +428,4 @@
    }


    /**
     * 端口冲突
     */
    private void portConflictDialog() {
        if (!HDLUdpConnect.getInstance().isBindSuccess()) {
            ConfirmationTipDialog dialog = new ConfirmationTipDialog(_mActivity);
            dialog.show();
            dialog.setTitle(getString(R.string.home_account_registered_successfully));
            dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
                @Override
                public void Confirm() {
                    finish();
                }
            });
        }
    }


}
}