mac
2024-04-28 a034e242fe844a1ca45d2a28710cb7face1f8fe6
app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
@@ -5,7 +5,10 @@
import android.os.Process;
import android.os.SystemClock;
import android.text.TextUtils;
import android.util.Log;
import androidx.annotation.Nullable;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
@@ -87,7 +90,28 @@
    protected void onResume() {
        super.onResume();
        //启动页与mainActivity样式一样,这样启动页和mainActivity看上去是一个界面,目的是为了mainActivity遮住下一页;
        AppManagerUtils.getAppManager().finishActivity(StartActivity.class);
//        AppManagerUtils.getAppManager().finishActivity(StartActivity.class);
//        this.portConflictDialog();
    }
    public void startAppAutomaticallyOpenUni() {
        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();
    }
    @Subscribe(threadMode = ThreadMode.MAIN)
@@ -99,7 +123,7 @@
        if (TextUtils.isEmpty(event.getTopic())) {
            return;
        }
        //网关更新mqtt秘钥更新通知
        //网关mqtt秘钥更新通知
        if (event.getTopic().contains("/custom/mqtt/secret/change")) {
            String[] topics = event.getTopic().split("/");
            //主题不符合规则不处理
@@ -155,6 +179,9 @@
                HdlThreadLogic.runSubThread(new Runnable() {
                    @Override
                    public void run() {
                        //防止app启动的时候没有网络(app也登录不了),导致获取不了mqtt远程连接信息;
                        initMqttClient();
                        HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(UserConfigManage.getInstance().getHomeId(), new CloudCallBeak<List<GatewayBean>>() {
                            @Override
                            public void onSuccess(List<GatewayBean> obj) {
@@ -175,11 +202,15 @@
        }
    }
    /**
     * C端启动App自动打开小程序电站详情界面
     */
    private void startAppAutomaticallyOpenUni() {
    private void startAppAutomaticallyOpenUni(boolean delay) {
        if (delay) {
            SystemClock.sleep(2000);
        }
        List<HouseIdBean> HouseIdList = HdlResidenceLogic.getInstance().getHouseIdList();
        if (HouseIdList.size() == 0) {
            String path = HDLUniMP.UNI_EVENT_OPEN_HOME_Null_C;
@@ -197,8 +228,6 @@
            String path = HDLUniMP.UNI_EVENT_OPEN_HOME_DETAILS_C + "?homeId=" + houseIdBean.getHomeId() + "&homeName=" + houseIdBean.getHomeName() + "&powerStationStatus=" + houseIdBean.getPowerStationStatus();
            HdlUniLogic.getInstance().openUniMP(path, null);
        }
    }
//    /**
@@ -314,7 +343,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();
                    }
                }
@@ -396,4 +425,4 @@
    }
}
}