blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
mac
2024-05-22 4598b51c90c695c9ccbe5350a84e4a46b9d8e587 
 app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java


@@ -1,6 +1,5 @@


package com.hdl.photovoltaic.ui.powerstation;




import android.app.job.JobInfo;


import android.content.Intent;


import android.content.pm.PackageManager;


import android.os.Bundle;


@@ -38,7 +37,7 @@


import com.hdl.photovoltaic.other.HdlUniLogic;


import com.hdl.photovoltaic.ui.adapter.DeviceInfoAdapter;


import com.hdl.photovoltaic.ui.adapter.HouseInfoAdapter;


import com.hdl.photovoltaic.ui.bean.DeviceBean;


import com.hdl.photovoltaic.ui.bean.CloudInverterDeviceBean;


import com.hdl.photovoltaic.ui.bean.HouseIdBean;


import com.hdl.photovoltaic.ui.bean.StatusOverviewBean;


import com.hdl.photovoltaic.uni.HDLUniMP;


@@ -50,6 +49,7 @@


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


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


import com.hdl.sdk.link.core.utils.mqtt.MqttRecvClient;


import com.hdl.sdk.link.gateway.HDLLinkLocalGateway;




import org.greenrobot.eventbus.EventBus;


import org.greenrobot.eventbus.Subscribe;


@@ -70,7 +70,7 @@


    private DeviceInfoAdapter deviceInfoAdapter;




    private List<HouseIdBean> houseListBeanIDList;


    private List<DeviceBean> deviceInfoList;


    private List<CloudInverterDeviceBean> deviceInfoList;


    private int currentHouseListPage = 0; // 当前电站列表页码


    private int currentHouseListTotal = 0; // 电站列表总页码


    private boolean isHouseLoadingMore = false; // 标记电站列表正在加载更多数据


@@ -411,23 +411,38 @@


        //设备点击


        deviceInfoAdapter.setOnclickListener(new DeviceInfoAdapter.OnClickListener() {


            @Override


            public void onClick(int position, DeviceBean deviceBean) {


                GatewayBean gatewayBean = new GatewayBean();


                gatewayBean.setCategorySecondName(deviceBean.getCategorySecondName());


                gatewayBean.setDevice_mac(deviceBean.getOsn());


                gatewayBean.setDevice_model(deviceBean.getOmodel());


                gatewayBean.setOid(deviceBean.getOid());


                gatewayBean.setGatewayId(deviceBean.getGatewayId());


                gatewayBean.setAddresses(deviceBean.getAddresses());


                gatewayBean.setSid(deviceBean.getSid());


                gatewayBean.setDeviceId(deviceBean.getDeviceId());


                gatewayBean.setDevice_name(deviceBean.getName());


                gatewayBean.setDeviceStatus(deviceBean.getDeviceStatus());


                gatewayBean.setHomeId(deviceBean.getHomeId());


                gatewayBean.setDeviceType(deviceBean.getDeviceType());


                String jsonEncryption = URLEncodingUtils.encodeURIComponent(new Gson().toJson(gatewayBean));


                String path = HDLUniMP.UNI_EVENT_OPEN_DEVICE_DETAILS + "?inverterInfo=" + jsonEncryption;


                HdlUniLogic.getInstance().openUniMP(path, null);


            public void onClick(int position, CloudInverterDeviceBean deviceBean) {


//                GatewayBean gatewayBean = new GatewayBean();


//                gatewayBean.setCategorySecondName(deviceBean.getCategorySecondName());


//                gatewayBean.setDevice_mac(deviceBean.getOsn());


//                gatewayBean.setDevice_model(deviceBean.getOmodel());


//                gatewayBean.setOid(deviceBean.getOid());


//                gatewayBean.setGatewayId(deviceBean.getGatewayId());


//                gatewayBean.setAddresses(deviceBean.getAddresses());


//                gatewayBean.setSid(deviceBean.getSid());


//                gatewayBean.setDeviceId(deviceBean.getDeviceId());


//                gatewayBean.setDevice_name(deviceBean.getName());


//                gatewayBean.setDeviceStatus(deviceBean.getDeviceStatus());


//                gatewayBean.setHomeId(deviceBean.getHomeId());


//                gatewayBean.setSpk(deviceBean.getSpk());


//                gatewayBean.setDeviceType(deviceBean.getDeviceType());


                List<CloudInverterDeviceBean> newList = new ArrayList<>();


                newList.add(deviceBean);


                // //目的是为了获取拿到网关ID，mqtt通讯秘钥等信息，缓存本地逆变器列表里面，发送数据数据时自动去缓存列表里面去查找；


                HdlDeviceLogic.getInstance().setDeviceRemoteInfo(newList, deviceBean.getHomeId(), new CloudCallBeak<List<GatewayBean>>() {


                    @Override


                    public void onSuccess(List<GatewayBean> obj) {


                        GatewayBean newGatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(deviceBean.getOsn());


                        String jsonEncryption = URLEncodingUtils.encodeURIComponent(new Gson().toJson(newGatewayBean));


                        String path = HDLUniMP.UNI_EVENT_OPEN_DEVICE_DETAILS + "?inverterInfo=" + jsonEncryption;


                        HdlUniLogic.getInstance().openUniMP(path, null);


                    }




                    @Override


                    public void onFailure(HDLException e) {




                    }


                });


            }


        });


        //设备设置下拉箭头颜色


@@ -779,9 +794,9 @@


            showLoading();


        }


        //获取住宅(电站)ID列表


        HdlDeviceLogic.getInstance().getPowerStationDeviceList("", pageNo, pageSize, new CloudCallBeak<PageNumberObject<DeviceBean>>() {


        HdlDeviceLogic.getInstance().getPowerStationDeviceList("", pageNo, pageSize, new CloudCallBeak<PageNumberObject<CloudInverterDeviceBean>>() {


            @Override


            public void onSuccess(PageNumberObject<DeviceBean> pageNumberObject) {


            public void onSuccess(PageNumberObject<CloudInverterDeviceBean> pageNumberObject) {


                HdlThreadLogic.runMainThread(new Runnable() {


                    @Override


                    public void run() {