diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1b17669..139dc2a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -76,6 +76,7 @@
+
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1b17669..139dc2a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -76,6 +76,7 @@
+
diff --git a/app/build.gradle b/app/build.gradle
index 0f9a4e0..71d0421 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -72,7 +72,7 @@
dependencies {
//基础依赖库
- implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4'
+ implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.3'
implementation 'androidx.core:core-ktx:1.9.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
//Google官方授权框架
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1b17669..139dc2a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -76,6 +76,7 @@
+
diff --git a/app/build.gradle b/app/build.gradle
index 0f9a4e0..71d0421 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -72,7 +72,7 @@
dependencies {
//基础依赖库
- implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4'
+ implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.3'
implementation 'androidx.core:core-ktx:1.9.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
//Google官方授权框架
diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt
index decfcfd..1afbbc9 100644
--- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt
@@ -2,8 +2,6 @@
import android.os.Handler
import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.lifecycleScope
-import com.bumptech.glide.Glide
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.extensions.addAll
import com.casic.birmm.inspect.extensions.combineImagePath
@@ -19,9 +17,6 @@
import com.pengxh.kt.lite.utils.WeakReferenceHandler
import kotlinx.android.synthetic.main.fragment_query_event.*
import kotlinx.android.synthetic.main.include_empty_view.*
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
class QueryEventFragment : KotlinBaseFragment() {
@@ -104,61 +99,43 @@
private val callback = Handler.Callback {
if (it.what == 20210712) {
- if (isRefresh || isLoadMore) {
- eventListAdapter.notifyDataSetChanged()
- } else { //首次加载数据
- if (dataBeans.size == 0) {
- emptyView!!.show("抱歉，无法查询到相关记录", null)
- } else {
- emptyView!!.hide()
- eventListAdapter = object :
- NormalRecyclerAdapter(
- R.layout.item_event_rv_l, dataBeans
- ) {
- override fun convertView(
- viewHolder: ViewHolder,
- position: Int,
- item: EventListModel.DataModel.RowsModel
- ) {
- if (!item.images.isNullOrBlank()) {
- val imageArray = item.images!!.split(",")
- val imageUrl = imageArray[0].combineImagePath()
+ if (dataBeans.size == 0) {
+ emptyView.show("抱歉，无法查询到相关记录", null)
+ } else {
+ emptyView.hide()
+ eventListAdapter = object :
+ NormalRecyclerAdapter(
+ R.layout.item_event_rv_l, dataBeans
+ ) {
+ override fun convertView(
+ viewHolder: ViewHolder, position: Int,
+ item: EventListModel.DataModel.RowsModel
+ ) {
+ if (!item.images.isNullOrBlank()) {
+ val imageArray = item.images!!.split(",")
+ val imageUrl = imageArray[0].combineImagePath()
- lifecycleScope.launch(Dispatchers.Main) {
- try {
- val drawable = withContext(Dispatchers.IO) {
- Glide.with(requireContext()).load(imageUrl).submit()
- .get()
- }
- viewHolder.setImageResource(R.id.inspectImageView, drawable)
- } catch (e: Exception) {
- e.printStackTrace()
- }
- }
- }
-
- viewHolder.setText(R.id.inspectMsgView, item.name)
- .setText(R.id.inspectTypeView, "类型：${item.type}")
- .setText(R.id.inspectDateView, "上报时间：${item.createTime}")
+ viewHolder.setImageResource(R.id.inspectImageView, imageUrl)
}
+
+ viewHolder.setText(R.id.inspectMsgView, item.name)
+ .setText(R.id.inspectTypeView, "类型：${item.type}")
+ .setText(R.id.inspectDateView, "上报时间：${item.createTime}")
}
- eventRecyclerView!!.adapter = eventListAdapter
- eventListAdapter.setOnItemClickedListener(object :
- NormalRecyclerAdapter.OnItemClickedListener {
- override fun onItemClicked(
- position: Int, t: EventListModel.DataModel.RowsModel
- ) {
- requireContext().navigatePageTo(
- addAll(
- t.createTime,
- t.description!!.filterSpaceOrEnter(),
- t.data,
- t.images
- )
- )
- }
- })
}
+ eventRecyclerView.adapter = eventListAdapter
+ eventListAdapter.setOnItemClickedListener(object :
+ NormalRecyclerAdapter.OnItemClickedListener {
+ override fun onItemClicked(
+ position: Int, t: EventListModel.DataModel.RowsModel
+ ) {
+ requireContext().navigatePageTo(
+ addAll(
+ t.createTime, t.description!!.filterSpaceOrEnter(), t.data, t.images
+ )
+ )
+ }
+ })
}
}
true
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1b17669..139dc2a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -76,6 +76,7 @@
+
diff --git a/app/build.gradle b/app/build.gradle
index 0f9a4e0..71d0421 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -72,7 +72,7 @@
dependencies {
//基础依赖库
- implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4'
+ implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.3'
implementation 'androidx.core:core-ktx:1.9.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
//Google官方授权框架
diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt
index decfcfd..1afbbc9 100644
--- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt
@@ -2,8 +2,6 @@
import android.os.Handler
import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.lifecycleScope
-import com.bumptech.glide.Glide
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.extensions.addAll
import com.casic.birmm.inspect.extensions.combineImagePath
@@ -19,9 +17,6 @@
import com.pengxh.kt.lite.utils.WeakReferenceHandler
import kotlinx.android.synthetic.main.fragment_query_event.*
import kotlinx.android.synthetic.main.include_empty_view.*
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
class QueryEventFragment : KotlinBaseFragment() {
@@ -104,61 +99,43 @@
private val callback = Handler.Callback {
if (it.what == 20210712) {
- if (isRefresh || isLoadMore) {
- eventListAdapter.notifyDataSetChanged()
- } else { //首次加载数据
- if (dataBeans.size == 0) {
- emptyView!!.show("抱歉，无法查询到相关记录", null)
- } else {
- emptyView!!.hide()
- eventListAdapter = object :
- NormalRecyclerAdapter(
- R.layout.item_event_rv_l, dataBeans
- ) {
- override fun convertView(
- viewHolder: ViewHolder,
- position: Int,
- item: EventListModel.DataModel.RowsModel
- ) {
- if (!item.images.isNullOrBlank()) {
- val imageArray = item.images!!.split(",")
- val imageUrl = imageArray[0].combineImagePath()
+ if (dataBeans.size == 0) {
+ emptyView.show("抱歉，无法查询到相关记录", null)
+ } else {
+ emptyView.hide()
+ eventListAdapter = object :
+ NormalRecyclerAdapter(
+ R.layout.item_event_rv_l, dataBeans
+ ) {
+ override fun convertView(
+ viewHolder: ViewHolder, position: Int,
+ item: EventListModel.DataModel.RowsModel
+ ) {
+ if (!item.images.isNullOrBlank()) {
+ val imageArray = item.images!!.split(",")
+ val imageUrl = imageArray[0].combineImagePath()
- lifecycleScope.launch(Dispatchers.Main) {
- try {
- val drawable = withContext(Dispatchers.IO) {
- Glide.with(requireContext()).load(imageUrl).submit()
- .get()
- }
- viewHolder.setImageResource(R.id.inspectImageView, drawable)
- } catch (e: Exception) {
- e.printStackTrace()
- }
- }
- }
-
- viewHolder.setText(R.id.inspectMsgView, item.name)
- .setText(R.id.inspectTypeView, "类型：${item.type}")
- .setText(R.id.inspectDateView, "上报时间：${item.createTime}")
+ viewHolder.setImageResource(R.id.inspectImageView, imageUrl)
}
+
+ viewHolder.setText(R.id.inspectMsgView, item.name)
+ .setText(R.id.inspectTypeView, "类型：${item.type}")
+ .setText(R.id.inspectDateView, "上报时间：${item.createTime}")
}
- eventRecyclerView!!.adapter = eventListAdapter
- eventListAdapter.setOnItemClickedListener(object :
- NormalRecyclerAdapter.OnItemClickedListener {
- override fun onItemClicked(
- position: Int, t: EventListModel.DataModel.RowsModel
- ) {
- requireContext().navigatePageTo(
- addAll(
- t.createTime,
- t.description!!.filterSpaceOrEnter(),
- t.data,
- t.images
- )
- )
- }
- })
}
+ eventRecyclerView.adapter = eventListAdapter
+ eventListAdapter.setOnItemClickedListener(object :
+ NormalRecyclerAdapter.OnItemClickedListener {
+ override fun onItemClicked(
+ position: Int, t: EventListModel.DataModel.RowsModel
+ ) {
+ requireContext().navigatePageTo(
+ addAll(
+ t.createTime, t.description!!.filterSpaceOrEnter(), t.data, t.images
+ )
+ )
+ }
+ })
}
}
true
diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt
index 91e66ad..85df12a 100644
--- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt
@@ -100,54 +100,47 @@
private val callback = Handler.Callback {
if (it.what == 20210709) {
- if (isRefresh || isLoadMore) {
- adapter.notifyDataSetChanged()
- } else { //首次加载数据
- if (dataBeans.size == 0) {
- emptyView!!.show("抱歉，无法查询到相关记录", null)
- } else {
- emptyView!!.hide()
- adapter = object :
- NormalRecyclerAdapter(
- R.layout.item_inspect_rv_l, dataBeans
- ) {
- override fun convertView(
- viewHolder: ViewHolder,
- position: Int,
- item: InspectListModel.DataModel.RowsModel
- ) {
- val routeJson = item.routes!!
- val routeModels = if (routeJson.isEmpty()) {
- ArrayList()
- } else {
- gson.fromJson>(
- routeJson,
- object : TypeToken>() {}.type
- )
- }
+ if (dataBeans.size == 0) {
+ emptyView.show("抱歉，无法查询到相关记录", null)
+ } else {
+ emptyView.hide()
+ adapter = object :
+ NormalRecyclerAdapter(
+ R.layout.item_inspect_rv_l, dataBeans
+ ) {
+ override fun convertView(
+ viewHolder: ViewHolder, position: Int,
+ item: InspectListModel.DataModel.RowsModel
+ ) {
+ val routeJson = item.routes!!
+ val routeModels = if (routeJson.isEmpty()) {
+ ArrayList()
+ } else {
+ gson.fromJson>(
+ routeJson,
+ object : TypeToken>() {}.type
+ )
+ }
- viewHolder.setText(R.id.inspectMsgView, item.name)
- .setText(R.id.inspectUserView, "巡检人：${item.user}")
- .setText(
- R.id.inspectDateView,
- "巡检时间：${item.startTime} ~ ${item.endTime}"
- ).setText(R.id.inspectPointView, "巡检点数：${routeModels.size}个")
- }
+ viewHolder.setText(R.id.inspectMsgView, item.name)
+ .setText(R.id.inspectUserView, "巡检人：${item.user}")
+ .setText(
+ R.id.inspectDateView, "巡检时间：${item.startTime} ~ ${item.endTime}"
+ ).setText(R.id.inspectPointView, "巡检点数：${routeModels.size}个")
}
- inspectRecyclerView.addItemDecoration(
- DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
- )
- inspectRecyclerView!!.adapter = adapter
- adapter.setOnItemClickedListener(object :
- NormalRecyclerAdapter.OnItemClickedListener {
- override fun onItemClicked(
- position: Int,
- t: InspectListModel.DataModel.RowsModel
- ) {
- requireContext().navigatePageTo(t.id)
- }
- })
}
+ inspectRecyclerView.addItemDecoration(
+ DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
+ )
+ inspectRecyclerView.adapter = adapter
+ adapter.setOnItemClickedListener(object :
+ NormalRecyclerAdapter.OnItemClickedListener {
+ override fun onItemClicked(
+ position: Int, t: InspectListModel.DataModel.RowsModel
+ ) {
+ requireContext().navigatePageTo(t.id)
+ }
+ })
}
}
true
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1b17669..139dc2a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -76,6 +76,7 @@
+
diff --git a/app/build.gradle b/app/build.gradle
index 0f9a4e0..71d0421 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -72,7 +72,7 @@
dependencies {
//基础依赖库
- implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4'
+ implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.3'
implementation 'androidx.core:core-ktx:1.9.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
//Google官方授权框架
diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt
index decfcfd..1afbbc9 100644
--- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt
@@ -2,8 +2,6 @@
import android.os.Handler
import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.lifecycleScope
-import com.bumptech.glide.Glide
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.extensions.addAll
import com.casic.birmm.inspect.extensions.combineImagePath
@@ -19,9 +17,6 @@
import com.pengxh.kt.lite.utils.WeakReferenceHandler
import kotlinx.android.synthetic.main.fragment_query_event.*
import kotlinx.android.synthetic.main.include_empty_view.*
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
class QueryEventFragment : KotlinBaseFragment() {
@@ -104,61 +99,43 @@
private val callback = Handler.Callback {
if (it.what == 20210712) {
- if (isRefresh || isLoadMore) {
- eventListAdapter.notifyDataSetChanged()
- } else { //首次加载数据
- if (dataBeans.size == 0) {
- emptyView!!.show("抱歉，无法查询到相关记录", null)
- } else {
- emptyView!!.hide()
- eventListAdapter = object :
- NormalRecyclerAdapter(
- R.layout.item_event_rv_l, dataBeans
- ) {
- override fun convertView(
- viewHolder: ViewHolder,
- position: Int,
- item: EventListModel.DataModel.RowsModel
- ) {
- if (!item.images.isNullOrBlank()) {
- val imageArray = item.images!!.split(",")
- val imageUrl = imageArray[0].combineImagePath()
+ if (dataBeans.size == 0) {
+ emptyView.show("抱歉，无法查询到相关记录", null)
+ } else {
+ emptyView.hide()
+ eventListAdapter = object :
+ NormalRecyclerAdapter(
+ R.layout.item_event_rv_l, dataBeans
+ ) {
+ override fun convertView(
+ viewHolder: ViewHolder, position: Int,
+ item: EventListModel.DataModel.RowsModel
+ ) {
+ if (!item.images.isNullOrBlank()) {
+ val imageArray = item.images!!.split(",")
+ val imageUrl = imageArray[0].combineImagePath()
- lifecycleScope.launch(Dispatchers.Main) {
- try {
- val drawable = withContext(Dispatchers.IO) {
- Glide.with(requireContext()).load(imageUrl).submit()
- .get()
- }
- viewHolder.setImageResource(R.id.inspectImageView, drawable)
- } catch (e: Exception) {
- e.printStackTrace()
- }
- }
- }
-
- viewHolder.setText(R.id.inspectMsgView, item.name)
- .setText(R.id.inspectTypeView, "类型：${item.type}")
- .setText(R.id.inspectDateView, "上报时间：${item.createTime}")
+ viewHolder.setImageResource(R.id.inspectImageView, imageUrl)
}
+
+ viewHolder.setText(R.id.inspectMsgView, item.name)
+ .setText(R.id.inspectTypeView, "类型：${item.type}")
+ .setText(R.id.inspectDateView, "上报时间：${item.createTime}")
}
- eventRecyclerView!!.adapter = eventListAdapter
- eventListAdapter.setOnItemClickedListener(object :
- NormalRecyclerAdapter.OnItemClickedListener {
- override fun onItemClicked(
- position: Int, t: EventListModel.DataModel.RowsModel
- ) {
- requireContext().navigatePageTo(
- addAll(
- t.createTime,
- t.description!!.filterSpaceOrEnter(),
- t.data,
- t.images
- )
- )
- }
- })
}
+ eventRecyclerView.adapter = eventListAdapter
+ eventListAdapter.setOnItemClickedListener(object :
+ NormalRecyclerAdapter.OnItemClickedListener {
+ override fun onItemClicked(
+ position: Int, t: EventListModel.DataModel.RowsModel
+ ) {
+ requireContext().navigatePageTo(
+ addAll(
+ t.createTime, t.description!!.filterSpaceOrEnter(), t.data, t.images
+ )
+ )
+ }
+ })
}
}
true
diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt
index 91e66ad..85df12a 100644
--- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt
@@ -100,54 +100,47 @@
private val callback = Handler.Callback {
if (it.what == 20210709) {
- if (isRefresh || isLoadMore) {
- adapter.notifyDataSetChanged()
- } else { //首次加载数据
- if (dataBeans.size == 0) {
- emptyView!!.show("抱歉，无法查询到相关记录", null)
- } else {
- emptyView!!.hide()
- adapter = object :
- NormalRecyclerAdapter(
- R.layout.item_inspect_rv_l, dataBeans
- ) {
- override fun convertView(
- viewHolder: ViewHolder,
- position: Int,
- item: InspectListModel.DataModel.RowsModel
- ) {
- val routeJson = item.routes!!
- val routeModels = if (routeJson.isEmpty()) {
- ArrayList()
- } else {
- gson.fromJson>(
- routeJson,
- object : TypeToken>() {}.type
- )
- }
+ if (dataBeans.size == 0) {
+ emptyView.show("抱歉，无法查询到相关记录", null)
+ } else {
+ emptyView.hide()
+ adapter = object :
+ NormalRecyclerAdapter(
+ R.layout.item_inspect_rv_l, dataBeans
+ ) {
+ override fun convertView(
+ viewHolder: ViewHolder, position: Int,
+ item: InspectListModel.DataModel.RowsModel
+ ) {
+ val routeJson = item.routes!!
+ val routeModels = if (routeJson.isEmpty()) {
+ ArrayList()
+ } else {
+ gson.fromJson>(
+ routeJson,
+ object : TypeToken>() {}.type
+ )
+ }
- viewHolder.setText(R.id.inspectMsgView, item.name)
- .setText(R.id.inspectUserView, "巡检人：${item.user}")
- .setText(
- R.id.inspectDateView,
- "巡检时间：${item.startTime} ~ ${item.endTime}"
- ).setText(R.id.inspectPointView, "巡检点数：${routeModels.size}个")
- }
+ viewHolder.setText(R.id.inspectMsgView, item.name)
+ .setText(R.id.inspectUserView, "巡检人：${item.user}")
+ .setText(
+ R.id.inspectDateView, "巡检时间：${item.startTime} ~ ${item.endTime}"
+ ).setText(R.id.inspectPointView, "巡检点数：${routeModels.size}个")
}
- inspectRecyclerView.addItemDecoration(
- DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
- )
- inspectRecyclerView!!.adapter = adapter
- adapter.setOnItemClickedListener(object :
- NormalRecyclerAdapter.OnItemClickedListener {
- override fun onItemClicked(
- position: Int,
- t: InspectListModel.DataModel.RowsModel
- ) {
- requireContext().navigatePageTo(t.id)
- }
- })
}
+ inspectRecyclerView.addItemDecoration(
+ DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
+ )
+ inspectRecyclerView.adapter = adapter
+ adapter.setOnItemClickedListener(object :
+ NormalRecyclerAdapter.OnItemClickedListener {
+ override fun onItemClicked(
+ position: Int, t: InspectListModel.DataModel.RowsModel
+ ) {
+ requireContext().navigatePageTo(t.id)
+ }
+ })
}
}
true
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/QueryEventFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/QueryEventFragment.kt
index 22344ab..96dba16 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/QueryEventFragment.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/QueryEventFragment.kt
@@ -33,9 +33,9 @@
override fun initData() {
val dataBeans = DataBaseManager.get.loadEvent()
if (dataBeans.size == 0) {
- emptyView!!.show("抱歉，无法查询到相关记录", null)
+ emptyView.show("抱歉，无法查询到相关记录", null)
} else {
- emptyView!!.hide()
+ emptyView.hide()
val eventListAdapter =
object : NormalRecyclerAdapter(
R.layout.item_event_rv_l, dataBeans
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1b17669..139dc2a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -76,6 +76,7 @@
+
diff --git a/app/build.gradle b/app/build.gradle
index 0f9a4e0..71d0421 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -72,7 +72,7 @@
dependencies {
//基础依赖库
- implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4'
+ implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.3'
implementation 'androidx.core:core-ktx:1.9.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
//Google官方授权框架
diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt
index decfcfd..1afbbc9 100644
--- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt
@@ -2,8 +2,6 @@
import android.os.Handler
import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.lifecycleScope
-import com.bumptech.glide.Glide
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.extensions.addAll
import com.casic.birmm.inspect.extensions.combineImagePath
@@ -19,9 +17,6 @@
import com.pengxh.kt.lite.utils.WeakReferenceHandler
import kotlinx.android.synthetic.main.fragment_query_event.*
import kotlinx.android.synthetic.main.include_empty_view.*
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
class QueryEventFragment : KotlinBaseFragment() {
@@ -104,61 +99,43 @@
private val callback = Handler.Callback {
if (it.what == 20210712) {
- if (isRefresh || isLoadMore) {
- eventListAdapter.notifyDataSetChanged()
- } else { //首次加载数据
- if (dataBeans.size == 0) {
- emptyView!!.show("抱歉，无法查询到相关记录", null)
- } else {
- emptyView!!.hide()
- eventListAdapter = object :
- NormalRecyclerAdapter(
- R.layout.item_event_rv_l, dataBeans
- ) {
- override fun convertView(
- viewHolder: ViewHolder,
- position: Int,
- item: EventListModel.DataModel.RowsModel
- ) {
- if (!item.images.isNullOrBlank()) {
- val imageArray = item.images!!.split(",")
- val imageUrl = imageArray[0].combineImagePath()
+ if (dataBeans.size == 0) {
+ emptyView.show("抱歉，无法查询到相关记录", null)
+ } else {
+ emptyView.hide()
+ eventListAdapter = object :
+ NormalRecyclerAdapter(
+ R.layout.item_event_rv_l, dataBeans
+ ) {
+ override fun convertView(
+ viewHolder: ViewHolder, position: Int,
+ item: EventListModel.DataModel.RowsModel
+ ) {
+ if (!item.images.isNullOrBlank()) {
+ val imageArray = item.images!!.split(",")
+ val imageUrl = imageArray[0].combineImagePath()
- lifecycleScope.launch(Dispatchers.Main) {
- try {
- val drawable = withContext(Dispatchers.IO) {
- Glide.with(requireContext()).load(imageUrl).submit()
- .get()
- }
- viewHolder.setImageResource(R.id.inspectImageView, drawable)
- } catch (e: Exception) {
- e.printStackTrace()
- }
- }
- }
-
- viewHolder.setText(R.id.inspectMsgView, item.name)
- .setText(R.id.inspectTypeView, "类型：${item.type}")
- .setText(R.id.inspectDateView, "上报时间：${item.createTime}")
+ viewHolder.setImageResource(R.id.inspectImageView, imageUrl)
}
+
+ viewHolder.setText(R.id.inspectMsgView, item.name)
+ .setText(R.id.inspectTypeView, "类型：${item.type}")
+ .setText(R.id.inspectDateView, "上报时间：${item.createTime}")
}
- eventRecyclerView!!.adapter = eventListAdapter
- eventListAdapter.setOnItemClickedListener(object :
- NormalRecyclerAdapter.OnItemClickedListener {
- override fun onItemClicked(
- position: Int, t: EventListModel.DataModel.RowsModel
- ) {
- requireContext().navigatePageTo(
- addAll(
- t.createTime,
- t.description!!.filterSpaceOrEnter(),
- t.data,
- t.images
- )
- )
- }
- })
}
+ eventRecyclerView.adapter = eventListAdapter
+ eventListAdapter.setOnItemClickedListener(object :
+ NormalRecyclerAdapter.OnItemClickedListener {
+ override fun onItemClicked(
+ position: Int, t: EventListModel.DataModel.RowsModel
+ ) {
+ requireContext().navigatePageTo(
+ addAll(
+ t.createTime, t.description!!.filterSpaceOrEnter(), t.data, t.images
+ )
+ )
+ }
+ })
}
}
true
diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt
index 91e66ad..85df12a 100644
--- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt
@@ -100,54 +100,47 @@
private val callback = Handler.Callback {
if (it.what == 20210709) {
- if (isRefresh || isLoadMore) {
- adapter.notifyDataSetChanged()
- } else { //首次加载数据
- if (dataBeans.size == 0) {
- emptyView!!.show("抱歉，无法查询到相关记录", null)
- } else {
- emptyView!!.hide()
- adapter = object :
- NormalRecyclerAdapter(
- R.layout.item_inspect_rv_l, dataBeans
- ) {
- override fun convertView(
- viewHolder: ViewHolder,
- position: Int,
- item: InspectListModel.DataModel.RowsModel
- ) {
- val routeJson = item.routes!!
- val routeModels = if (routeJson.isEmpty()) {
- ArrayList()
- } else {
- gson.fromJson>(
- routeJson,
- object : TypeToken>() {}.type
- )
- }
+ if (dataBeans.size == 0) {
+ emptyView.show("抱歉，无法查询到相关记录", null)
+ } else {
+ emptyView.hide()
+ adapter = object :
+ NormalRecyclerAdapter(
+ R.layout.item_inspect_rv_l, dataBeans
+ ) {
+ override fun convertView(
+ viewHolder: ViewHolder, position: Int,
+ item: InspectListModel.DataModel.RowsModel
+ ) {
+ val routeJson = item.routes!!
+ val routeModels = if (routeJson.isEmpty()) {
+ ArrayList()
+ } else {
+ gson.fromJson>(
+ routeJson,
+ object : TypeToken>() {}.type
+ )
+ }
- viewHolder.setText(R.id.inspectMsgView, item.name)
- .setText(R.id.inspectUserView, "巡检人：${item.user}")
- .setText(
- R.id.inspectDateView,
- "巡检时间：${item.startTime} ~ ${item.endTime}"
- ).setText(R.id.inspectPointView, "巡检点数：${routeModels.size}个")
- }
+ viewHolder.setText(R.id.inspectMsgView, item.name)
+ .setText(R.id.inspectUserView, "巡检人：${item.user}")
+ .setText(
+ R.id.inspectDateView, "巡检时间：${item.startTime} ~ ${item.endTime}"
+ ).setText(R.id.inspectPointView, "巡检点数：${routeModels.size}个")
}
- inspectRecyclerView.addItemDecoration(
- DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
- )
- inspectRecyclerView!!.adapter = adapter
- adapter.setOnItemClickedListener(object :
- NormalRecyclerAdapter.OnItemClickedListener {
- override fun onItemClicked(
- position: Int,
- t: InspectListModel.DataModel.RowsModel
- ) {
- requireContext().navigatePageTo(t.id)
- }
- })
}
+ inspectRecyclerView.addItemDecoration(
+ DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
+ )
+ inspectRecyclerView.adapter = adapter
+ adapter.setOnItemClickedListener(object :
+ NormalRecyclerAdapter.OnItemClickedListener {
+ override fun onItemClicked(
+ position: Int, t: InspectListModel.DataModel.RowsModel
+ ) {
+ requireContext().navigatePageTo(t.id)
+ }
+ })
}
}
true
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/QueryEventFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/QueryEventFragment.kt
index 22344ab..96dba16 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/QueryEventFragment.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/QueryEventFragment.kt
@@ -33,9 +33,9 @@
override fun initData() {
val dataBeans = DataBaseManager.get.loadEvent()
if (dataBeans.size == 0) {
- emptyView!!.show("抱歉，无法查询到相关记录", null)
+ emptyView.show("抱歉，无法查询到相关记录", null)
} else {
- emptyView!!.hide()
+ emptyView.hide()
val eventListAdapter =
object : NormalRecyclerAdapter(
R.layout.item_event_rv_l, dataBeans
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/QueryInspectionFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/QueryInspectionFragment.kt
index d6d1e6d..f41008a 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/QueryInspectionFragment.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/QueryInspectionFragment.kt
@@ -26,9 +26,9 @@
override fun initData() {
val dataBeans = DataBaseManager.get.loadInspection()
if (dataBeans.size == 0) {
- emptyView!!.show("抱歉，无法查询到相关记录", null)
+ emptyView.show("抱歉，无法查询到相关记录", null)
} else {
- emptyView!!.hide()
+ emptyView.hide()
val inspectListAdapter = object :
NormalRecyclerAdapter(
R.layout.item_inspect_rv_l, dataBeans
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1b17669..139dc2a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -76,6 +76,7 @@
+
diff --git a/app/build.gradle b/app/build.gradle
index 0f9a4e0..71d0421 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -72,7 +72,7 @@
dependencies {
//基础依赖库
- implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4'
+ implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.3'
implementation 'androidx.core:core-ktx:1.9.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
//Google官方授权框架
diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt
index decfcfd..1afbbc9 100644
--- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt
@@ -2,8 +2,6 @@
import android.os.Handler
import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.lifecycleScope
-import com.bumptech.glide.Glide
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.extensions.addAll
import com.casic.birmm.inspect.extensions.combineImagePath
@@ -19,9 +17,6 @@
import com.pengxh.kt.lite.utils.WeakReferenceHandler
import kotlinx.android.synthetic.main.fragment_query_event.*
import kotlinx.android.synthetic.main.include_empty_view.*
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
class QueryEventFragment : KotlinBaseFragment() {
@@ -104,61 +99,43 @@
private val callback = Handler.Callback {
if (it.what == 20210712) {
- if (isRefresh || isLoadMore) {
- eventListAdapter.notifyDataSetChanged()
- } else { //首次加载数据
- if (dataBeans.size == 0) {
- emptyView!!.show("抱歉，无法查询到相关记录", null)
- } else {
- emptyView!!.hide()
- eventListAdapter = object :
- NormalRecyclerAdapter(
- R.layout.item_event_rv_l, dataBeans
- ) {
- override fun convertView(
- viewHolder: ViewHolder,
- position: Int,
- item: EventListModel.DataModel.RowsModel
- ) {
- if (!item.images.isNullOrBlank()) {
- val imageArray = item.images!!.split(",")
- val imageUrl = imageArray[0].combineImagePath()
+ if (dataBeans.size == 0) {
+ emptyView.show("抱歉，无法查询到相关记录", null)
+ } else {
+ emptyView.hide()
+ eventListAdapter = object :
+ NormalRecyclerAdapter(
+ R.layout.item_event_rv_l, dataBeans
+ ) {
+ override fun convertView(
+ viewHolder: ViewHolder, position: Int,
+ item: EventListModel.DataModel.RowsModel
+ ) {
+ if (!item.images.isNullOrBlank()) {
+ val imageArray = item.images!!.split(",")
+ val imageUrl = imageArray[0].combineImagePath()
- lifecycleScope.launch(Dispatchers.Main) {
- try {
- val drawable = withContext(Dispatchers.IO) {
- Glide.with(requireContext()).load(imageUrl).submit()
- .get()
- }
- viewHolder.setImageResource(R.id.inspectImageView, drawable)
- } catch (e: Exception) {
- e.printStackTrace()
- }
- }
- }
-
- viewHolder.setText(R.id.inspectMsgView, item.name)
- .setText(R.id.inspectTypeView, "类型：${item.type}")
- .setText(R.id.inspectDateView, "上报时间：${item.createTime}")
+ viewHolder.setImageResource(R.id.inspectImageView, imageUrl)
}
+
+ viewHolder.setText(R.id.inspectMsgView, item.name)
+ .setText(R.id.inspectTypeView, "类型：${item.type}")
+ .setText(R.id.inspectDateView, "上报时间：${item.createTime}")
}
- eventRecyclerView!!.adapter = eventListAdapter
- eventListAdapter.setOnItemClickedListener(object :
- NormalRecyclerAdapter.OnItemClickedListener {
- override fun onItemClicked(
- position: Int, t: EventListModel.DataModel.RowsModel
- ) {
- requireContext().navigatePageTo(
- addAll(
- t.createTime,
- t.description!!.filterSpaceOrEnter(),
- t.data,
- t.images
- )
- )
- }
- })
}
+ eventRecyclerView.adapter = eventListAdapter
+ eventListAdapter.setOnItemClickedListener(object :
+ NormalRecyclerAdapter.OnItemClickedListener {
+ override fun onItemClicked(
+ position: Int, t: EventListModel.DataModel.RowsModel
+ ) {
+ requireContext().navigatePageTo(
+ addAll(
+ t.createTime, t.description!!.filterSpaceOrEnter(), t.data, t.images
+ )
+ )
+ }
+ })
}
}
true
diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt
index 91e66ad..85df12a 100644
--- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt
@@ -100,54 +100,47 @@
private val callback = Handler.Callback {
if (it.what == 20210709) {
- if (isRefresh || isLoadMore) {
- adapter.notifyDataSetChanged()
- } else { //首次加载数据
- if (dataBeans.size == 0) {
- emptyView!!.show("抱歉，无法查询到相关记录", null)
- } else {
- emptyView!!.hide()
- adapter = object :
- NormalRecyclerAdapter(
- R.layout.item_inspect_rv_l, dataBeans
- ) {
- override fun convertView(
- viewHolder: ViewHolder,
- position: Int,
- item: InspectListModel.DataModel.RowsModel
- ) {
- val routeJson = item.routes!!
- val routeModels = if (routeJson.isEmpty()) {
- ArrayList()
- } else {
- gson.fromJson>(
- routeJson,
- object : TypeToken>() {}.type
- )
- }
+ if (dataBeans.size == 0) {
+ emptyView.show("抱歉，无法查询到相关记录", null)
+ } else {
+ emptyView.hide()
+ adapter = object :
+ NormalRecyclerAdapter(
+ R.layout.item_inspect_rv_l, dataBeans
+ ) {
+ override fun convertView(
+ viewHolder: ViewHolder, position: Int,
+ item: InspectListModel.DataModel.RowsModel
+ ) {
+ val routeJson = item.routes!!
+ val routeModels = if (routeJson.isEmpty()) {
+ ArrayList()
+ } else {
+ gson.fromJson>(
+ routeJson,
+ object : TypeToken>() {}.type
+ )
+ }
- viewHolder.setText(R.id.inspectMsgView, item.name)
- .setText(R.id.inspectUserView, "巡检人：${item.user}")
- .setText(
- R.id.inspectDateView,
- "巡检时间：${item.startTime} ~ ${item.endTime}"
- ).setText(R.id.inspectPointView, "巡检点数：${routeModels.size}个")
- }
+ viewHolder.setText(R.id.inspectMsgView, item.name)
+ .setText(R.id.inspectUserView, "巡检人：${item.user}")
+ .setText(
+ R.id.inspectDateView, "巡检时间：${item.startTime} ~ ${item.endTime}"
+ ).setText(R.id.inspectPointView, "巡检点数：${routeModels.size}个")
}
- inspectRecyclerView.addItemDecoration(
- DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
- )
- inspectRecyclerView!!.adapter = adapter
- adapter.setOnItemClickedListener(object :
- NormalRecyclerAdapter.OnItemClickedListener {
- override fun onItemClicked(
- position: Int,
- t: InspectListModel.DataModel.RowsModel
- ) {
- requireContext().navigatePageTo(t.id)
- }
- })
}
+ inspectRecyclerView.addItemDecoration(
+ DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
+ )
+ inspectRecyclerView.adapter = adapter
+ adapter.setOnItemClickedListener(object :
+ NormalRecyclerAdapter.OnItemClickedListener {
+ override fun onItemClicked(
+ position: Int, t: InspectListModel.DataModel.RowsModel
+ ) {
+ requireContext().navigatePageTo(t.id)
+ }
+ })
}
}
true
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/QueryEventFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/QueryEventFragment.kt
index 22344ab..96dba16 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/QueryEventFragment.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/QueryEventFragment.kt
@@ -33,9 +33,9 @@
override fun initData() {
val dataBeans = DataBaseManager.get.loadEvent()
if (dataBeans.size == 0) {
- emptyView!!.show("抱歉，无法查询到相关记录", null)
+ emptyView.show("抱歉，无法查询到相关记录", null)
} else {
- emptyView!!.hide()
+ emptyView.hide()
val eventListAdapter =
object : NormalRecyclerAdapter(
R.layout.item_event_rv_l, dataBeans
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/QueryInspectionFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/QueryInspectionFragment.kt
index d6d1e6d..f41008a 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/QueryInspectionFragment.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/QueryInspectionFragment.kt
@@ -26,9 +26,9 @@
override fun initData() {
val dataBeans = DataBaseManager.get.loadInspection()
if (dataBeans.size == 0) {
- emptyView!!.show("抱歉，无法查询到相关记录", null)
+ emptyView.show("抱歉，无法查询到相关记录", null)
} else {
- emptyView!!.hide()
+ emptyView.hide()
val inspectListAdapter = object :
NormalRecyclerAdapter(
R.layout.item_inspect_rv_l, dataBeans
diff --git a/app/src/main/res/layout/fragment_query_event.xml b/app/src/main/res/layout/fragment_query_event.xml
index fa2e5e4..326b046 100644
--- a/app/src/main/res/layout/fragment_query_event.xml
+++ b/app/src/main/res/layout/fragment_query_event.xml
@@ -18,11 +18,18 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
-
+ android:layout_height="match_parent"
+ android:fillViewport="true"
+ android:scrollbars="vertical">
+
+
+
+
diff --git a/app/build.gradle b/app/build.gradle
index 0f9a4e0..71d0421 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -72,7 +72,7 @@
dependencies {
//基础依赖库
- implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4'
+ implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.3'
implementation 'androidx.core:core-ktx:1.9.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
//Google官方授权框架
diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt
index decfcfd..1afbbc9 100644
--- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryEventFragment.kt
@@ -2,8 +2,6 @@
import android.os.Handler
import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.lifecycleScope
-import com.bumptech.glide.Glide
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.extensions.addAll
import com.casic.birmm.inspect.extensions.combineImagePath
@@ -19,9 +17,6 @@
import com.pengxh.kt.lite.utils.WeakReferenceHandler
import kotlinx.android.synthetic.main.fragment_query_event.*
import kotlinx.android.synthetic.main.include_empty_view.*
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
class QueryEventFragment : KotlinBaseFragment() {
@@ -104,61 +99,43 @@
private val callback = Handler.Callback {
if (it.what == 20210712) {
- if (isRefresh || isLoadMore) {
- eventListAdapter.notifyDataSetChanged()
- } else { //首次加载数据
- if (dataBeans.size == 0) {
- emptyView!!.show("抱歉，无法查询到相关记录", null)
- } else {
- emptyView!!.hide()
- eventListAdapter = object :
- NormalRecyclerAdapter(
- R.layout.item_event_rv_l, dataBeans
- ) {
- override fun convertView(
- viewHolder: ViewHolder,
- position: Int,
- item: EventListModel.DataModel.RowsModel
- ) {
- if (!item.images.isNullOrBlank()) {
- val imageArray = item.images!!.split(",")
- val imageUrl = imageArray[0].combineImagePath()
+ if (dataBeans.size == 0) {
+ emptyView.show("抱歉，无法查询到相关记录", null)
+ } else {
+ emptyView.hide()
+ eventListAdapter = object :
+ NormalRecyclerAdapter(
+ R.layout.item_event_rv_l, dataBeans
+ ) {
+ override fun convertView(
+ viewHolder: ViewHolder, position: Int,
+ item: EventListModel.DataModel.RowsModel
+ ) {
+ if (!item.images.isNullOrBlank()) {
+ val imageArray = item.images!!.split(",")
+ val imageUrl = imageArray[0].combineImagePath()
- lifecycleScope.launch(Dispatchers.Main) {
- try {
- val drawable = withContext(Dispatchers.IO) {
- Glide.with(requireContext()).load(imageUrl).submit()
- .get()
- }
- viewHolder.setImageResource(R.id.inspectImageView, drawable)
- } catch (e: Exception) {
- e.printStackTrace()
- }
- }
- }
-
- viewHolder.setText(R.id.inspectMsgView, item.name)
- .setText(R.id.inspectTypeView, "类型：${item.type}")
- .setText(R.id.inspectDateView, "上报时间：${item.createTime}")
+ viewHolder.setImageResource(R.id.inspectImageView, imageUrl)
}
+
+ viewHolder.setText(R.id.inspectMsgView, item.name)
+ .setText(R.id.inspectTypeView, "类型：${item.type}")
+ .setText(R.id.inspectDateView, "上报时间：${item.createTime}")
}
- eventRecyclerView!!.adapter = eventListAdapter
- eventListAdapter.setOnItemClickedListener(object :
- NormalRecyclerAdapter.OnItemClickedListener {
- override fun onItemClicked(
- position: Int, t: EventListModel.DataModel.RowsModel
- ) {
- requireContext().navigatePageTo(
- addAll(
- t.createTime,
- t.description!!.filterSpaceOrEnter(),
- t.data,
- t.images
- )
- )
- }
- })
}
+ eventRecyclerView.adapter = eventListAdapter
+ eventListAdapter.setOnItemClickedListener(object :
+ NormalRecyclerAdapter.OnItemClickedListener {
+ override fun onItemClicked(
+ position: Int, t: EventListModel.DataModel.RowsModel
+ ) {
+ requireContext().navigatePageTo(
+ addAll(
+ t.createTime, t.description!!.filterSpaceOrEnter(), t.data, t.images
+ )
+ )
+ }
+ })
}
}
true
diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt
index 91e66ad..85df12a 100644
--- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt
@@ -100,54 +100,47 @@
private val callback = Handler.Callback {
if (it.what == 20210709) {
- if (isRefresh || isLoadMore) {
- adapter.notifyDataSetChanged()
- } else { //首次加载数据
- if (dataBeans.size == 0) {
- emptyView!!.show("抱歉，无法查询到相关记录", null)
- } else {
- emptyView!!.hide()
- adapter = object :
- NormalRecyclerAdapter(
- R.layout.item_inspect_rv_l, dataBeans
- ) {
- override fun convertView(
- viewHolder: ViewHolder,
- position: Int,
- item: InspectListModel.DataModel.RowsModel
- ) {
- val routeJson = item.routes!!
- val routeModels = if (routeJson.isEmpty()) {
- ArrayList()
- } else {
- gson.fromJson>(
- routeJson,
- object : TypeToken>() {}.type
- )
- }
+ if (dataBeans.size == 0) {
+ emptyView.show("抱歉，无法查询到相关记录", null)
+ } else {
+ emptyView.hide()
+ adapter = object :
+ NormalRecyclerAdapter(
+ R.layout.item_inspect_rv_l, dataBeans
+ ) {
+ override fun convertView(
+ viewHolder: ViewHolder, position: Int,
+ item: InspectListModel.DataModel.RowsModel
+ ) {
+ val routeJson = item.routes!!
+ val routeModels = if (routeJson.isEmpty()) {
+ ArrayList()
+ } else {
+ gson.fromJson>(
+ routeJson,
+ object : TypeToken>() {}.type
+ )
+ }
- viewHolder.setText(R.id.inspectMsgView, item.name)
- .setText(R.id.inspectUserView, "巡检人：${item.user}")
- .setText(
- R.id.inspectDateView,
- "巡检时间：${item.startTime} ~ ${item.endTime}"
- ).setText(R.id.inspectPointView, "巡检点数：${routeModels.size}个")
- }
+ viewHolder.setText(R.id.inspectMsgView, item.name)
+ .setText(R.id.inspectUserView, "巡检人：${item.user}")
+ .setText(
+ R.id.inspectDateView, "巡检时间：${item.startTime} ~ ${item.endTime}"
+ ).setText(R.id.inspectPointView, "巡检点数：${routeModels.size}个")
}
- inspectRecyclerView.addItemDecoration(
- DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
- )
- inspectRecyclerView!!.adapter = adapter
- adapter.setOnItemClickedListener(object :
- NormalRecyclerAdapter.OnItemClickedListener {
- override fun onItemClicked(
- position: Int,
- t: InspectListModel.DataModel.RowsModel
- ) {
- requireContext().navigatePageTo(t.id)
- }
- })
}
+ inspectRecyclerView.addItemDecoration(
+ DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
+ )
+ inspectRecyclerView.adapter = adapter
+ adapter.setOnItemClickedListener(object :
+ NormalRecyclerAdapter.OnItemClickedListener {
+ override fun onItemClicked(
+ position: Int, t: InspectListModel.DataModel.RowsModel
+ ) {
+ requireContext().navigatePageTo(t.id)
+ }
+ })
}
}
true
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/QueryEventFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/QueryEventFragment.kt
index 22344ab..96dba16 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/QueryEventFragment.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/QueryEventFragment.kt
@@ -33,9 +33,9 @@
override fun initData() {
val dataBeans = DataBaseManager.get.loadEvent()
if (dataBeans.size == 0) {
- emptyView!!.show("抱歉，无法查询到相关记录", null)
+ emptyView.show("抱歉，无法查询到相关记录", null)
} else {
- emptyView!!.hide()
+ emptyView.hide()
val eventListAdapter =
object : NormalRecyclerAdapter(
R.layout.item_event_rv_l, dataBeans
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/QueryInspectionFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/QueryInspectionFragment.kt
index d6d1e6d..f41008a 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/QueryInspectionFragment.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/QueryInspectionFragment.kt
@@ -26,9 +26,9 @@
override fun initData() {
val dataBeans = DataBaseManager.get.loadInspection()
if (dataBeans.size == 0) {
- emptyView!!.show("抱歉，无法查询到相关记录", null)
+ emptyView.show("抱歉，无法查询到相关记录", null)
} else {
- emptyView!!.hide()
+ emptyView.hide()
val inspectListAdapter = object :
NormalRecyclerAdapter(
R.layout.item_inspect_rv_l, dataBeans
diff --git a/app/src/main/res/layout/fragment_query_event.xml b/app/src/main/res/layout/fragment_query_event.xml
index fa2e5e4..326b046 100644
--- a/app/src/main/res/layout/fragment_query_event.xml
+++ b/app/src/main/res/layout/fragment_query_event.xml
@@ -18,11 +18,18 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
-
+ android:layout_height="match_parent"
+ android:fillViewport="true"
+ android:scrollbars="vertical">
+
+
+
-
+ android:layout_height="match_parent"
+ android:fillViewport="true"
+ android:scrollbars="vertical">
+
+
+