Merge branch 'feature/v1.4.0' into feature/v1.4.1

mac

2024-06-05 c1755223fd042d0411ab29708c5a848085c4cee9

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

@@ -751,7 +751,7 @@
        }
        isHouseLoadingMore = true;//标记读取状态
        if (isRefreshing) {
            showLoading();
            showLoading(getString(R.string.device_loading));
        }

        //获取住宅(电站)ID列表
@@ -820,7 +820,7 @@
        }
        isDeviceLoadingMore = true;//标记读取状态
        if (isRefreshing) {
            showLoading();
            showLoading(getString(R.string.device_loading));
        }
        //获取住宅(电站)ID列表
        HdlDeviceLogic.getInstance().getPowerStationDeviceList("", pageNo, pageSize, new CloudCallBeak<PageNumberObject<CloudInverterDeviceBean>>() {