2023年11月06日16:37:26

mac

2023-11-06 ddd686a24cf45ca91aebcaf07c5b2b347b0cd455

2023年11月06日16:37:26

app启动读取自动化列表

 HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/bean/eventbus/BaseEventBus.java

File was renamed from app/src/main/java/com/hdl/photovoltaic/bean/BaseEventBus.java
@@ -1,10 +1,6 @@
package com.hdl.photovoltaic.bean;
package com.hdl.sdk.link.core.bean.eventbus;

/**
 * 事件分发专用对象
 */
public class BaseEventBus {

    private String topic;
    private String type;
    private Object data;

 HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/utils/mqtt/MqttRecvClient.java

@@ -7,6 +7,7 @@


import com.hdl.sdk.link.common.utils.LogUtils;

import com.hdl.sdk.link.core.bean.LinkPacket;

import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;

import com.hdl.sdk.link.core.bean.eventbus.EventBindMiniRemoteSuccessInfo;

import com.hdl.sdk.link.core.bean.eventbus.EventNotifyRefreshGatewayAesKeyInfo;

import com.hdl.sdk.link.core.bean.gateway.GatewayBean;

@@ -208,9 +209,13 @@
                return;

            }

            LogUtils.d(TAG, "网关重连mqtt秘钥更新通知->" + topic);

            EventNotifyRefreshGatewayAesKeyInfo eventNotifyRefreshGatewayAesKeyInfo = new EventNotifyRefreshGatewayAesKeyInfo();

            eventNotifyRefreshGatewayAesKeyInfo.setGatewayId(topics[2]);

            EventBus.getDefault().post(eventNotifyRefreshGatewayAesKeyInfo);

            BaseEventBus baseEventBus=new BaseEventBus();

            baseEventBus.setTopic(topic);

            EventBus.getDefault().post(baseEventBus);



//            EventNotifyRefreshGatewayAesKeyInfo eventNotifyRefreshGatewayAesKeyInfo = new EventNotifyRefreshGatewayAesKeyInfo();

//            eventNotifyRefreshGatewayAesKeyInfo.setGatewayId(topics[2]);

//            EventBus.getDefault().post(eventNotifyRefreshGatewayAesKeyInfo);

            return;

        }




 app/src/main/java/com/hdl/photovoltaic/base/BaseActivity.java

@@ -9,11 +9,11 @@
import androidx.appcompat.app.AppCompatActivity;

import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.bean.BaseEventBus;
import com.hdl.photovoltaic.listener.BaseView;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.utils.AppManagerUtils;
import com.hdl.photovoltaic.widget.LoadingDialog;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;

import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;

 app/src/main/java/com/hdl/photovoltaic/base/BaseFragment.java

@@ -15,10 +15,10 @@
import androidx.lifecycle.Lifecycle;

import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.bean.BaseEventBus;
import com.hdl.photovoltaic.listener.BaseView;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.widget.LoadingDialog;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;


import org.greenrobot.eventbus.EventBus;

 app/src/main/java/com/hdl/photovoltaic/internet/api/HttpApi.java

@@ -66,7 +66,7 @@
    //region -----用户管理---------
    //登录
    public static final String C_POST_Login = "/smart-footstone/member/oauth/login";
    //退出登录
    //注册账号
    public static final String C_POST_GET_OAUTH_REGISTER = "/smart-footstone/member/oauth/register";
    //用户找回密码 忘记密码,通过邮箱和手机号找回
    public static final String C_POST_FORGET_PROGRAM_PWD = "/smart-footstone/member/oauth/forgetPwd";

 app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java

@@ -5,15 +5,12 @@

import com.google.gson.Gson;
import com.google.gson.JsonObject;
import com.hdl.linkpm.sdk.core.callback.IResponseCallBack;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
import com.hdl.linkpm.sdk.user.bean.HDLLoginBean;
import com.hdl.linkpm.sdk.user.bean.HDLUserRegionBean;
import com.hdl.linkpm.sdk.user.bean.ImageSubmitInfo;
import com.hdl.linkpm.sdk.user.callback.ILoginCallBack;
import com.hdl.linkpm.sdk.user.callback.IRegionByAccountCallBack;
import com.hdl.linkpm.sdk.user.controller.HDLPMUserController;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.internet.HttpClient;
import com.hdl.photovoltaic.internet.api.HttpApi;
@@ -554,9 +551,10 @@
    /**
     * 退出登录时调用，清除推送数据
     */
    public void SignOutClearData() {
    public void signOutClearData() {
        String requestUrl = HttpApi.POST_GET_IMAGE_LOGOUT;
        //通知云端，已经退出登陆
        HttpClient.getInstance().requestHttp(requestUrl, new JsonObject().toString(), null);
    }

    public boolean isPhone(String phone) {

 app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java

@@ -5,12 +5,9 @@
import android.util.Log;

import com.google.gson.Gson;
import com.google.gson.JsonObject;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.photovoltaic.HDLApp;
import com.hdl.photovoltaic.bean.BaseEventBus;
import com.hdl.photovoltaic.bean.ModBusBean;
import com.hdl.photovoltaic.config.ConstantManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.listener.LinkCallBack;
@@ -21,11 +18,11 @@
import com.hdl.photovoltaic.utils.WifiUtils;
import com.hdl.sdk.link.common.exception.HDLLinkCode;
import com.hdl.sdk.link.common.exception.HDLLinkException;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
import com.hdl.sdk.link.core.callback.GatewayCallBack;
import com.hdl.sdk.link.core.callback.ModbusCallBack;
import com.hdl.sdk.link.core.connect.HDLModBusConnect;
import com.hdl.sdk.link.core.utils.mqtt.MqttRecvClient;
import com.hdl.sdk.link.gateway.HDLLinkLocalGateway;

import org.greenrobot.eventbus.EventBus;

 app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java

@@ -7,6 +7,7 @@
import android.content.pm.PackageManager;
import android.os.Bundle;
import android.os.Process;
import android.text.TextUtils;
import android.view.View;

import com.google.gson.Gson;
@@ -30,6 +31,7 @@
import com.hdl.sdk.link.HDLLinkLocalSdk;
import com.hdl.sdk.link.common.event.EventListener;
import com.hdl.sdk.link.core.bean.ModbusResponse;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
import com.hdl.sdk.link.core.bean.eventbus.EventNotifyRefreshGatewayAesKeyInfo;
import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
import com.hdl.sdk.link.core.config.HDLLinkConfig;
@@ -209,7 +211,7 @@
                    if (response.getTopic() == null) {
                        return;
                    }
                    HdlLogLogic.print("监听到的数据==="+new Gson().toJson(response),false);
                    HdlLogLogic.print("监听到的数据===" + new Gson().toJson(response), false);
//                    if (response.getTopic().endsWith("custom/native/inverter/up")) {
                    HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
                    uniCallBackBaseBean.setType(response.getTopic());
@@ -237,22 +239,30 @@

            @Override
            public void onFailure(HDLException e) {
                HdlLogLogic.print("读取mqtt远程信息失败==="+e.getMessage(), e.getCode(),true);
                HdlLogLogic.print("读取mqtt远程信息失败===" + e.getMessage(), e.getCode(), true);
            }
        });
    }

    @Subscribe(threadMode = ThreadMode.MAIN)
    public void onEventMessage(EventNotifyRefreshGatewayAesKeyInfo event) {
    public void onEventMessage(BaseEventBus event) {
        //网关更新mqtt秘钥更新通知
        if (event == null) {
            return;
        }
        if (TextUtils.isEmpty(event.getTopic())) {
            return;
        }
        String[] topics = event.getTopic().split("/");
        //主题不符合规则不处理
        if (topics.length < 3) {
            return;
        }
        int index = -1;
        List<GatewayBean> list = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList();
        for (int i = 0; i < list.size(); i++) {
            GatewayBean gatewayBean = list.get(i);
            if (gatewayBean.getGatewayId().equals(event.getGatewayId())) {
            if (gatewayBean.getGatewayId().equals(topics[2])) {
                index = i;
                break;
            }

 app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java

@@ -14,7 +14,6 @@
import com.google.gson.Gson;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.bean.BaseEventBus;
import com.hdl.photovoltaic.databinding.FragmentHouseListBinding;
import com.hdl.photovoltaic.base.CustomBaseFragment;
import com.hdl.photovoltaic.enums.ShowErrorMode;
@@ -28,6 +27,7 @@
import com.hdl.photovoltaic.ui.bean.HouseIdBean;
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.utils.PermissionUtils;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
import com.hdl.sdk.link.core.utils.mqtt.MqttRecvClient;

import java.util.ArrayList;