Merge branch '1.2.1' into 1.2.0_google

wjc

2025-05-23 971a24a9e58a21bc306897fd3ad63012a399f7db

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

@@ -47,6 +47,7 @@
    private ActivityTestMainBinding viewBinding;
    private TestTitleAdapter testTitleAdapter;

    private List<HouseIdBean> mHouseIdBeanList = new ArrayList<>();
    private List<OidBean> mOidList;

    private GatewayBean mGatewayBean;
@@ -70,7 +71,12 @@
        viewBinding.listItemRl.setAdapter(testTitleAdapter);
        initView();
        initEvent();
        readData();

    }

    private void readData() {
        loadNextPageHouseList(true);
    }

    /**
@@ -79,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);

@@ -429,25 +435,30 @@
    }

    /**
     * 刷新UI（设备）
     * 刷新UI（电站）
     *
     * @param isRefreshing 表示是下拉刷新的
     */
    private void loadNextPageDeviceList(boolean isRefreshing) {
    private void loadNextPageHouseList(boolean isRefreshing) {

        showLoading();
        if (isRefreshing) {
            showLoading(getString(R.string.device_loading));
        }
        //获取住宅(电站)ID列表
        HdlDeviceLogic.getInstance().getPowerStationDeviceList("", 1, 200, new CloudCallBeak<PageNumberObject<CloudInverterDeviceBean>>() {
        HdlResidenceLogic.getInstance().getResidenceIdList("", "", "", "", "", "", 1, 200, new CloudCallBeak<HdlResidenceLogic.HouseBeanClass>() {
            @Override
            public void onSuccess(PageNumberObject<CloudInverterDeviceBean> pageNumberObject) {
            public void onSuccess(HdlResidenceLogic.HouseBeanClass houseBeanClass) {
                HdlThreadLogic.runMainThread(new Runnable() {
                    @Override
                    public void run() {
                        if (isRefreshing) {
                            hideLoading();
                        }
                        mHouseIdBeanList.clear();
                        //更新缓存
                        mHouseIdBeanList.addAll(houseBeanClass.getList());
                    }
                }, _mActivity, ShowErrorMode.YES);
                }, _mActivity, ShowErrorMode.NO);

            }

@@ -459,8 +470,9 @@
                        if (isRefreshing) {
                            hideLoading();
                        }

                    }
                }, _mActivity, ShowErrorMode.YES);
                }, _mActivity, ShowErrorMode.NO);
            }
        });
    }
@@ -523,7 +535,8 @@
     * 选择电站调试
     */
    public void selectHome() {
        List<HouseIdBean> list = HdlResidenceLogic.getInstance().getHouseIdList();
//        List<HouseIdBean> list = HdlResidenceLogic.getInstance().getHouseIdList();
        List<HouseIdBean> list = this.mHouseIdBeanList;
        DialogHomeList dialogHomeList = new DialogHomeList(_mActivity, list);
        dialogHomeList.show();
        dialogHomeList.DeviceOnclickListener(new HomeAdapter.OnclickListener() {