From be5c9f324ac1d31f4f262d288c5f72a7a0c10c47 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 19 一月 2024 10:08:23 +0800
Subject: [PATCH] 2024年01月19日10:08:08

---
 app/src/main/java/com/hdl/photovoltaic/other/HdlFileLogic.java                    |    4 ++--
 HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/connect/HDLModBusConnect.java |    2 +-
 app/src/main/java/com/hdl/photovoltaic/ui/message/NascentMessageFragment.java     |   23 ++++++++++++++++++-----
 app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java                     |    2 +-
 app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java                  |   12 +++++++++---
 5 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/connect/HDLModBusConnect.java b/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/connect/HDLModBusConnect.java
index fe6082b..692e5ad 100644
--- a/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/connect/HDLModBusConnect.java
+++ b/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/connect/HDLModBusConnect.java
@@ -142,7 +142,7 @@
         if (payload == null || payload.length == 0) {
             if (baseCallBack != null) {
                 baseCallBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_DATA_NULL_ERROR));
-                System.out.println("鍙戦�佹暟鎹椂璐熻浇鏁版嵁鏃剁┖鐨�--->");
+                System.out.println("鍙戦�佹暟鎹椂璐熻浇鏁版嵁鏄┖鐨�--->");
             }
             return;
         }
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 e32683e..e8cd9ea 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -488,9 +488,15 @@
     public void editGatewayTime(String mac, String date, String time, String timezone, LinkCallBack<Boolean> linkCallBack) {
         String requestUrl = TopicApi.SET_GATEWAY_TIME_EDIT;
         JsonObject json = new JsonObject();
-        json.addProperty("date", date);// "2020-08-15"
-        json.addProperty("time", time);//"17:25:20"
-        json.addProperty("timezone", timezone);//鏃跺尯(璇泙https://hdl-gz.yuque.com/wnkbmh/cdrglh/yckkyp#qWOPS)
+        if (!TextUtils.isEmpty(date)) {
+            json.addProperty("date", date);// "2020-08-15"
+        }
+        if (!TextUtils.isEmpty(time)) {
+            json.addProperty("time", time);//"17:25:20"
+        }
+        if (!TextUtils.isEmpty(timezone)) {
+            json.addProperty("timezone", timezone);//鏃跺尯(璇泙https://hdl-gz.yuque.com/wnkbmh/cdrglh/yckkyp#qWOPS)
+        }
 
         TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, json, "", new HDLLinkCallBack() {
             @Override
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 b44eb12..81e6ddc 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlFileLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlFileLogic.java
@@ -315,8 +315,8 @@
             d.flush();
             d.close();
             if (file.length() > 1024 * 1024 * mDataSize) {
-                //鏂囦欢澶т簬1m,鍒犻櫎鏂囦欢鍓�10鏉℃棩蹇�
-                this.delFileLien(fullPath, 10);
+                //鏂囦欢澶т簬1m,鍒犻櫎鏂囦欢鍓�20鏉℃棩蹇�
+                this.delFileLien(fullPath, 20);
             }
             System.out.println("鍐欏叆涓�琛屾暟鎹埌鏂囦欢鎴愬姛--->" + dataLine);
         } catch (Exception e) {
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
index 10ec0b1..4704b4d 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -404,7 +404,7 @@
         if (!locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
             jsonObject.addProperty("result", -1);//娌″紑鍚畾浣嶅姛鑳�
             jsonObject.addProperty("des", "娌″紑鍚畾浣嶅姛鑳�");
-            //鎻愮ず鐢ㄦ埛鎵撳紑瀹氫綅鍔熻兘鎴栬�呭紩瀵肩敤鎴峰幓绯荤粺璁剧疆椤甸潰鎵撳紑瀹氫綅鍔熻兘
+            //todo 鎻愮ず鐢ㄦ埛鎵撳紑瀹氫綅鍔熻兘鎴栬�呭紩瀵肩敤鎴峰幓绯荤粺璁剧疆椤甸潰鎵撳紑瀹氫綅鍔熻兘
             uniCallbackData(jsonObject.toString(), callback);
             return;
         }
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/message/NascentMessageFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/message/NascentMessageFragment.java
index b119560..10c2b79 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/message/NascentMessageFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/message/NascentMessageFragment.java
@@ -5,6 +5,7 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.text.TextUtils;
+import android.view.MotionEvent;
 import android.view.View;
 import android.widget.TextView;
 
@@ -102,17 +103,29 @@
 
             }
         });
+
         viewBinding.messageNascentRecyclerview.addOnScrollListener(new RecyclerView.OnScrollListener() {
             @Override
             public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
                 super.onScrolled(recyclerView, dx, dy);
 
-//                int totalItemCount = layoutManager.getItemCount();
-//                int lastVisibleItemPosition = layoutManager.findLastVisibleItemPosition();
-//
-//                if (!isLoadingMore && totalItemCount <= (lastVisibleItemPosition + visibleThreshold)) {
+                if (dy <= 0) {
+                    //绛変簬0鏄《閮�
+                    return;
+                }
+                LinearLayoutManager layoutManager = (LinearLayoutManager) recyclerView.getLayoutManager();
+                assert layoutManager != null;
+                // 鍙湁鍨傜洿甯冨眬鎵嶄細瑙﹀彂涓婃媺浜嬩欢
+                if (!layoutManager.canScrollVertically()) {
+                    return;
+                }
+
+                int totalItemCount = layoutManager.getItemCount();
+                int lastVisibleItemPosition = layoutManager.findLastVisibleItemPosition();
+
+                if (!isLoadingMore && totalItemCount <= (lastVisibleItemPosition + visibleThreshold)) {
 //                    loadNextPage();
-//                }
+                }
             }
         });
     }

--
Gitblit v1.8.0