diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/adapter/AlarmListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/adapter/AlarmListAdapter.kt index a5a562c..0d8661e 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/adapter/AlarmListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/adapter/AlarmListAdapter.kt @@ -11,7 +11,9 @@ import com.casic.app.smartwell.sanxi.model.AlarmListModel class AlarmListAdapter( - context: Context, private val dataRows: MutableList + context: Context, + private val dataRows: MutableList, + private val showCancelButton: Boolean ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -52,8 +54,12 @@ holder.itemView.setOnClickListener { listener!!.onClicked(position) } - holder.operationButton.setOnClickListener { - listener!!.onOperationClicked(position) + if (showCancelButton) { + holder.operationButton.setOnClickListener { + listener!!.onOperationClicked(position) + } + } else { + holder.operationButton.visibility = View.GONE } } } diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/adapter/AlarmListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/adapter/AlarmListAdapter.kt index a5a562c..0d8661e 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/adapter/AlarmListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/adapter/AlarmListAdapter.kt @@ -11,7 +11,9 @@ import com.casic.app.smartwell.sanxi.model.AlarmListModel class AlarmListAdapter( - context: Context, private val dataRows: MutableList + context: Context, + private val dataRows: MutableList, + private val showCancelButton: Boolean ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -52,8 +54,12 @@ holder.itemView.setOnClickListener { listener!!.onClicked(position) } - holder.operationButton.setOnClickListener { - listener!!.onOperationClicked(position) + if (showCancelButton) { + holder.operationButton.setOnClickListener { + listener!!.onOperationClicked(position) + } + } else { + holder.operationButton.visibility = View.GONE } } } diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/Long.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/Long.kt index 3be08a8..8e01e1d 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/Long.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/Long.kt @@ -6,11 +6,14 @@ fun Long.timestampToDate(): String = SimpleDateFormat("yyyy-MM-dd", Locale.CHINA).format(Date(this)) +fun Long.timestampToTime(): String = + SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA).format(Date(this)) + fun Long.isEarlierThanStart(date: String): Boolean { if (date.isBlank()) { return false } - val dateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.CHINA) + val dateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA) try { return this < dateFormat.parse(date)!!.time } catch (e: ParseException) { diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/adapter/AlarmListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/adapter/AlarmListAdapter.kt index a5a562c..0d8661e 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/adapter/AlarmListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/adapter/AlarmListAdapter.kt @@ -11,7 +11,9 @@ import com.casic.app.smartwell.sanxi.model.AlarmListModel class AlarmListAdapter( - context: Context, private val dataRows: MutableList + context: Context, + private val dataRows: MutableList, + private val showCancelButton: Boolean ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -52,8 +54,12 @@ holder.itemView.setOnClickListener { listener!!.onClicked(position) } - holder.operationButton.setOnClickListener { - listener!!.onOperationClicked(position) + if (showCancelButton) { + holder.operationButton.setOnClickListener { + listener!!.onOperationClicked(position) + } + } else { + holder.operationButton.visibility = View.GONE } } } diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/Long.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/Long.kt index 3be08a8..8e01e1d 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/Long.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/Long.kt @@ -6,11 +6,14 @@ fun Long.timestampToDate(): String = SimpleDateFormat("yyyy-MM-dd", Locale.CHINA).format(Date(this)) +fun Long.timestampToTime(): String = + SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA).format(Date(this)) + fun Long.isEarlierThanStart(date: String): Boolean { if (date.isBlank()) { return false } - val dateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.CHINA) + val dateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA) try { return this < dateFormat.parse(date)!!.time } catch (e: ParseException) { diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt index d17458f..4eea640 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt @@ -48,7 +48,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) - obtainAlarmListByPage(pageIndex) + obtainAlarmListByPage() BroadcastReceiverManager.instance.addAction( Constant.CANCEL_ALARM_ACTION, object : BroadcastReceiver() { override fun onReceive(context: Context?, intent: Intent?) { @@ -63,12 +63,12 @@ isRefresh = true //刷新之后页码重置 pageIndex = 1 - obtainAlarmListByPage(pageIndex) + obtainAlarmListByPage() } alarmListLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ - obtainAlarmListByPage(pageIndex) + obtainAlarmListByPage() } alarmViewModel.listModel.observe(this, { @@ -98,7 +98,7 @@ }) } - private fun obtainAlarmListByPage(pageIndex: Int) { + private fun obtainAlarmListByPage() { alarmViewModel.obtainAlarmList("", "", "", "", "", "1", pageIndex) } @@ -116,12 +116,14 @@ } else { //首次加载数据 if (fragment.dataBeans.size == 0) { fragment.emptyView!!.showEmptyPage { - fragment.obtainAlarmListByPage(fragment.pageIndex) + fragment.pageIndex = 1 + fragment.obtainAlarmListByPage() } } else { fragment.emptyView!!.hide() - fragment.alarmListAdapter = - AlarmListAdapter(fragment.requireContext(), fragment.dataBeans) + fragment.alarmListAdapter = AlarmListAdapter( + fragment.requireContext(), fragment.dataBeans, true + ) fragment.alarmListView!!.layoutManager = LinearLayoutManager(fragment.requireContext()) fragment.alarmListView!!.adapter = fragment.alarmListAdapter diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/adapter/AlarmListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/adapter/AlarmListAdapter.kt index a5a562c..0d8661e 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/adapter/AlarmListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/adapter/AlarmListAdapter.kt @@ -11,7 +11,9 @@ import com.casic.app.smartwell.sanxi.model.AlarmListModel class AlarmListAdapter( - context: Context, private val dataRows: MutableList + context: Context, + private val dataRows: MutableList, + private val showCancelButton: Boolean ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -52,8 +54,12 @@ holder.itemView.setOnClickListener { listener!!.onClicked(position) } - holder.operationButton.setOnClickListener { - listener!!.onOperationClicked(position) + if (showCancelButton) { + holder.operationButton.setOnClickListener { + listener!!.onOperationClicked(position) + } + } else { + holder.operationButton.visibility = View.GONE } } } diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/Long.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/Long.kt index 3be08a8..8e01e1d 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/Long.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/Long.kt @@ -6,11 +6,14 @@ fun Long.timestampToDate(): String = SimpleDateFormat("yyyy-MM-dd", Locale.CHINA).format(Date(this)) +fun Long.timestampToTime(): String = + SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA).format(Date(this)) + fun Long.isEarlierThanStart(date: String): Boolean { if (date.isBlank()) { return false } - val dateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.CHINA) + val dateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA) try { return this < dateFormat.parse(date)!!.time } catch (e: ParseException) { diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt index d17458f..4eea640 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt @@ -48,7 +48,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) - obtainAlarmListByPage(pageIndex) + obtainAlarmListByPage() BroadcastReceiverManager.instance.addAction( Constant.CANCEL_ALARM_ACTION, object : BroadcastReceiver() { override fun onReceive(context: Context?, intent: Intent?) { @@ -63,12 +63,12 @@ isRefresh = true //刷新之后页码重置 pageIndex = 1 - obtainAlarmListByPage(pageIndex) + obtainAlarmListByPage() } alarmListLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ - obtainAlarmListByPage(pageIndex) + obtainAlarmListByPage() } alarmViewModel.listModel.observe(this, { @@ -98,7 +98,7 @@ }) } - private fun obtainAlarmListByPage(pageIndex: Int) { + private fun obtainAlarmListByPage() { alarmViewModel.obtainAlarmList("", "", "", "", "", "1", pageIndex) } @@ -116,12 +116,14 @@ } else { //首次加载数据 if (fragment.dataBeans.size == 0) { fragment.emptyView!!.showEmptyPage { - fragment.obtainAlarmListByPage(fragment.pageIndex) + fragment.pageIndex = 1 + fragment.obtainAlarmListByPage() } } else { fragment.emptyView!!.hide() - fragment.alarmListAdapter = - AlarmListAdapter(fragment.requireContext(), fragment.dataBeans) + fragment.alarmListAdapter = AlarmListAdapter( + fragment.requireContext(), fragment.dataBeans, true + ) fragment.alarmListView!!.layoutManager = LinearLayoutManager(fragment.requireContext()) fragment.alarmListView!!.adapter = fragment.alarmListAdapter diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/sanxi/model/AlarmContentModel.java new file mode 100644 index 0000000..9c30630 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.sanxi.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/adapter/AlarmListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/adapter/AlarmListAdapter.kt index a5a562c..0d8661e 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/adapter/AlarmListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/adapter/AlarmListAdapter.kt @@ -11,7 +11,9 @@ import com.casic.app.smartwell.sanxi.model.AlarmListModel class AlarmListAdapter( - context: Context, private val dataRows: MutableList + context: Context, + private val dataRows: MutableList, + private val showCancelButton: Boolean ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -52,8 +54,12 @@ holder.itemView.setOnClickListener { listener!!.onClicked(position) } - holder.operationButton.setOnClickListener { - listener!!.onOperationClicked(position) + if (showCancelButton) { + holder.operationButton.setOnClickListener { + listener!!.onOperationClicked(position) + } + } else { + holder.operationButton.visibility = View.GONE } } } diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/Long.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/Long.kt index 3be08a8..8e01e1d 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/Long.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/Long.kt @@ -6,11 +6,14 @@ fun Long.timestampToDate(): String = SimpleDateFormat("yyyy-MM-dd", Locale.CHINA).format(Date(this)) +fun Long.timestampToTime(): String = + SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA).format(Date(this)) + fun Long.isEarlierThanStart(date: String): Boolean { if (date.isBlank()) { return false } - val dateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.CHINA) + val dateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA) try { return this < dateFormat.parse(date)!!.time } catch (e: ParseException) { diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt index d17458f..4eea640 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt @@ -48,7 +48,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) - obtainAlarmListByPage(pageIndex) + obtainAlarmListByPage() BroadcastReceiverManager.instance.addAction( Constant.CANCEL_ALARM_ACTION, object : BroadcastReceiver() { override fun onReceive(context: Context?, intent: Intent?) { @@ -63,12 +63,12 @@ isRefresh = true //刷新之后页码重置 pageIndex = 1 - obtainAlarmListByPage(pageIndex) + obtainAlarmListByPage() } alarmListLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ - obtainAlarmListByPage(pageIndex) + obtainAlarmListByPage() } alarmViewModel.listModel.observe(this, { @@ -98,7 +98,7 @@ }) } - private fun obtainAlarmListByPage(pageIndex: Int) { + private fun obtainAlarmListByPage() { alarmViewModel.obtainAlarmList("", "", "", "", "", "1", pageIndex) } @@ -116,12 +116,14 @@ } else { //首次加载数据 if (fragment.dataBeans.size == 0) { fragment.emptyView!!.showEmptyPage { - fragment.obtainAlarmListByPage(fragment.pageIndex) + fragment.pageIndex = 1 + fragment.obtainAlarmListByPage() } } else { fragment.emptyView!!.hide() - fragment.alarmListAdapter = - AlarmListAdapter(fragment.requireContext(), fragment.dataBeans) + fragment.alarmListAdapter = AlarmListAdapter( + fragment.requireContext(), fragment.dataBeans, true + ) fragment.alarmListView!!.layoutManager = LinearLayoutManager(fragment.requireContext()) fragment.alarmListView!!.adapter = fragment.alarmListAdapter diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/sanxi/model/AlarmContentModel.java new file mode 100644 index 0000000..9c30630 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.sanxi.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitService.kt index b028218..e8f98c6 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitService.kt @@ -69,7 +69,7 @@ ): String /** - * 告警列表 + * 当前告警列表 */ @GET("/alarm/list") suspend fun obtainAlarmList( @@ -85,6 +85,21 @@ ): String /** + * 告警记录列表 + */ + @GET("/alarm/list") + suspend fun obtainAlarmHistoryList( + @Header("token") token: String, + @Query("keywords") keywords: String, + @Query("alarmType") alarmType: String, + @Query("alarmContentType") alarmContentType: String, + @Query("beginTime") beginTime: String, + @Query("endTime") endTime: String, + @Query("offset") offset: Int, + @Query("limit") limit: Int + ): String + + /** * 获取闸井详情 * * @param id 窨井ID @@ -96,6 +111,16 @@ ): String /** + * 告警内容列表 + * @param alarmType 告警类型 + * */ + @GET("/alarm/contentType") + suspend fun obtainAlarmContent( + @Header("token") token: String, + @Query("alarmType") alarmType: String + ): String + + /** * 根据布防状态统计闸井数量接口 */ @GET("/well/countByBfzt") @@ -277,16 +302,6 @@ ): String /** - * 告警内容列表 - * @param alarmType 告警类型 - * */ - @GET("/alarm/contentType") - suspend fun obtainAlarmContentType( - @Header("token") token: String, - @Query("alarmType") alarmType: String - ): String - - /** * 工单状态 * */ @GET("/dict/code/jobStatus") diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/adapter/AlarmListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/adapter/AlarmListAdapter.kt index a5a562c..0d8661e 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/adapter/AlarmListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/adapter/AlarmListAdapter.kt @@ -11,7 +11,9 @@ import com.casic.app.smartwell.sanxi.model.AlarmListModel class AlarmListAdapter( - context: Context, private val dataRows: MutableList + context: Context, + private val dataRows: MutableList, + private val showCancelButton: Boolean ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -52,8 +54,12 @@ holder.itemView.setOnClickListener { listener!!.onClicked(position) } - holder.operationButton.setOnClickListener { - listener!!.onOperationClicked(position) + if (showCancelButton) { + holder.operationButton.setOnClickListener { + listener!!.onOperationClicked(position) + } + } else { + holder.operationButton.visibility = View.GONE } } } diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/Long.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/Long.kt index 3be08a8..8e01e1d 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/Long.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/Long.kt @@ -6,11 +6,14 @@ fun Long.timestampToDate(): String = SimpleDateFormat("yyyy-MM-dd", Locale.CHINA).format(Date(this)) +fun Long.timestampToTime(): String = + SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA).format(Date(this)) + fun Long.isEarlierThanStart(date: String): Boolean { if (date.isBlank()) { return false } - val dateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.CHINA) + val dateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA) try { return this < dateFormat.parse(date)!!.time } catch (e: ParseException) { diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt index d17458f..4eea640 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt @@ -48,7 +48,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) - obtainAlarmListByPage(pageIndex) + obtainAlarmListByPage() BroadcastReceiverManager.instance.addAction( Constant.CANCEL_ALARM_ACTION, object : BroadcastReceiver() { override fun onReceive(context: Context?, intent: Intent?) { @@ -63,12 +63,12 @@ isRefresh = true //刷新之后页码重置 pageIndex = 1 - obtainAlarmListByPage(pageIndex) + obtainAlarmListByPage() } alarmListLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ - obtainAlarmListByPage(pageIndex) + obtainAlarmListByPage() } alarmViewModel.listModel.observe(this, { @@ -98,7 +98,7 @@ }) } - private fun obtainAlarmListByPage(pageIndex: Int) { + private fun obtainAlarmListByPage() { alarmViewModel.obtainAlarmList("", "", "", "", "", "1", pageIndex) } @@ -116,12 +116,14 @@ } else { //首次加载数据 if (fragment.dataBeans.size == 0) { fragment.emptyView!!.showEmptyPage { - fragment.obtainAlarmListByPage(fragment.pageIndex) + fragment.pageIndex = 1 + fragment.obtainAlarmListByPage() } } else { fragment.emptyView!!.hide() - fragment.alarmListAdapter = - AlarmListAdapter(fragment.requireContext(), fragment.dataBeans) + fragment.alarmListAdapter = AlarmListAdapter( + fragment.requireContext(), fragment.dataBeans, true + ) fragment.alarmListView!!.layoutManager = LinearLayoutManager(fragment.requireContext()) fragment.alarmListView!!.adapter = fragment.alarmListAdapter diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/sanxi/model/AlarmContentModel.java new file mode 100644 index 0000000..9c30630 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.sanxi.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitService.kt index b028218..e8f98c6 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitService.kt @@ -69,7 +69,7 @@ ): String /** - * 告警列表 + * 当前告警列表 */ @GET("/alarm/list") suspend fun obtainAlarmList( @@ -85,6 +85,21 @@ ): String /** + * 告警记录列表 + */ + @GET("/alarm/list") + suspend fun obtainAlarmHistoryList( + @Header("token") token: String, + @Query("keywords") keywords: String, + @Query("alarmType") alarmType: String, + @Query("alarmContentType") alarmContentType: String, + @Query("beginTime") beginTime: String, + @Query("endTime") endTime: String, + @Query("offset") offset: Int, + @Query("limit") limit: Int + ): String + + /** * 获取闸井详情 * * @param id 窨井ID @@ -96,6 +111,16 @@ ): String /** + * 告警内容列表 + * @param alarmType 告警类型 + * */ + @GET("/alarm/contentType") + suspend fun obtainAlarmContent( + @Header("token") token: String, + @Query("alarmType") alarmType: String + ): String + + /** * 根据布防状态统计闸井数量接口 */ @GET("/well/countByBfzt") @@ -277,16 +302,6 @@ ): String /** - * 告警内容列表 - * @param alarmType 告警类型 - * */ - @GET("/alarm/contentType") - suspend fun obtainAlarmContentType( - @Header("token") token: String, - @Query("alarmType") alarmType: String - ): String - - /** * 工单状态 * */ @GET("/dict/code/jobStatus") diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitServiceManager.kt index 48c409d..6ddaa8f 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitServiceManager.kt @@ -84,12 +84,42 @@ } /** + * 告警记录列表 + */ + suspend fun obtainAlarmHistoryList( + keywords: String, + alarmType: String, + alarmContentType: String, + beginTime: String, + endTime: String, + page: Int + ): String { + return api.obtainAlarmHistoryList( + AuthenticationHelper.token!!, + keywords, + alarmType, + alarmContentType, + beginTime, + endTime, + page, + Constant.PAGE_LIMIT + ) + } + + /** * 获取闸井详情 */ suspend fun obtainWellDetail(id: String): String { return api.obtainWellDetail(AuthenticationHelper.token!!, id) } + /** + * 告警内容列表 + */ + suspend fun obtainAlarmContent(alarmType: String): String { + return api.obtainAlarmContent(AuthenticationHelper.token!!, alarmType) + } + // /** // * 根据布防状态统计闸井数量接口 // */ @@ -223,13 +253,6 @@ // } // // /** -// * 告警内容列表 -// */ -// suspend fun obtainAlarmContentType(alarmType: String): String { -// return api.obtainAlarmContentType(AuthenticationHelper.token!!, alarmType) -// } -// -// /** // * 工单状态 // */ // suspend fun obtainOrderStatus(): String { diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/adapter/AlarmListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/adapter/AlarmListAdapter.kt index a5a562c..0d8661e 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/adapter/AlarmListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/adapter/AlarmListAdapter.kt @@ -11,7 +11,9 @@ import com.casic.app.smartwell.sanxi.model.AlarmListModel class AlarmListAdapter( - context: Context, private val dataRows: MutableList + context: Context, + private val dataRows: MutableList, + private val showCancelButton: Boolean ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) @@ -52,8 +54,12 @@ holder.itemView.setOnClickListener { listener!!.onClicked(position) } - holder.operationButton.setOnClickListener { - listener!!.onOperationClicked(position) + if (showCancelButton) { + holder.operationButton.setOnClickListener { + listener!!.onOperationClicked(position) + } + } else { + holder.operationButton.visibility = View.GONE } } } diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/Long.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/Long.kt index 3be08a8..8e01e1d 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/Long.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/Long.kt @@ -6,11 +6,14 @@ fun Long.timestampToDate(): String = SimpleDateFormat("yyyy-MM-dd", Locale.CHINA).format(Date(this)) +fun Long.timestampToTime(): String = + SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA).format(Date(this)) + fun Long.isEarlierThanStart(date: String): Boolean { if (date.isBlank()) { return false } - val dateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.CHINA) + val dateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA) try { return this < dateFormat.parse(date)!!.time } catch (e: ParseException) { diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt index d17458f..4eea640 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/AlarmPageFragment.kt @@ -48,7 +48,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) - obtainAlarmListByPage(pageIndex) + obtainAlarmListByPage() BroadcastReceiverManager.instance.addAction( Constant.CANCEL_ALARM_ACTION, object : BroadcastReceiver() { override fun onReceive(context: Context?, intent: Intent?) { @@ -63,12 +63,12 @@ isRefresh = true //刷新之后页码重置 pageIndex = 1 - obtainAlarmListByPage(pageIndex) + obtainAlarmListByPage() } alarmListLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ - obtainAlarmListByPage(pageIndex) + obtainAlarmListByPage() } alarmViewModel.listModel.observe(this, { @@ -98,7 +98,7 @@ }) } - private fun obtainAlarmListByPage(pageIndex: Int) { + private fun obtainAlarmListByPage() { alarmViewModel.obtainAlarmList("", "", "", "", "", "1", pageIndex) } @@ -116,12 +116,14 @@ } else { //首次加载数据 if (fragment.dataBeans.size == 0) { fragment.emptyView!!.showEmptyPage { - fragment.obtainAlarmListByPage(fragment.pageIndex) + fragment.pageIndex = 1 + fragment.obtainAlarmListByPage() } } else { fragment.emptyView!!.hide() - fragment.alarmListAdapter = - AlarmListAdapter(fragment.requireContext(), fragment.dataBeans) + fragment.alarmListAdapter = AlarmListAdapter( + fragment.requireContext(), fragment.dataBeans, true + ) fragment.alarmListView!!.layoutManager = LinearLayoutManager(fragment.requireContext()) fragment.alarmListView!!.adapter = fragment.alarmListAdapter diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/model/AlarmContentModel.java b/app/src/main/java/com/casic/app/smartwell/sanxi/model/AlarmContentModel.java new file mode 100644 index 0000000..9c30630 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/model/AlarmContentModel.java @@ -0,0 +1,85 @@ +package com.casic.app.smartwell.sanxi.model; + +import java.util.List; + +public class AlarmContentModel { + + private int code; + private DataBean data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataBean { + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + + public static class ListBean { + private String deviceType; + private String alarmType; + private String name; + private String value; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + } +} diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitService.kt index b028218..e8f98c6 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitService.kt @@ -69,7 +69,7 @@ ): String /** - * 告警列表 + * 当前告警列表 */ @GET("/alarm/list") suspend fun obtainAlarmList( @@ -85,6 +85,21 @@ ): String /** + * 告警记录列表 + */ + @GET("/alarm/list") + suspend fun obtainAlarmHistoryList( + @Header("token") token: String, + @Query("keywords") keywords: String, + @Query("alarmType") alarmType: String, + @Query("alarmContentType") alarmContentType: String, + @Query("beginTime") beginTime: String, + @Query("endTime") endTime: String, + @Query("offset") offset: Int, + @Query("limit") limit: Int + ): String + + /** * 获取闸井详情 * * @param id 窨井ID @@ -96,6 +111,16 @@ ): String /** + * 告警内容列表 + * @param alarmType 告警类型 + * */ + @GET("/alarm/contentType") + suspend fun obtainAlarmContent( + @Header("token") token: String, + @Query("alarmType") alarmType: String + ): String + + /** * 根据布防状态统计闸井数量接口 */ @GET("/well/countByBfzt") @@ -277,16 +302,6 @@ ): String /** - * 告警内容列表 - * @param alarmType 告警类型 - * */ - @GET("/alarm/contentType") - suspend fun obtainAlarmContentType( - @Header("token") token: String, - @Query("alarmType") alarmType: String - ): String - - /** * 工单状态 * */ @GET("/dict/code/jobStatus") diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitServiceManager.kt index 48c409d..6ddaa8f 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitServiceManager.kt @@ -84,12 +84,42 @@ } /** + * 告警记录列表 + */ + suspend fun obtainAlarmHistoryList( + keywords: String, + alarmType: String, + alarmContentType: String, + beginTime: String, + endTime: String, + page: Int + ): String { + return api.obtainAlarmHistoryList( + AuthenticationHelper.token!!, + keywords, + alarmType, + alarmContentType, + beginTime, + endTime, + page, + Constant.PAGE_LIMIT + ) + } + + /** * 获取闸井详情 */ suspend fun obtainWellDetail(id: String): String { return api.obtainWellDetail(AuthenticationHelper.token!!, id) } + /** + * 告警内容列表 + */ + suspend fun obtainAlarmContent(alarmType: String): String { + return api.obtainAlarmContent(AuthenticationHelper.token!!, alarmType) + } + // /** // * 根据布防状态统计闸井数量接口 // */ @@ -223,13 +253,6 @@ // } // // /** -// * 告警内容列表 -// */ -// suspend fun obtainAlarmContentType(alarmType: String): String { -// return api.obtainAlarmContentType(AuthenticationHelper.token!!, alarmType) -// } -// -// /** // * 工单状态 // */ // suspend fun obtainOrderStatus(): String { diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/view/SearchAlarmActivity.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/view/SearchAlarmActivity.kt index 3028d97..ec6c890 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/view/SearchAlarmActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/view/SearchAlarmActivity.kt @@ -1,158 +1,246 @@ package com.casic.app.smartwell.sanxi.view +import android.annotation.SuppressLint +import android.os.Handler +import android.os.Looper +import android.os.Message +import android.view.View +import android.widget.Button +import android.widget.EditText +import android.widget.TextView +import androidx.core.view.GravityCompat +import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.LinearLayoutManager import com.casic.app.smartwell.sanxi.R +import com.casic.app.smartwell.sanxi.adapter.AlarmListAdapter import com.casic.app.smartwell.sanxi.base.BaseActivity +import com.casic.app.smartwell.sanxi.extensions.* +import com.casic.app.smartwell.sanxi.model.AlarmListModel +import com.casic.app.smartwell.sanxi.utils.Constant import com.casic.app.smartwell.sanxi.vm.AlarmViewModel -import kotlinx.android.synthetic.main.include_base_title.* +import com.jzxiang.pickerview.TimePickerDialog +import com.jzxiang.pickerview.data.Type +import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet +import kotlinx.android.synthetic.main.activity_alarm_search.* +import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.include_select_title.* +import java.lang.ref.WeakReference -class SearchAlarmActivity : BaseActivity() { +class SearchAlarmActivity : BaseActivity(), DrawerLayout.DrawerListener { + private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var alarmViewModel: AlarmViewModel - private var alarmType = "" + private lateinit var alarmListAdapter: AlarmListAdapter + private var dataBeans: MutableList = ArrayList() + private var keywords = "" private var alarmContent = "" + private var pageIndex = 1 + private var isRefresh = false + private var isLoadMore = false override fun initLayoutView(): Int = R.layout.activity_alarm_search override fun setupTopBarLayout() { leftBackView.setOnClickListener { finish() } titleView.text = "告警记录" + rightOptionView.setOnClickListener { + if (rightDrawerLayout.isDrawerOpen(GravityCompat.END)) { + rightDrawerLayout.closeDrawer(GravityCompat.END) + } else { + rightDrawerLayout.openDrawer(GravityCompat.END) + } + } + rightDrawerLayout.addDrawerListener(this) } override fun initData() { + weakReferenceHandler = WeakReferenceHandler(this) //告警类型 alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) + //默认加载所有数据 + obtainAlarmListByPage() } override fun initEvent() { -// alarmTypeView.setOnClickListener { -// alarmViewModel.obtainAlarmType() -// } -// alarmViewModel.typeModel.observe(this, { -// if (it.code == 200) { -// val sheetBuilder = BottomListSheetBuilder(this) -// sheetBuilder.setTitle("告警类型") -// it.data?.forEach { dataBean -> -// sheetBuilder.addItem(dataBean.name) -// } -// sheetBuilder.setGravityCenter(true) -// .setOnSheetItemClickListener { dialog, _, position, tag -> -// alarmTypeView.text = tag -// alarmType = it.data!![position].value.toString() -// -// //告警类型变了之后需要清空告警内容 -// alarmContentView.text = "" -// dialog.dismiss() -// }.build().show() -// } -// }) -// -// alarmContentView.setOnClickListener { -// //获取类型对应的报警内容 -// alarmViewModel.obtainAlarmContent(alarmType) -// } -// alarmViewModel.contentModel.observe(this, { -// if (it.code == 200) { -// val sheetBuilder = BottomListSheetBuilder(this) -// sheetBuilder.setTitle("告警内容") -// it.data?.list?.forEach { dataBean -> -// sheetBuilder.addItem(dataBean.name) -// } -// sheetBuilder.setGravityCenter(true) -// .setOnSheetItemClickListener { dialog, _, position, tag -> -// alarmContentView.text = tag -// alarmContent = it.data!!.list!![position].value.toString() -// -// dialog.dismiss() -// }.build().show() -// } -// }) -// -// //地区三级联动 -// areaView.setOnClickListener { -// areaViewModel.obtainArea() -// } -// areaViewModel.areaModel.observe(this, { -// if (it.code == 200) { -// val firstLevelArea: MutableList = ArrayList() -// val secondLevelArea: MutableList = ArrayList() -// val thirdLevelArea: MutableList = ArrayList() -// it.data?.forEach { dataBean -> -// when (dataBean.level) { -// 2 -> firstLevelArea.add(dataBean) -// 3 -> secondLevelArea.add(dataBean) -// 4 -> thirdLevelArea.add(dataBean) -// } -// } -// -// // 绑定区域 -// BottomAreaSheet.Builder() -// .setContext(this) -// .setFirstAreaData(firstLevelArea) -// .setSecondAreaData(secondLevelArea) -// .setThirdAreaData(thirdLevelArea) -// .setOnActionSheetListener(object : BottomAreaSheet.OnActionSheetListener { -// override fun onAreaSelected(area: String?, id: String?) { -// areaView.text = area -// areaId = id.toString() -// } -// }).build().show() -// } -// }) -// -// startTimeView.setOnClickListener { -// TimePickerDialog.Builder() -// .setThemeColor(R.color.mainThemeColor.convertColor()) -// .setTitleStringId("请选择开始时间") -// .setWheelItemTextSize(16) -// .setCyclic(false) -// .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) -// .setMaxMillseconds(System.currentTimeMillis()) -// .setType(Type.ALL) -// .setCallBack { _: TimePickerDialog?, millSeconds: Long -> -// startTimeView.text = millSeconds.timestampToTime() -// }.build().show(supportFragmentManager, "all") -// } -// -// endTimeView.setOnClickListener { -// TimePickerDialog.Builder() -// .setThemeColor(R.color.mainThemeColor.convertColor()) -// .setTitleStringId("请选择结束时间") -// .setWheelItemTextSize(16) -// .setCyclic(false) -// .setMinMillseconds(System.currentTimeMillis() - Constant.FIVE_YEARS) -// .setMaxMillseconds(System.currentTimeMillis()) -// .setType(Type.ALL) -// .setCallBack { _: TimePickerDialog?, millSeconds: Long -> -// if (millSeconds.isEarlierThanStart(startTimeView.text.toString())) { -// "结束时间不合法，不能早于开始时间".show() -// return@setCallBack -// } -// endTimeView.text = millSeconds.timestampToTime() -// }.build().show(supportFragmentManager, "all") -// } -// -// searchButton.setOnClickListener { -// //页面跳转，将查询参数传过去 -// navigatePageTo( -// AlarmSearchResultActivity::class.java, addAll( -// wellCodeView.text.toString().trim(), -// alarmType, -// areaId, -// alarmContent, -// startTimeView.text.toString(), -// endTimeView.text.toString() -// ) -// ) -// } -// -// clearButton.setOnClickListener { -// wellCodeView.setText("") -// alarmTypeView.text = "" -// alarmContentView.text = "" -// areaView.text = "" -// startTimeView.text = "" -// endTimeView.text = "" -// } + resultRefreshLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainAlarmListByPage() + } + resultRefreshLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainAlarmListByPage() + } + + alarmViewModel.listModel.observe(this, { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + resultRefreshLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了，别拉了".show() + } + dataBeans.addAll(dataRows!!) + resultRefreshLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022051201) + } + }) + + alarmViewModel.contentModel.observe(this, { + if (it.code == 200) { + val sheetBuilder = QMUIBottomSheet.BottomListSheetBuilder(this) + sheetBuilder.setTitle("告警内容") + it.data?.list?.forEach { dataBean -> + sheetBuilder.addItem(dataBean.name) + } + sheetBuilder.setGravityCenter(true) + .setOnSheetItemClickListener { dialog, _, position, tag -> + alarmContentView.text = tag + alarmContent = it.data!!.list!![position].value.toString() + + dialog.dismiss() + }.build().show() + } + }) + } + + override fun onDrawerSlide(drawerView: View, slideOffset: Float) { + + } + + override fun onDrawerOpened(drawerView: View) { + val wellCodeView = drawerView.findViewById(R.id.wellCodeView) + val alarmContentView = drawerView.findViewById(R.id.alarmContentView) + val searchButton = drawerView.findViewById