Merge branch '1.2.0'

wjc

2025-05-07 b9cc7390e8e8ce64c41c26fb369c98ce669d660c

 app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java

@@ -85,8 +85,8 @@
    private void initView() {
        this.mHomeId = UserConfigManage.getInstance().getHomeId();
        this.mHomeName = UserConfigManage.getInstance().getHomeName();
        String homeId = "电站Id=" + this.mHomeId;
        String homeName = "电站名称=" + this.mHomeName;
        String homeId = "测试电站Id=" + this.mHomeId;
        String homeName = "测试电站名称=" + this.mHomeName;
        viewBinding.homeIdTv.setText(homeId);
        viewBinding.homeNameTv.setText(homeName);

@@ -183,7 +183,7 @@
                        return;
                    }
                    showLoading();
                    List<GatewayBean> gatewayBeanList = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList(this.mHomeId);
                    List<GatewayBean> gatewayBeanList = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList(this.mHomeId, null);
                    gsonConvertJsonStr(gatewayBeanList);
                }
                break;
@@ -512,7 +512,7 @@
     * 选择逆变器调试
     */
    public void selectDevice() {
        List<GatewayBean> list = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList(this.mHomeId);
        List<GatewayBean> list = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList(this.mHomeId, null);
        DialogDeviceList dialogDeviceList = new DialogDeviceList(_mActivity, list);
        dialogDeviceList.show();
        dialogDeviceList.DeviceOnclickListener(new DialogDeviceList.OnclickListener() {