From 9f1321355642cd400b1d1aba94d216bfbea27a66 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 15 五月 2024 15:31:30 +0800
Subject: [PATCH] 2024年05月15日15:31:27

---
 app/src/main/java/com/hdl/photovoltaic/internet/HttpServer/MyNanoHttpServer.java  |    2 
 app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java                   |   26 ++++++------
 app/src/main/java/com/hdl/photovoltaic/other/HdlFileLogic.java                    |   28 +++++++-------
 app/src/main/java/com/hdl/photovoltaic/internet/HttpServer/MyNanoHttpService.java |    2 
 app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java                   |    2 
 app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseSearchActivity.java   |    4 +-
 app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java           |    2 
 app/src/main/java/com/hdl/photovoltaic/other/HdlMessageLogic.java                 |    4 +-
 app/src/main/java/com/hdl/photovoltaic/jpush/JPushReceiverService.java            |    6 +-
 app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java     |    6 +-
 app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java                  |   34 ++++++++--------
 app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java                     |    2 
 12 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java b/app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java
index a72776c..a74978c 100644
--- a/app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java
+++ b/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鍜屽厜浼廰pp浠g爜):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)//璇锋眰鐨剈rl
@@ -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);
                 }
 
             }
diff --git a/app/src/main/java/com/hdl/photovoltaic/internet/HttpServer/MyNanoHttpServer.java b/app/src/main/java/com/hdl/photovoltaic/internet/HttpServer/MyNanoHttpServer.java
index 208556b..3cc1df8 100644
--- a/app/src/main/java/com/hdl/photovoltaic/internet/HttpServer/MyNanoHttpServer.java
+++ b/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;
                 }
             }
diff --git a/app/src/main/java/com/hdl/photovoltaic/internet/HttpServer/MyNanoHttpService.java b/app/src/main/java/com/hdl/photovoltaic/internet/HttpServer/MyNanoHttpService.java
index f0a065b..99228dc 100644
--- a/app/src/main/java/com/hdl/photovoltaic/internet/HttpServer/MyNanoHttpService.java
+++ b/app/src/main/java/com/hdl/photovoltaic/internet/HttpServer/MyNanoHttpService.java
@@ -48,7 +48,7 @@
 //                }
 //
 //            }
-            HdlLogLogic.print("鍒濆鍖朒ttp鏈嶅姟鍣ㄥけ璐�--->" + e.getMessage(), true);
+            HdlLogLogic.print("鍒濆鍖朒ttp鏈嶅姟鍣ㄥけ璐�---" + e.getMessage(), true);
             startService(new Intent(this, MyNanoHttpService.class));
         }
     }
diff --git a/app/src/main/java/com/hdl/photovoltaic/jpush/JPushReceiverService.java b/app/src/main/java/com/hdl/photovoltaic/jpush/JPushReceiverService.java
index 731fb64..aa577c5 100644
--- a/app/src/main/java/com/hdl/photovoltaic/jpush/JPushReceiverService.java
+++ b/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);
     }
 
     /**
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
index e398a95..ab8ab79 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/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() + "--->鏁版嵁鏄痭ull", true);
+                            HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔垚鍔�---浣忓畢id:" + homeId + "---mac:" + gatewayBean.getDevice_mac() + "---鏁版嵁鏄痭ull", 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("鑾峰彇閫嗗彉鍣╫id鍒楄〃澶辫触--->浣忓畢id:" + homeId + "--->mac:" + gatewayBean.getDevice_mac() + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
+                                HdlLogLogic.print("鑾峰彇閫嗗彉鍣╫id鍒楄〃澶辫触---浣忓畢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鍒楄〃涓虹┖锛屾棤娉曞叏閲忔洿鏂皁id鍒颁簯绔�--->", true);
+            HdlLogLogic.print("oid鍒楄〃涓虹┖锛屾棤娉曞叏閲忔洿鏂皁id鍒颁簯绔�---", 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鍒楄〃涓虹┖锛屾棤娉曞閲忔坊鍔爋id鍒颁簯绔�--->", true);
+            HdlLogLogic.print("oid鍒楄〃涓虹┖锛屾棤娉曞閲忔坊鍔爋id鍒颁簯绔�---", 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() + ")");
                                 }
                             });
                         }
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlFileLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlFileLogic.java
index 2382eef..76133f3 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlFileLogic.java
+++ b/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);//杩欎釜鏂规硶涓嶅吋鐢╝ndroid 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;
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java
index 286e8c6..1755c8a 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java
+++ b/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) {
         }
     }
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlMessageLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlMessageLogic.java
index 25163ba..8edfab2 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlMessageLogic.java
+++ b/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);
         }
     }
 
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java
index bfc5c94..4606be1 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java
+++ b/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, "姝e父涓婃姤杩涘害鍊�--->" + progress);
+                    this.eventBusPost(fileFullPath, driver, progress, "姝e父涓婃姤杩涘害鍊�---" + progress);
                 }
             }
             fos.flush();
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java b/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java
index b1f0c52..fe1bbd6 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java
+++ b/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) {
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
index b4e83d1..691c081 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
+++ b/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);
                     }
                 }
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseSearchActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseSearchActivity.java
index 6afbe86..3e0abe7 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseSearchActivity.java
+++ b/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);
         }
     }
 

--
Gitblit v1.8.0