2024年05月22日17:29:51

mac

2024-05-22 f7d89d0364769209c7af15c97204bdae55ac7505

2024年05月22日17:29:51

 app/build.gradle

@@ -131,7 +131,7 @@
    implementation project(path: ':third-zxing')
    //Link本地库（在线依赖网络库）
    implementation 'com.hdl.android:pmsdk:1.0.2'
    implementation 'com.hdl.android:debugsdk:1.0.23'
    implementation 'com.hdl.android:debugsdk:1.0.24'

    testImplementation 'junit:junit:4.13.2'
    androidTestImplementation 'androidx.test.ext:junit:1.1.3'

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

@@ -1134,6 +1134,48 @@
    }

    /**
     * 设置设备的远程信息
     *
     * @param list          云端上的逆变器列表
     * @param homeId        住宅id
     * @param cloudCallBeak 回调
     */
    public void setDeviceRemoteInfo(List<CloudInverterDeviceBean> list, String homeId, CloudCallBeak<List<GatewayBean>> cloudCallBeak) {
        AtomicInteger atomicInteger = new AtomicInteger(0);
        for (int i = 0; i < list.size(); i++) {
            CloudInverterDeviceBean cloudInverterDeviceBean = list.get(i);
            //获取远程设备通讯信息(拿到网关ID，mqtt通讯秘钥)
            getDeviceRemoteInfo(homeId, cloudInverterDeviceBean.getSpk(), cloudInverterDeviceBean.getOsn(), new CloudCallBeak<DeviceRemoteInfo>() {
                @Override
                public void onSuccess(DeviceRemoteInfo deviceRemoteInfo) {
                    atomicInteger.set(atomicInteger.get() + 1);
                    //更新逆变器本地缓存信息
                    refreshGatewayCacheData(false, cloudInverterDeviceBean, deviceRemoteInfo, homeId);
                    //到最后一条，才有回调
                    if (atomicInteger.get() == list.size()) {
                        if (cloudCallBeak != null) {
                            cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId));
                        }
                    }
                }

                @Override
                public void onFailure(HDLException e) {
                    atomicInteger.set(atomicInteger.get() + 1);
                    //当最后一条请求失败了，才有回调
                    if (atomicInteger.get() == list.size()) {
                        if (cloudCallBeak != null) {
                            cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId));
                        }
                    }
                    HdlLogLogic.print("获取设备远程通讯信息失败---msg---" + e.getMsg() + "(" + e.getCode() + ")");
                }
            });
        }

    }

    /**
     * 通过sid查询逆变器
     *
     * @param list 云端上逆变器列表

 app/src/main/java/com/hdl/photovoltaic/ui/adapter/DeviceInfoAdapter.java

@@ -47,7 +47,7 @@
        DeviceBean deviceBean = this.mList.get(position);

        holder.homeNameTv.setText(deviceBean.getHomeNameAndDeviceName());
        holder.device_details_sn_tv.setText(deviceBean.getOsn());
        holder.device_details_sn_tv.setText("SN:"+deviceBean.getOsn());
        holder.device_label_run_state_value_tv.setText(deviceBean.getSystemStatusDesc());
        holder.device_label_power_value_tv.setText(HdlCommonLogic.getConvertDoubleUnit(deviceBean.getPowerPvNow(), UnitType.kW));
        holder.device_label_day_value_tv.setText(HdlCommonLogic.getConvertDoubleUnit(deviceBean.getPowerPvNow(), UnitType.kWh));

 app/src/main/java/com/hdl/photovoltaic/ui/adapter/SearchDeviceAdapter.java

@@ -41,7 +41,7 @@
        DeviceBean deviceBean = this.mList.get(position);

        holder.device_search_name_tv.setText(deviceBean.getHomeNameAndDeviceName());
        holder.device_search_sn_tv.setText(deviceBean.getOsn());
        holder.device_search_sn_tv.setText("SN:"+deviceBean.getOsn());
        holder.device_search_location_tv.setText(deviceBean.getHomeAddress());
        setTextViewStyle(holder.device_search_state_tv, deviceBean.getDeviceStatus());
        holder.itemView.setTag(position);

 app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java

@@ -131,7 +131,7 @@
    }

    public String getOsn() {
        return osn == null ? "" : "SN:" + osn;
        return osn == null ? "" : osn;
    }

    public void setOsn(String osn) {

 app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java

@@ -169,7 +169,7 @@
            @Override
            public void onClick(View v) {
                setBackgroundColor(viewBinding.allTv, TitleType.GridConnectedState);
                setSelectedText(viewBinding.allTv.getTag().toString());
                mStateValue = GridType.All;
            }
        });
        viewBinding.gridConnectedTv.setOnClickListener(new View.OnClickListener() {
@@ -177,7 +177,7 @@
            @Override
            public void onClick(View v) {
                setBackgroundColor(viewBinding.gridConnectedTv, TitleType.GridConnectedState);
                setSelectedText(viewBinding.gridConnectedTv.getTag().toString());
                mStateValue = GridType.FULL_GRID;
            }
        });
        viewBinding.offNetworkTv.setOnClickListener(new View.OnClickListener() {
@@ -185,7 +185,7 @@
            @Override
            public void onClick(View v) {
                setBackgroundColor(viewBinding.offNetworkTv, TitleType.GridConnectedState);
                setSelectedText(viewBinding.offNetworkTv.getTag().toString());
                mStateValue = GridType.OFFLINE;
            }
        });

@@ -209,8 +209,6 @@
                minValue = min_max[0];
                maxValue = min_max[1];
            }
        } else {
            mStateValue = value;
        }

        viewBinding.minEt.setText(minValue);