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 70c634a..13ddd6f 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
@@ -20,6 +20,7 @@ import com.rehome.zhdcoa.utils.GsonUtils
 import com.rehome.zhdcoa.utils.HttpListener
 import com.rehome.zhdcoa.utils.NohttpUtils
 import com.rehome.zhdcoa.utils.RSAAndroid
+import com.rehome.zhdcoa.weiget.LoadListView
 import com.yolanda.nohttp.NoHttp
 import com.yolanda.nohttp.RequestMethod
 import com.yolanda.nohttp.rest.Response
@@ -96,20 +97,21 @@ class DeviceAlarmInfoActivity : BaseActivityOaToolbarViewBinding<ActivityDeviceA
         binding.lv.onItemClickListener = AdapterView.OnItemClickListener { _, _, position, _ ->
             val item:DeviceAlarmListResultBean.DeviceWarning = datas[position]
             showLog(GsonUtils.GsonString(item))
+            //点击进入应急预案执行状态
+//            val intent = Intent(context, YjyaActionActivity::class.java)
+//            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP)
+//            intent.putExtra("YAID",item.id)
+//            startActivity(intent)
         }
 
         binding.btnQuery.setOnClickListener {
             authenticationLoginDeviceAlermInfo()
         }
 
-//        binding.lv.setOnItemClickListener { _, _, position, _ ->
-//            val  item: WarehouseHuoJiaBean.RowsBean = warehouseHuoJiaList[position]
-//            val intent = Intent()
-//            intent.setClass(this, WztpblScDetailActivity::class.java)
-//            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP)
-//            intent.putExtra("item",Gson().toJson(item))
-//            startActivity(intent)
-//        }
+        binding.lv.setInterface(LoadListView.ILoadListener {
+            getAlermListLoadMoreData()
+        })
+
 
     }
 
@@ -239,6 +241,7 @@ class DeviceAlarmInfoActivity : BaseActivityOaToolbarViewBinding<ActivityDeviceA
                     deviceAlarmInfoAdapter.notifyDataSetChanged()
                     binding.tvNodata.visibility = View.GONE
                     headView.visibility = View.VISIBLE
+                    pageNo++
                 }else{
                     datas.clear()
                     deviceAlarmInfoAdapter.notifyDataSetChanged()
@@ -253,6 +256,60 @@ class DeviceAlarmInfoActivity : BaseActivityOaToolbarViewBinding<ActivityDeviceA
         })
     }
 
+    private fun getAlermListLoadMoreData() {
+        val request = NoHttp.createStringRequest(
+            Contans.IP + Contans.DeviceAlermInfoListUrl,
+            RequestMethod.GET
+        )
+
+        request.add("pageNo",pageNo)
+        request.add("pageSize",pageSize)
+        val zyTemp:String = binding.spZy.selectedItem.toString()
+
+        val zyIndex:Int = binding.spZy.selectedItemPosition
+        if(zyIndex!=0){
+            request.add("specialty",specialtyList[zyIndex])
+        }
+
+        showLog(zyTemp)
+        showLog(zyIndex.toString())
+
+        val keyword = binding.etKey.text.toString().trim()
+        if(!TextUtils.isEmpty(keyword)){
+            request.add("keyword",keyword)
+        }
+
+        NohttpUtils.getInstance().add(this, 0, request, object : HttpListener<String?> {
+
+            override fun onSucceed(what: Int, response: Response<String?>?) {
+                val result = response?.get()
+                showLog("----------------")
+                showLog(result)
+                val bean = GsonUtils.GsonToBean(
+                    result,
+                    DeviceAlarmListResultBean::class.java
+                )
+
+                showLog(GsonUtils.GsonString(bean))
+                if (bean != null && bean.code == 20000 && bean.isSuccess && bean.data != null && bean.data.dataList != null && bean.data.dataList.size>0) {
+                    datas.addAll(bean.data.dataList)
+                    deviceAlarmInfoAdapter.notifyDataSetChanged()
+                    binding.tvNodata.visibility = View.GONE
+                    headView.visibility = View.VISIBLE
+                    pageNo++
+                    binding.lv.loadComplete()
+                }else{
+                    showToast("没有更多数据啦")
+                }
+            }
+
+            override fun onFailed(what: Int, response: Response<String?>?) {
+                showToast("加载数据失败")
+                binding.lv.loadComplete()
+            }
+        })
+    }
+
     private fun toWorkRiskListHuiBaoActivity(type:String){
         //工作情况汇报
         val intent = Intent(context, WorkRiskListHuiBaoActivity::class.java)
diff --git a/app/src/main/java/com/rehome/zhdcoa/utils/ApplyListUtils.java b/app/src/main/java/com/rehome/zhdcoa/utils/ApplyListUtils.java
index ca64eea..a62f971 100644
--- a/app/src/main/java/com/rehome/zhdcoa/utils/ApplyListUtils.java
+++ b/app/src/main/java/com/rehome/zhdcoa/utils/ApplyListUtils.java
@@ -1013,7 +1013,7 @@ public class ApplyListUtils {
 
             @Override
             public void onFailed(int what, com.yolanda.nohttp.rest.Response<String> response) {
-
+                showToast("加载数据失败");
             }
         });
 
diff --git a/app/src/main/res/layout/activity_device_alarm_infofo.xml b/app/src/main/res/layout/activity_device_alarm_infofo.xml
index 91cb815..afc76f8 100644
--- a/app/src/main/res/layout/activity_device_alarm_infofo.xml
+++ b/app/src/main/res/layout/activity_device_alarm_infofo.xml
@@ -83,7 +83,7 @@
         android:layout_marginBottom="5dp"
         android:layout_weight="1">
 
-        <ListView
+        <com.rehome.zhdcoa.weiget.LoadListView
             android:id="@+id/lv"
             android:layout_width="match_parent"
             android:layout_height="match_parent"