From db44ed2095d0cb93330834d9552caf42f623291b Mon Sep 17 00:00:00 2001
From: hwf453 <hwf453@163.com>
Date: Sat, 10 Jan 2026 14:11:53 +0800
Subject: [PATCH] 2.4.4 release

---
 app/build.gradle                              |   4 +-
 .../bean/DeviceAlarmListResultBean.java       |  12 +-
 .../ui/activity/DeviceAlarmInfoActivity.kt    |   4 -
 .../activity/DeviceAlarmInfoDetailActivity.kt | 117 ++++++++++++++----
 .../zhdcoa/ui/activity/LoginActivity.kt       |   4 +-
 gradle/libs.versions.toml                     |   2 +-
 6 files changed, 105 insertions(+), 38 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index f2e4c48..2c8a0de 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId "com.rehome.zhdcoa"
         minSdk 24
         targetSdk 36
-        versionCode 27
-        versionName "2.4.3"
+        versionCode 28
+        versionName "2.4.4"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         //每个应用拥有不同的authorities，防止相同的在同一个手机上无法同时安装
diff --git a/app/src/main/java/com/rehome/zhdcoa/bean/DeviceAlarmListResultBean.java b/app/src/main/java/com/rehome/zhdcoa/bean/DeviceAlarmListResultBean.java
index c46d531..9c83a9a 100644
--- a/app/src/main/java/com/rehome/zhdcoa/bean/DeviceAlarmListResultBean.java
+++ b/app/src/main/java/com/rehome/zhdcoa/bean/DeviceAlarmListResultBean.java
@@ -81,12 +81,12 @@ public class DeviceAlarmListResultBean extends DeviceAlarmBaseBean{
     }
 
     public static class DeviceParams {
-        private Double tptAlarmMaxValue;//
-        private Double spdAlarmMaxValue;//
-        private Double dpmAlarmMinValue;//
-        private Double tptAlarmMinValue;//
-        private Double spdAlarmMinValue;//
-        private Double dpmAlarmMaxValue;//
+        private Double tptAlarmMaxValue;//温度报警值 ℃
+        private Double spdAlarmMaxValue;//速度故障值 mm/s
+        private Double dpmAlarmMinValue;//位移报警值 um
+        private Double tptAlarmMinValue;//温度报警值 ℃
+        private Double spdAlarmMinValue;//速度报警值 mm/s
+        private Double dpmAlarmMaxValue;//位移故障值 um
 
         public Double getSpdAlarmMaxValue() {
             return spdAlarmMaxValue;
diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceAlarmInfoActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceAlarmInfoActivity.kt
index d6a6247..f42f825 100644
--- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceAlarmInfoActivity.kt
+++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceAlarmInfoActivity.kt
@@ -119,10 +119,6 @@ class DeviceAlarmInfoActivity : BaseActivityOaToolbarViewBinding<ActivityDeviceA
         authenticationLoginDeviceAlermInfo()
     }
 
-    override fun onRestart() {
-        super.onRestart()
-        authenticationLoginDeviceAlermInfo()
-    }
 
     //创建一个ActivityResultLauncher
     private fun createQRCodeActivityResultLauncher(): ActivityResultLauncher<Intent> {
diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceAlarmInfoDetailActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceAlarmInfoDetailActivity.kt
index 58d6a70..eaff2fb 100644
--- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceAlarmInfoDetailActivity.kt
+++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceAlarmInfoDetailActivity.kt
@@ -43,7 +43,18 @@ class DeviceAlarmInfoDetailActivity : BaseActivityOaToolbarViewBinding<ActivityD
             binding.itemSb.tvStatus.text="设备"           //设备
             binding.itemQx.tvStatus.text="详情"           //详情
             binding.itemWd.tvStatus.text="温度"           //温度
-            binding.itemWdbjz.tvStatus.text="温度报警值"   //详情
+            binding.itemWdbjz.tvStatus.text="温度报警值"   //温度报警值
+            binding.itemXwy.tvStatus.text="X 轴位移"
+            binding.itemYwy.tvStatus.text="Y 轴位移"
+            binding.itemZwy.tvStatus.text="Z 轴位移"
+            binding.itemXsd.tvStatus.text="X 轴速度"
+            binding.itemYsd.tvStatus.text="Y 轴速度"
+            binding.itemZsd.tvStatus.text="Z 轴速度"
+            binding.itemZdWdbjz.tvStatus.text="温度报警值"   //振动温度报警值
+            binding.itemWybjz.tvStatus.text="位移报警值"
+            binding.itemWygzz.tvStatus.text="位移故障值"
+            binding.itemSdbjz.tvStatus.text="速度报警值"
+            binding.itemSdgzz.tvStatus.text="速度故障值"
 
             //binding.itemWd.tvBjz.text=itemDeviceWarning.temperature     //温度
             //binding.itemWdbjz.tvBjz.text=itemDeviceWarning.description  //温度报警值
@@ -63,37 +74,97 @@ class DeviceAlarmInfoDetailActivity : BaseActivityOaToolbarViewBinding<ActivityD
                         if(params.tptAlarmMinValue!=null){
                             binding.itemWdbjz.tvBjz.text= String.format("%.0f", params.tptAlarmMinValue) + "℃"     //温度
                         }else{
-                            if(params.spdAlarmMaxValue!=null){
-                                binding.itemWdbjz.tvBjz.text= String.format("%.0f", params.spdAlarmMaxValue) + "℃"     //温度
-                            }else{
-                                if(params.spdAlarmMinValue!=null){
-                                    binding.itemWdbjz.tvBjz.text= String.format("%.0f", params.spdAlarmMinValue) + "℃"     //温度
-                                }else{
-                                    if(params.dpmAlarmMaxValue!=null){
-                                        binding.itemWdbjz.tvBjz.text= String.format("%.0f", params.dpmAlarmMaxValue) + "℃"     //温度
-                                    }else{
-                                        if(params.dpmAlarmMinValue!=null){
-                                            binding.itemWdbjz.tvBjz.text= String.format("%.0f", params.dpmAlarmMinValue) + "℃"     //温度
-                                        }else{
-                                            binding.itemWdbjz.tvBjz.text=""
-                                        }
-                                    }
-                                }
-                            }
+                            binding.itemWdbjz.tvBjz.text=""
                         }
                     }
                 }
                 binding.itemWdbjz.llAll.visibility= View.VISIBLE
+                binding.llZhendong.visibility= View.GONE
             }else{
-                if("振动预警"==itemDeviceWarning.description){
-                    binding.itemWdbjz.llAll.visibility= View.GONE
-                }
-                if("振动异常"==itemDeviceWarning.description){
-                    binding.itemWdbjz.llAll.visibility= View.GONE
+//                if("振动预警"==itemDeviceWarning.description){
+//                    binding.itemWdbjz.llAll.visibility= View.GONE
+//                }
+//                if("振动异常"==itemDeviceWarning.description){
+//                    binding.itemWdbjz.llAll.visibility= View.GONE
+//                }
+                binding.itemWdbjz.llAll.visibility= View.GONE
+                binding.llZhendong.visibility= View.VISIBLE
+                if(data!=null){
+
+                    //位移
+                    binding.itemXwy.llAll.visibility= View.VISIBLE  //x位移
+                    binding.itemXwy.tvBjz.text= String.format("%.2f", data.getxDisplacement()) + "um"     //x位移
+                    binding.itemYwy.llAll.visibility= View.VISIBLE  //y位移
+                    binding.itemYwy.tvBjz.text= String.format("%.2f", data.getyDisplacement()) + "um"     //y位移
+                    binding.itemZwy.llAll.visibility= View.VISIBLE  //z位移
+                    binding.itemZwy.tvBjz.text= String.format("%.2f", data.getzDisplacement()) + "um"     //z位移
+                    //速度
+                    binding.itemXsd.llAll.visibility= View.VISIBLE  //x速度
+                    binding.itemXsd.tvBjz.text= String.format("%.2f", data.getxSpeed()) + "um"     //x速度
+                    binding.itemYsd.llAll.visibility= View.VISIBLE  //y速度
+                    binding.itemYsd.tvBjz.text= String.format("%.2f", data.getySpeed()) + "um"     //y速度
+                    binding.itemZsd.llAll.visibility= View.VISIBLE  //z速度
+                    binding.itemZsd.tvBjz.text= String.format("%.2f", data.getzSpeed()) + "um"     //z速度
+
+                    if(params!=null){
+                        //温度报警值
+                        if(params.tptAlarmMinValue!=null&&params.tptAlarmMinValue>0){
+                            binding.itemZdWdbjz.llAll.visibility= View.VISIBLE
+                            binding.itemZdWdbjz.tvBjz.text= String.format("%.0f", params.tptAlarmMinValue) + "℃"
+                        }else{
+                            binding.itemZdWdbjz.llAll.visibility= View.GONE
+                        }
+                        //位移报警值
+                        if(params.dpmAlarmMinValue!=null&&params.dpmAlarmMinValue>0){
+                            binding.itemWybjz.llAll.visibility= View.VISIBLE
+                            //binding.itemWybjz.tvBjz.text= String.format("%.0f", params.dpmAlarmMinValue) + "um"
+                            binding.itemWybjz.tvBjz.text= getResultDeviceValue(String.format("%.2f", params.dpmAlarmMinValue)) + "um"
+                        }else{
+                            binding.itemWybjz.llAll.visibility= View.GONE
+                        }
+                        //位移故障值
+                        if(params.dpmAlarmMaxValue!=null&&params.dpmAlarmMaxValue>0){
+                            binding.itemWygzz.llAll.visibility= View.VISIBLE
+                            //binding.itemWygzz.tvBjz.text= String.format("%.0f", params.dpmAlarmMaxValue) + "um"
+                            binding.itemWygzz.tvBjz.text= getResultDeviceValue(String.format("%.2f", params.dpmAlarmMaxValue)) + "um"
+                        }else{
+                            binding.itemWygzz.llAll.visibility= View.GONE
+                        }
+                        //速度报警值
+                        if(params.spdAlarmMinValue!=null&&params.spdAlarmMinValue>0){
+                            binding.itemSdbjz.llAll.visibility= View.VISIBLE
+                            //binding.itemSdbjz.tvBjz.text= String.format("%.0f", params.spdAlarmMinValue) + "mm/s"
+                            binding.itemSdbjz.tvBjz.text= getResultDeviceValue(String.format("%.2f", params.spdAlarmMinValue)) + "mm/s"
+                        }else{
+                            binding.itemSdbjz.llAll.visibility= View.GONE
+                        }
+                        //速度故障值
+                        if(params.spdAlarmMaxValue!=null&&params.spdAlarmMaxValue>0){
+                            binding.itemSdgzz.llAll.visibility= View.VISIBLE
+                            //val valueStr = String.format("%.2f", params.spdAlarmMaxValue)
+                            binding.itemSdgzz.tvBjz.text= getResultDeviceValue(String.format("%.2f", params.spdAlarmMaxValue)) + "mm/s"
+                        }else{
+                            binding.itemSdgzz.llAll.visibility= View.GONE
+                        }
+                    }
                 }
             }
         }
     }
+    private fun getResultDeviceValue(valueStr:String):String{
+        // 检查是否末尾有0且小数点后有两位数字，如果是，则去掉末尾的0和可能的小数点
+        var result = ""
+        if (valueStr.endsWith(".00")) {
+            result = valueStr.substring(0, valueStr.length - 2) // 去掉".0"
+        } else {
+            if (valueStr.endsWith("0")) {
+                result = valueStr.substring(0, valueStr.length - 1) // 去掉".0"
+            }else{
+                result=valueStr // 否则直接返回结果valueStr // 否则直接返回结果
+            }
+        }
+        return result
+    }
 }
 /**
  * {"createTime":"2025-12-31 20:59:55","data":"{\"id\":3211802,\"mqttIp\":\"172.16.5.226\",\"deviceCode\":\"003c0003\",\"deviceTime\":1767185984839,\"pkNum\":21252,\"status\":2,\"voltage\":3.4907227,\"temperature\":89,\"xAcceleration\":0,\"yAcceleration\":0,\"zAcceleration\":0,\"xSpeed\":0,\"ySpeed\":0,\"zSpeed\":0,\"xDisplacement\":0,\"yDisplacement\":0,\"zDisplacement\":0,\"xDcComponent\":0,\"yDcComponent\":0,\"zDcComponent\":0,\"xFrequency\":0,\"yFrequency\":0,\"zFrequency\":0,\"xFreq\":0,\"yFreq\":0,\"zFreq\":0}","description":"温度预警","deviceCode":"003c0003","deviceName":"1#锅炉6F东侧04吹灰器","id":80730,"params":"{\"tptAlarmMaxValue\":70,\"tptAlarmMinValue\":70}","specialtyStr":"锅炉","statusStr":"报警","typeStr":"测振测温设备","warningTime":"2025-12-31 20:59:45"}
diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt
index 8f4cbce..0fd11dc 100644
--- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt
+++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt
@@ -228,8 +228,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
 
         if (isApkInDebug(context)) {
             //        管理员
-            binding.etUsername.setText("ZHPS_Admin")
-            binding.etPassword.setText("Rehome.zhps@996")
+//            binding.etUsername.setText("ZHPS_Admin")
+//            binding.etPassword.setText("Rehome.zhps@996")
 
 
             //公司内网215管理员
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8e333b5..96e9162 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.10.0"
+agp = "8.10.1"
 androidxRecyclerview = "1.4.0"
 appupdate = "4.2.6"
 barcodeScanning = "17.3.0"