diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c700f76..1e8c843 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -83,7 +83,6 @@
tools:targetApi="s">
-
@@ -444,6 +443,9 @@
+
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 13ddd6f..d6a6247 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
@@ -98,10 +98,10 @@ class DeviceAlarmInfoActivity : BaseActivityOaToolbarViewBinding() {
+ override fun getViewBinding() = ActivityDeviceAlarmInfoDetailBinding.inflate(layoutInflater)
+
+ override fun getToolbar() = binding.toolbarView.toolbar
+
+ override fun initView() {
+ initToolbar("设备预警信息详情", "",{
+
+ })
+ //binding.tvPaiHao.setTextColor(Color.parseColor("#0099ff"))
+ binding.itemZt.tvBjz.setTextColor(Color.parseColor("#0099ff"))
+ binding.itemZt.vHead.visibility= View.VISIBLE
+ }
+
+ @SuppressLint("SetTextI18n", "DefaultLocale")
+ override fun initData() {
+ val item:String = intent.getStringExtra("item").toString()
+ showLog(item)
+ val itemDeviceWarning:DeviceAlarmListResultBean.DeviceWarning? = GsonUtils.GsonToBean(item,DeviceAlarmListResultBean.DeviceWarning::class.java)
+ if(itemDeviceWarning==null){
+ showLog("null")
+ }else{
+ showLog(itemDeviceWarning.warningTime)
+ binding.itemZt.tvBjz.text=itemDeviceWarning.statusStr //状态
+ binding.itemLx.tvBjz.text=itemDeviceWarning.typeStr //类型
+ binding.itemYjsj.tvBjz.text=itemDeviceWarning.warningTime //预警时间
+ binding.itemSb.tvBjz.text=itemDeviceWarning.deviceName //设备
+ binding.itemQx.tvBjz.text=itemDeviceWarning.description //详情
+
+ binding.itemZt.tvStatus.text="状态" //状态
+ binding.itemLx.tvStatus.text="类型" //类型
+ binding.itemYjsj.tvStatus.text="预警时间" //预警时间
+ binding.itemSb.tvStatus.text="设备" //设备
+ binding.itemQx.tvStatus.text="详情" //详情
+ binding.itemWd.tvStatus.text="温度" //温度
+ binding.itemWdbjz.tvStatus.text="温度报警值" //详情
+
+ //binding.itemWd.tvBjz.text=itemDeviceWarning.temperature //温度
+ //binding.itemWdbjz.tvBjz.text=itemDeviceWarning.description //温度报警值
+ val paramsStr:String = itemDeviceWarning.params
+ val dataStr:String = itemDeviceWarning.data
+ val data:DeviceAlarmListResultBean.DeviceData? = GsonUtils.GsonToBean(dataStr,DeviceAlarmListResultBean.DeviceData::class.java)
+ val params:DeviceAlarmListResultBean.DeviceParams? = GsonUtils.GsonToBean(paramsStr,DeviceAlarmListResultBean.DeviceParams::class.java)
+ if(data!=null){
+ binding.itemWd.tvBjz.text= String.format("%.0f", data.temperature) + "℃" //温度
+ }
+ if("温度预警"==itemDeviceWarning.description){
+ binding.itemWd.tvBjz.setTextColor(Color.parseColor("#e9260f"))
+ if(data!=null&¶ms!=null){
+ if(params.tptAlarmMaxValue!=null){
+ binding.itemWdbjz.tvBjz.text= String.format("%.0f", params.tptAlarmMaxValue) + "℃" //温度
+ }else{
+ 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.llAll.visibility= View.VISIBLE
+ }else{
+ if("振动预警"==itemDeviceWarning.description){
+ binding.itemWdbjz.llAll.visibility= View.GONE
+ }
+ if("振动异常"==itemDeviceWarning.description){
+ binding.itemWdbjz.llAll.visibility= View.GONE
+ }
+ }
+ }
+ }
+}
+/**
+ * {"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"}
+ */
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_device_alarm_info_detail.xml b/app/src/main/res/layout/activity_device_alarm_info_detail.xml
new file mode 100644
index 0000000..a14a61d
--- /dev/null
+++ b/app/src/main/res/layout/activity_device_alarm_info_detail.xml
@@ -0,0 +1,172 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_device_alarm_info.xml b/app/src/main/res/layout/item_device_alarm_info.xml
new file mode 100644
index 0000000..d9c071d
--- /dev/null
+++ b/app/src/main/res/layout/item_device_alarm_info.xml
@@ -0,0 +1,70 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/item_device_alarm_info_header.xml b/app/src/main/res/layout/item_device_alarm_info_header.xml
new file mode 100644
index 0000000..3b575cb
--- /dev/null
+++ b/app/src/main/res/layout/item_device_alarm_info_header.xml
@@ -0,0 +1,76 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+