mac
2024-05-15 9f1321355642cd400b1d1aba94d216bfbea27a66
2024年05月15日15:31:27
12个文件已修改
118 ■■■■ 已修改文件
app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/internet/HttpServer/MyNanoHttpServer.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/internet/HttpServer/MyNanoHttpService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/jpush/JPushReceiverService.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java 34 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/other/HdlFileLogic.java 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/other/HdlMessageLogic.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseSearchActivity.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java
@@ -72,15 +72,15 @@
     */
    private Disposable requestPost(String api, String body, CloudCallBeak<String> callBack) {
        String requestUrl = HDLCloudUserApi.getRequestUrl(api);
        HdlLogLogic.print("http->发送->" + requestUrl + "\r\n" + body, isAddToMemory);
        HdlLogLogic.print("http---发送---" + requestUrl + "\r\n" + body, isAddToMemory);
        //开发环境需要加(用来区分onpro和光伏app代码):HxHttp.builder().headers("x-lbs-version", "hdl-yt")
        return HxHttp.builder().url(requestUrl).raw(body).build().post().subscribeWith(new HDLResponse<String>() {
            @Override
            public void onResponse(String str) {
                if (callBack != null) {
                    callBack.onSuccess(str);
//                          System.out.println("http->回复->" + requestUrl + "\r\n" + gson.fromJson(str, JsonObject.class).toString());
                    HdlLogLogic.print("http->回复->" + requestUrl + "\r\n" + str, isAddToMemory);
//                          System.out.println("http---回复---" + requestUrl + "\r\n" + gson.fromJson(str, JsonObject.class).toString());
                    HdlLogLogic.print("http---回复---" + requestUrl + "\r\n" + str, isAddToMemory);
                }
            }
@@ -89,7 +89,7 @@
                HDLExceptionSubmitUtils.submit(requestUrl, body, e);
                if (callBack != null) {
                    callBack.onFailure(e);
                    HdlLogLogic.print("http->回复->" + requestUrl + "\r\n" + "\"{code=\"" + e.getCode() + "," + "\"message=\"" + e.getMsg() + "}", isAddToMemory);
                    HdlLogLogic.print("http---回复---" + requestUrl + "\r\n" + "\"{code=\"" + e.getCode() + "," + "\"message=\"" + e.getMsg() + "}", isAddToMemory);
                }
            }
        });
@@ -109,14 +109,14 @@
        String requestUrl = HDLCloudUserApi.getRequestUrl(api);
        HdlLogLogic.print("http->发送->" + requestUrl + "\r\n" + body, isAddToMemory);
        HdlLogLogic.print("http---发送---" + requestUrl + "\r\n" + body, isAddToMemory);
        return HxHttp.builder().url(requestUrl).file(body).build().post().subscribeWith(new HDLResponse<String>() {
            @Override
            public void onResponse(String str) {
                if (callBack != null) {
                    callBack.onSuccess(str);
//                          System.out.println("http->回复->" + requestUrl + "\r\n" + gson.fromJson(str, JsonObject.class).toString());
                    HdlLogLogic.print("http->回复->" + requestUrl + "\r\n" + str, isAddToMemory);
//                          System.out.println("http---回复---" + requestUrl + "\r\n" + gson.fromJson(str, JsonObject.class).toString());
                    HdlLogLogic.print("http---回复---" + requestUrl + "\r\n" + str, isAddToMemory);
                }
            }
@@ -125,7 +125,7 @@
                HDLExceptionSubmitUtils.submit(requestUrl, body, e);
                if (callBack != null) {
                    callBack.onFailure(e);
                    HdlLogLogic.print("http->回复->" + requestUrl + "\r\n" + "\"{code=\"" + e.getCode() + "," + "\"message=\"" + e.getMsg() + "}", isAddToMemory);
                    HdlLogLogic.print("http---回复---" + requestUrl + "\r\n" + "\"{code=\"" + e.getCode() + "," + "\"message=\"" + e.getMsg() + "}", isAddToMemory);
                }
            }
        });
@@ -242,7 +242,7 @@
            @Override
            public void run() {
                try {
                    HdlLogLogic.print("http->发送->" + fullUrl + "\r\n" + json, isAddToMemory);
                    HdlLogLogic.print("http---发送---" + fullUrl + "\r\n" + json, isAddToMemory);
                    OkHttpClient okHttpClient = new OkHttpClient();
                    RequestBody requestBody = FormBody.create(MediaType.parse("application/json; charset=utf-8"), getJson(json));
                    final Request request = new Request.Builder().url(fullUrl)//请求的url
@@ -252,7 +252,7 @@
                        if (response.isSuccessful()) {
                            String s = Objects.requireNonNull(response.body()).string();
                            HttpResponsePack httpResponsePack = new Gson().fromJson(s, HttpResponsePack.class);
                            HdlLogLogic.print("http->回复->" + response.request().url() + "\r\n" + s, isAddToMemory);
                            HdlLogLogic.print("http---回复---" + response.request().url() + "\r\n" + s, isAddToMemory);
                            baseSuccessCallBeak.onSuccess(httpResponsePack);
                        } else {
@@ -265,7 +265,7 @@
                        call.enqueue(new Callback() {//异步
                            @Override
                            public void onFailure(@NonNull Call call, @NonNull IOException e) {
                                HdlLogLogic.print("http->回复->" + "\r\n" + e.getMessage(), isAddToMemory);
                                HdlLogLogic.print("http---回复---" + "\r\n" + e.getMessage(), isAddToMemory);
                            }
                            @Override
@@ -275,7 +275,7 @@
                                    String s = Objects.requireNonNull(response.body()).string();
                                    HttpResponsePack httpResponsePack = new Gson().fromJson(s, HttpResponsePack.class);
                                    baseSuccessCallBeak.onSuccess(httpResponsePack);
                                    HdlLogLogic.print("http->回复->" + "\r\n" + s, isAddToMemory);
                                    HdlLogLogic.print("http---回复---" + "\r\n" + s, isAddToMemory);
                                } else {
                                    baseSuccessCallBeak.onFailure(new HDLException(response.code(), response.message()));
                                }
@@ -284,7 +284,7 @@
                    }
                } catch (Exception e) {
                    baseSuccessCallBeak.onFailure(new HDLException(-100, e.getMessage()));
                    HdlLogLogic.print("http->回复->" + "\r\n" + e.getMessage(), isAddToMemory);
                    HdlLogLogic.print("http---回复---" + "\r\n" + e.getMessage(), isAddToMemory);
                }
            }
app/src/main/java/com/hdl/photovoltaic/internet/HttpServer/MyNanoHttpServer.java
@@ -119,7 +119,7 @@
                    //响应客户端
                    Response response = newFixedLengthResponse(newByte);
                    response.addHeader("Content-Range", range + "/" + sourceDataByte.length);//伟南需要这个字段
                    HdlLogLogic.print("http回复数据===请求大小-->" + range + "=====文件大小-->" + sourceDataByte.length, true);
                    HdlLogLogic.print("http回复数据===请求大小--" + range + "=====文件大小--" + sourceDataByte.length, true);
                    return response;
                }
            }
app/src/main/java/com/hdl/photovoltaic/internet/HttpServer/MyNanoHttpService.java
@@ -48,7 +48,7 @@
//                }
//
//            }
            HdlLogLogic.print("初始化Http服务器失败--->" + e.getMessage(), true);
            HdlLogLogic.print("初始化Http服务器失败---" + e.getMessage(), true);
            startService(new Intent(this, MyNanoHttpService.class));
        }
    }
app/src/main/java/com/hdl/photovoltaic/jpush/JPushReceiverService.java
@@ -29,7 +29,7 @@
     */
    public void onMessage(Context context, CustomMessage customMessage) {
        HdlLogLogic.print("极光--->自定义消息回调--->" + new Gson().toJson(customMessage), false);
        HdlLogLogic.print("极光---自定义消息回调---" + new Gson().toJson(customMessage), false);
    }
    /**
@@ -63,7 +63,7 @@
     * @param registrationId 注册 id
     */
    public void onRegister(Context context, String registrationId) {
        HdlLogLogic.print("极光--->注册成功回调Id:" + registrationId, false);
        HdlLogLogic.print("极光---注册成功回调Id:" + registrationId, false);
    }
    /**
@@ -73,7 +73,7 @@
     * @param isConnected 长连接状态
     */
    public void onConnected(Context context, boolean isConnected) {
        HdlLogLogic.print("极光--->长连接状态回调:" + isConnected, false);
        HdlLogLogic.print("极光---长连接状态回调:" + isConnected, false);
    }
    /**
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -291,7 +291,7 @@
            }
        } catch (Exception e) {
            String mes = e.getMessage();
            HdlLogLogic.print("--->" + mes);
            HdlLogLogic.print("---" + mes);
        }
    }
@@ -316,19 +316,19 @@
                    @Override
                    public void onSuccess(List<OidBean> oidBeanList) {
                        if (oidBeanList == null) {
                            HdlLogLogic.print("上传oid列表到云端成功--->住宅id:" + homeId + "--->mac:" + gatewayBean.getDevice_mac() + "--->数据是null", true);
                            HdlLogLogic.print("上传oid列表到云端成功---住宅id:" + homeId + "---mac:" + gatewayBean.getDevice_mac() + "---数据是null", true);
                            return;
                        }
                        //增量添加oid
                        updateOidAdd(homeId, oidBeanList, new CloudCallBeak<Boolean>() {
                            @Override
                            public void onSuccess(Boolean obj) {
                                HdlLogLogic.print("上传oid列表到云端成功(增量)--->住宅id:" + homeId + "--->mac:" + gatewayBean.getDevice_mac() + "--->\r\n数据--->" + new Gson().toJson(oidBeanList), true);
                                HdlLogLogic.print("上传oid列表到云端成功(增量)---住宅id:" + homeId + "---mac:" + gatewayBean.getDevice_mac() + "---\r\n数据---" + new Gson().toJson(oidBeanList), true);
                            }
                            @Override
                            public void onFailure(HDLException e) {
                                HdlLogLogic.print("上传oid列表到云端失败(增量)--->住宅id:" + homeId + "--->mac:" + gatewayBean.getDevice_mac() + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
                                HdlLogLogic.print("上传oid列表到云端失败(增量)---住宅id:" + homeId + "---mac:" + gatewayBean.getDevice_mac() + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
                            }
                        });
@@ -365,12 +365,12 @@
//                        updateOidAdd(homeId, oidList, new CloudCallBeak<Boolean>() {
//                            @Override
//                            public void onSuccess(Boolean obj) {
//                                HdlLogLogic.print("上传oid列表到云端成功--->住宅id:" + homeId + "--->mac:" + gatewayBean.getDevice_mac(), true);
//                                HdlLogLogic.print("上传oid列表到云端成功---住宅id:" + homeId + "---mac:" + gatewayBean.getDevice_mac(), true);
//                            }
//
//                            @Override
//                            public void onFailure(HDLException e) {
//                                HdlLogLogic.print("上传oid列表到云端失败--->住宅id:" + homeId + "--->mac:" + gatewayBean.getDevice_mac() + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
//                                HdlLogLogic.print("上传oid列表到云端失败---住宅id:" + homeId + "---mac:" + gatewayBean.getDevice_mac() + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
//                            }
//                        });
@@ -378,12 +378,12 @@
                            fullUpdateOid(homeId, newOidList, new CloudCallBeak<Boolean>() {
                                @Override
                                public void onSuccess(Boolean obj) {
                                    HdlLogLogic.print("上传oid列表到云端成功(全量)--->住宅id:" + homeId + "--->mac:" + gatewayBean.getDevice_mac() + "--->\r\n数据--->" + new Gson().toJson(newOidList), true);
                                    HdlLogLogic.print("上传oid列表到云端成功(全量)---住宅id:" + homeId + "---mac:" + gatewayBean.getDevice_mac() + "---\r\n数据---" + new Gson().toJson(newOidList), true);
                                }
                                @Override
                                public void onFailure(HDLException e) {
                                    HdlLogLogic.print("上传oid列表到云端失败(全量)--->住宅id:" + homeId + "--->mac:" + gatewayBean.getDevice_mac() + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
                                    HdlLogLogic.print("上传oid列表到云端失败(全量)---住宅id:" + homeId + "---mac:" + gatewayBean.getDevice_mac() + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
                                }
                            });
                        }
@@ -394,19 +394,19 @@
                        atomicInteger.set(atomicInteger.get() + 1);
                        if (atomicInteger.get() == list.size()) {
                            if (newOidList.size() == 0) {
                                HdlLogLogic.print("获取逆变器oid列表失败--->住宅id:" + homeId + "--->mac:" + gatewayBean.getDevice_mac() + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
                                HdlLogLogic.print("获取逆变器oid列表失败---住宅id:" + homeId + "---mac:" + gatewayBean.getDevice_mac() + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
                                return;
                            }
                            //增量添加oid
                            updateOidAdd(homeId, newOidList, new CloudCallBeak<Boolean>() {
                                @Override
                                public void onSuccess(Boolean obj) {
                                    HdlLogLogic.print("上传oid列表到云端成功(增量)--->住宅id:" + homeId + "--->mac:" + gatewayBean.getDevice_mac() + "--->\r\n数据--->" + new Gson().toJson(newOidList), true);
                                    HdlLogLogic.print("上传oid列表到云端成功(增量)---住宅id:" + homeId + "---mac:" + gatewayBean.getDevice_mac() + "---\r\n数据---" + new Gson().toJson(newOidList), true);
                                }
                                @Override
                                public void onFailure(HDLException e) {
                                    HdlLogLogic.print("上传oid列表到云端失败(增量)--->住宅id:" + homeId + "--->mac:" + gatewayBean.getDevice_mac() + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
                                    HdlLogLogic.print("上传oid列表到云端失败(增量)---住宅id:" + homeId + "---mac:" + gatewayBean.getDevice_mac() + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
                                }
                            });
                        }
@@ -620,7 +620,7 @@
     */
    public void fullUpdateOid(String homeId, List<OidBean> oidList, CloudCallBeak<Boolean> cloudCallBeak) {
        if (oidList == null || oidList.size() == 0) {
            HdlLogLogic.print("oid列表为空,无法全量更新oid到云端--->", true);
            HdlLogLogic.print("oid列表为空,无法全量更新oid到云端---", true);
            return;
        }
        String requestUrl = HttpApi.POST_Device_Oid;
@@ -675,7 +675,7 @@
     */
    public void updateOidAdd(String homeId, List<OidBean> oidList, CloudCallBeak<Boolean> cloudCallBeak) {
        if (oidList == null || oidList.size() == 0) {
            HdlLogLogic.print("oid列表为空,无法增量添加oid到云端--->", true);
            HdlLogLogic.print("oid列表为空,无法增量添加oid到云端---", true);
            return;
        }
        String requestUrl = HttpApi.POST_Device_IncrAdd;
@@ -706,7 +706,7 @@
                if (cloudCallBeak != null) {
                    cloudCallBeak.onSuccess(true);
                }
                HdlLogLogic.print("增量添加oid到云端成功--->");
                HdlLogLogic.print("增量添加oid到云端成功---");
            }
            @Override
@@ -714,7 +714,7 @@
                if (cloudCallBeak != null) {
                    cloudCallBeak.onFailure(e);
                }
                HdlLogLogic.print("增量添加oid到云端失败--->" + e.getMsg() + "(" + e.getCode() + ")", true);
                HdlLogLogic.print("增量添加oid到云端失败---" + e.getMsg() + "(" + e.getCode() + ")", true);
            }
        });
@@ -922,7 +922,7 @@
                if (linkCallBack != null) {
                    linkCallBack.onError(e);
                }
                HdlLogLogic.print("初始化逆变器失败-->mac:" + mac + "--->" + e.getMsg() + "(" + e.getCode() + ")", true);
                HdlLogLogic.print("初始化逆变器失败-->mac:" + mac + "---" + e.getMsg() + "(" + e.getCode() + ")", true);
            }
        });
@@ -1144,7 +1144,7 @@
                                            cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId));
                                        }
                                    }
                                    HdlLogLogic.print("获取设备远程通讯信息失败--->msg--->" + e.getMsg() + "(" + e.getCode() + ")");
                                    HdlLogLogic.print("获取设备远程通讯信息失败---msg---" + e.getMsg() + "(" + e.getCode() + ")");
                                }
                            });
                        }
app/src/main/java/com/hdl/photovoltaic/other/HdlFileLogic.java
@@ -167,7 +167,7 @@
            File file = new File(fullPath);
            if (!file.isDirectory()) {
                boolean succeed = file.mkdirs();
                System.out.println("创建文件夹路径--->" + file.getAbsolutePath() + "===创建文件夹结果--->" + succeed);
                System.out.println("创建文件夹路径---" + file.getAbsolutePath() + "===创建文件夹结果---" + succeed);
                return succeed;
            }
            return true;
@@ -200,7 +200,7 @@
            }
            // 删除文件夹本身
            boolean succeed = fileRoot.delete();//文件夹空这个方法才有效
            System.out.println("删除文件夹路径--->" + fileRoot.getAbsolutePath() + "===删除结果--->" + succeed);
            System.out.println("删除文件夹路径---" + fileRoot.getAbsolutePath() + "===删除结果---" + succeed);
        } catch (Exception e) {
            System.out.println("删除文件夹有异常===" + e.getMessage());
        }
@@ -223,7 +223,7 @@
            File file = new File(fullPath);
            if (!file.exists()) {
                boolean succeed = file.createNewFile();
                System.out.println("创建文件路径--->" + file.getAbsolutePath() + "===创建文件结果--->" + succeed);
                System.out.println("创建文件路径---" + file.getAbsolutePath() + "===创建文件结果---" + succeed);
                return succeed;
            }
            return true;
@@ -244,7 +244,7 @@
            File file = new File(fullPath);
            if (file.exists()) {
                boolean succeed = file.delete();
                System.out.println("删除文件--->" + fullPath + "===结果--->" + succeed);
                System.out.println("删除文件---" + fullPath + "===结果---" + succeed);
                return succeed;
            }
            return true;
@@ -275,9 +275,9 @@
            d.write(data);
            d.flush();
            d.close();
            System.out.println("写入文件成功--->" + fullPath);
            System.out.println("写入文件成功---" + fullPath);
        } catch (Exception e) {
            System.out.println("写入文件有异常--->" + e.getMessage());
            System.out.println("写入文件有异常---" + e.getMessage());
        }
    }
@@ -319,9 +319,9 @@
                //文件大于1m,删除文件前100条日志
                this.delFileLien(fullPath, 100);
            }
//            System.out.println("写入一行数据到文件成功--->" + dataLine);
//            System.out.println("写入一行数据到文件成功---" + dataLine);
        } catch (Exception e) {
            System.out.println("写入一行数据到文件有异常--->" + e.getMessage());
            System.out.println("写入一行数据到文件有异常---" + e.getMessage());
        }
    }
@@ -344,10 +344,10 @@
            FileInputStream fis = new FileInputStream(f);
            byte[] bytes = FileUtils.readFileToByteArray(f);//这个方法不兼用android 6.0
            fis.close();
            System.out.println("读取文件成功--->" + filePath);
            System.out.println("读取文件成功---" + filePath);
            return bytes;
        } catch (Exception e1) {
            System.out.println("读取文件有异常--->" + e1.getMessage());
            System.out.println("读取文件有异常---" + e1.getMessage());
            return null;
        }
@@ -376,10 +376,10 @@
            int len = bis.read(bytes);
            bis.close();
            fis.close();
            System.out.println("读取文件成功--->" + filePath);
            System.out.println("读取文件成功---" + filePath);
            return bytes;
        } catch (Exception e1) {
            System.out.println("读取文件有异常--->" + e1.getMessage());
            System.out.println("读取文件有异常---" + e1.getMessage());
            return null;
        }
@@ -422,7 +422,7 @@
            fileLength = f.length();
            return new FileInputStream(f);
        } catch (Exception e1) {
            System.out.println("读取文件有异常--->" + e1.getMessage());
            System.out.println("读取文件有异常---" + e1.getMessage());
            return null;
        }
@@ -506,7 +506,7 @@
     */
    public boolean isBoolean(String path) {
        if (path.contains("//") || path.contains("\\")) {
            System.out.println("无效文件路径--->" + path);
            System.out.println("无效文件路径---" + path);
            return false;
        }
        return true;
app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java
@@ -111,7 +111,7 @@
            messageBean.setTitle(jPushMessageInfoBean.getContent());
            messageBean.setDeviceDesc(jPushMessageInfoBean.getContent());
            HdlMessageLogic.getInstance().setListMessage(messageBean, 0);
            HdlLogLogic.print("极光推送--->添加在推送数据到缓存列表中--->" + new Gson().toJson(jPushMessageInfoBean));
            HdlLogLogic.print("极光推送---添加在推送数据到缓存列表中---" + new Gson().toJson(jPushMessageInfoBean));
        } catch (Exception ignored) {
        }
    }
app/src/main/java/com/hdl/photovoltaic/other/HdlMessageLogic.java
@@ -224,7 +224,7 @@
            }
        } catch (Exception e) {
            String mes = e.getMessage();
            HdlLogLogic.print("--->" + mes);
            HdlLogLogic.print("---" + mes);
        }
    }
@@ -255,7 +255,7 @@
            }
        } catch (Exception e) {
            String mes = e.getMessage();
            HdlLogLogic.print("--->" + mes);
            HdlLogLogic.print("---" + mes);
        }
    }
app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java
@@ -572,7 +572,7 @@
                int progress = (int) (100 * sum * 1.0f / total);
                if (sum != total) {
                    //不等于100都要报,等于100处理整块逻辑完之后再报100;
                    this.eventBusPost(fileFullPath, driver, progress, "正常上报进度值--->" + progress);
                    this.eventBusPost(fileFullPath, driver, progress, "正常上报进度值---" + progress);
                }
            }
            fos.flush();
app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java
@@ -77,7 +77,7 @@
        setTextViewStyle(holder.stateTv, houseIdBean.getPowerStationStatus());
        GlideUtils.getRoundedCornersImage(mContext, houseIdBean.getPowerStationImage(), holder.homeIconIv, new RoundedCorners(6), false);
        HdlLogLogic.print("--->电站名称:" + houseIdBean.getHomeName() + "--->图片url:" + houseIdBean.getPowerStationImage(), false);
        HdlLogLogic.print("---电站名称:" + houseIdBean.getHomeName() + "---图片url:" + houseIdBean.getPowerStationImage(), false);
        holder.item_parent_rl.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
@@ -191,7 +191,7 @@
                if (visibleItemCount > 0 && visibleItemCount + firstVisibleItemPosition == totalItemCount) {
                    if (!isHouseLoadingMore) {
                        // 滑动到了底部,执行相应的操作
                        HdlLogLogic.print("--->滑动到了底部");
                        HdlLogLogic.print("---滑动到了底部");
                        loadNextPageHouseList(false, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, ++currentHouseListPage, false);
                    }
                }
@@ -202,7 +202,7 @@
            @Override
            public void onClick(int position, HouseIdBean houseIdBean) {
                //点击住宅详情
                HdlLogLogic.print("点击住宅详情--->" + new Gson().toJson(houseIdBean), false);
                HdlLogLogic.print("点击住宅详情---" + new Gson().toJson(houseIdBean), false);
                HdlResidenceLogic.getInstance().switchHouse(houseIdBean);
                String path = HDLUniMP.UNI_EVENT_OPEN_HOME_DETAILS + "?homeId=" + houseIdBean.getHomeId() + "&homeName=" + houseIdBean.getHomeName() + "&powerStationStatus=" + houseIdBean.getPowerStationStatus();
                HdlUniLogic.getInstance().openUniMP(path, null);
@@ -377,7 +377,7 @@
                if (visibleItemCount > 0 && visibleItemCount + firstVisibleItemPosition == totalItemCount) {
                    if (!isDeviceLoadingMore) {
                        // 滑动到了底部,执行相应的操作
                        HdlLogLogic.print("--->滑动到了底部");
                        HdlLogLogic.print("---滑动到了底部");
                        loadNextPageDeviceList(false, ++currentDeviceListPage, false);
                    }
                }
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseSearchActivity.java
@@ -139,7 +139,7 @@
                if (visibleItemCount > 0 && visibleItemCount + firstVisibleItemPosition == totalItemCount) {
                    if (!isHouseLoadingMore) {
                        // 滑动到了底部,执行相应的操作
                        HdlLogLogic.print("--->滑动到了底部");
                        HdlLogLogic.print("---滑动到了底部");
                        loadNextPageHouseList(false, ++currentHouseListPage, false);
                    }
                }
@@ -362,7 +362,7 @@
            }
        } catch (Exception e) {
            String mes = e.getMessage();
            HdlLogLogic.print("--->" + mes);
            HdlLogLogic.print("---" + mes);
        }
    }