mac
2024-03-15 a0e8f81afc4fe2a21a5c504d53e569ea50d463d6
app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java
@@ -93,14 +93,14 @@
                    TipDialog("请先选择住宅进行测试,否则无法进行逆变器指令测试.", null);
                    return;
                }
                GatewayBean gatewayBean = HdlDeviceLogic.getInstance().getCurrentHomeMainGateway(UserConfigManage.getInstance().getHomeId());
                if (gatewayBean == null && !title.equals("搜索逆变器列表(0)") && !title.equals("搜索【住宅】逆变器列表(1)")) {
                    // TODO: 10/30/23 找不到住宅的主逆变器,请先确认是否绑定逆变器,再进行逆变器指令测试;
                List<GatewayBean> list = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList(UserConfigManage.getInstance().getHomeId());
                if (list == null &&list.size()==0 && !title.equals("搜索【所有】逆变器列表(0)") && !title.equals("搜索【住宅】逆变器列表(1)")) {
                    // TODO: 10/30/23 找不到住宅的主逆变器,请先确认是否绑定逆变器,再进行逆变器指令测试
                    TipDialog("找不到住宅的【主逆变器】,请先确认是否绑定过逆变器,再进行逆变器指令测试.", null);
                    return;
                }
                showLoading();
                startRequest(position, gatewayBean);
                startRequest(position, list.get(0));
            }
        });
    }
@@ -126,7 +126,7 @@
     */
    private List<String> getTitleList() {
        List<String> s = new ArrayList<>();
        s.add("搜索逆变器列表(0)");
        s.add("搜索【所有】逆变器列表(0)");
        s.add("搜索【住宅】逆变器列表(1)");
        s.add("获取逆变器oid列表(2)");
        s.add("读取逆变器详情(3)");
@@ -146,8 +146,8 @@
    private void startRequest(int position, GatewayBean gatewayBean) {
        String title = getTitleList().get(position);
        switch (title) {
            case "搜索逆变器列表(0)": {
                HdlDeviceLogic.getInstance().searchAllGateway(new GatewayCallBack() {
            case "搜索【所有】逆变器列表(0)": {
                HdlDeviceLogic.getInstance().searchAllNetworkGateway(new GatewayCallBack() {
                    @Override
                    public void onSuccess(List<GatewayBean> gatewayBeanList) {
                        List<GatewayBean> newGatewayBeanList = new ArrayList<>();