Merge branch '1.3.1'

wjc

21 小时以前 c19f27f32f3c3d2caf82ddbdc3b2602ee3610e46

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

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