diff --git a/app/build.gradle b/app/build.gradle
index 71d0421..086bc5f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -72,7 +72,7 @@
dependencies {
//基础依赖库
- implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.3'
+ implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.4'
implementation 'androidx.core:core-ktx:1.9.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
//Google官方授权框架
diff --git a/app/build.gradle b/app/build.gradle
index 71d0421..086bc5f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -72,7 +72,7 @@
dependencies {
//基础依赖库
- implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.3'
+ implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.4'
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 1afbbc9..82a23c9 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
@@ -46,8 +46,7 @@
val dataRows = it.data?.rows!!
when {
isRefresh -> {
- dataBeans.clear()
- dataBeans = dataRows
+ eventListAdapter.setRefreshData(dataRows)
eventLayout.finishRefresh()
isRefresh = false
}
@@ -55,15 +54,15 @@
if (dataRows.size == 0) {
"到底了,别拉了".show(requireContext())
}
- dataBeans.addAll(dataRows)
+ eventListAdapter.setLoadMoreData(dataRows)
eventLayout.finishLoadMore()
isLoadMore = false
}
else -> {
dataBeans = dataRows
+ weakReferenceHandler.sendEmptyMessage(20210712)
}
}
- weakReferenceHandler.sendEmptyMessage(20210712)
}
}
}
diff --git a/app/build.gradle b/app/build.gradle
index 71d0421..086bc5f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -72,7 +72,7 @@
dependencies {
//基础依赖库
- implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.3'
+ implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.4'
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 1afbbc9..82a23c9 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
@@ -46,8 +46,7 @@
val dataRows = it.data?.rows!!
when {
isRefresh -> {
- dataBeans.clear()
- dataBeans = dataRows
+ eventListAdapter.setRefreshData(dataRows)
eventLayout.finishRefresh()
isRefresh = false
}
@@ -55,15 +54,15 @@
if (dataRows.size == 0) {
"到底了,别拉了".show(requireContext())
}
- dataBeans.addAll(dataRows)
+ eventListAdapter.setLoadMoreData(dataRows)
eventLayout.finishLoadMore()
isLoadMore = false
}
else -> {
dataBeans = dataRows
+ weakReferenceHandler.sendEmptyMessage(20210712)
}
}
- weakReferenceHandler.sendEmptyMessage(20210712)
}
}
}
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 85df12a..477e914 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
@@ -48,8 +48,7 @@
val dataRows = it.data?.rows!!
when {
isRefresh -> {
- dataBeans.clear()
- dataBeans = dataRows
+ adapter.setRefreshData(dataRows)
inspectLayout.finishRefresh()
isRefresh = false
}
@@ -57,15 +56,15 @@
if (dataRows.size == 0) {
"到底了,别拉了".show(requireContext())
}
- dataBeans.addAll(dataRows)
+ adapter.setLoadMoreData(dataRows)
inspectLayout.finishLoadMore()
isLoadMore = false
}
else -> {
dataBeans = dataRows
+ weakReferenceHandler.sendEmptyMessage(20210709)
}
}
- weakReferenceHandler.sendEmptyMessage(20210709)
}
}
}
diff --git a/app/build.gradle b/app/build.gradle
index 71d0421..086bc5f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -72,7 +72,7 @@
dependencies {
//基础依赖库
- implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.3'
+ implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.4'
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 1afbbc9..82a23c9 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
@@ -46,8 +46,7 @@
val dataRows = it.data?.rows!!
when {
isRefresh -> {
- dataBeans.clear()
- dataBeans = dataRows
+ eventListAdapter.setRefreshData(dataRows)
eventLayout.finishRefresh()
isRefresh = false
}
@@ -55,15 +54,15 @@
if (dataRows.size == 0) {
"到底了,别拉了".show(requireContext())
}
- dataBeans.addAll(dataRows)
+ eventListAdapter.setLoadMoreData(dataRows)
eventLayout.finishLoadMore()
isLoadMore = false
}
else -> {
dataBeans = dataRows
+ weakReferenceHandler.sendEmptyMessage(20210712)
}
}
- weakReferenceHandler.sendEmptyMessage(20210712)
}
}
}
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 85df12a..477e914 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
@@ -48,8 +48,7 @@
val dataRows = it.data?.rows!!
when {
isRefresh -> {
- dataBeans.clear()
- dataBeans = dataRows
+ adapter.setRefreshData(dataRows)
inspectLayout.finishRefresh()
isRefresh = false
}
@@ -57,15 +56,15 @@
if (dataRows.size == 0) {
"到底了,别拉了".show(requireContext())
}
- dataBeans.addAll(dataRows)
+ adapter.setLoadMoreData(dataRows)
inspectLayout.finishLoadMore()
isLoadMore = false
}
else -> {
dataBeans = dataRows
+ weakReferenceHandler.sendEmptyMessage(20210709)
}
}
- weakReferenceHandler.sendEmptyMessage(20210709)
}
}
}
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
index 0a20be0..f00bbae 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
@@ -47,8 +47,7 @@
}
}
//绑定图片
- val imageAdapter = ReadOnlyImageAdapter(this)
- imageAdapter.setImageList(urls)
+ val imageAdapter = ReadOnlyImageAdapter(this, urls)
imageGridView.adapter = imageAdapter
imageGridView.setOnItemClickListener { _, _, position, _ ->
if (urls[position].isEmpty()) {
diff --git a/app/build.gradle b/app/build.gradle
index 71d0421..086bc5f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -72,7 +72,7 @@
dependencies {
//基础依赖库
- implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.3'
+ implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.4'
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 1afbbc9..82a23c9 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
@@ -46,8 +46,7 @@
val dataRows = it.data?.rows!!
when {
isRefresh -> {
- dataBeans.clear()
- dataBeans = dataRows
+ eventListAdapter.setRefreshData(dataRows)
eventLayout.finishRefresh()
isRefresh = false
}
@@ -55,15 +54,15 @@
if (dataRows.size == 0) {
"到底了,别拉了".show(requireContext())
}
- dataBeans.addAll(dataRows)
+ eventListAdapter.setLoadMoreData(dataRows)
eventLayout.finishLoadMore()
isLoadMore = false
}
else -> {
dataBeans = dataRows
+ weakReferenceHandler.sendEmptyMessage(20210712)
}
}
- weakReferenceHandler.sendEmptyMessage(20210712)
}
}
}
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 85df12a..477e914 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
@@ -48,8 +48,7 @@
val dataRows = it.data?.rows!!
when {
isRefresh -> {
- dataBeans.clear()
- dataBeans = dataRows
+ adapter.setRefreshData(dataRows)
inspectLayout.finishRefresh()
isRefresh = false
}
@@ -57,15 +56,15 @@
if (dataRows.size == 0) {
"到底了,别拉了".show(requireContext())
}
- dataBeans.addAll(dataRows)
+ adapter.setLoadMoreData(dataRows)
inspectLayout.finishLoadMore()
isLoadMore = false
}
else -> {
dataBeans = dataRows
+ weakReferenceHandler.sendEmptyMessage(20210709)
}
}
- weakReferenceHandler.sendEmptyMessage(20210709)
}
}
}
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
index 0a20be0..f00bbae 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
@@ -47,8 +47,7 @@
}
}
//绑定图片
- val imageAdapter = ReadOnlyImageAdapter(this)
- imageAdapter.setImageList(urls)
+ val imageAdapter = ReadOnlyImageAdapter(this, urls)
imageGridView.adapter = imageAdapter
imageGridView.setOnItemClickListener { _, _, position, _ ->
if (urls[position].isEmpty()) {
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
index 086b1a3..6f3d166 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
@@ -60,8 +60,7 @@
}
}
//绑定图片
- val imageAdapter = ReadOnlyImageAdapter(this)
- imageAdapter.setImageList(urls)
+ val imageAdapter = ReadOnlyImageAdapter(this, urls)
imageGridView.adapter = imageAdapter
imageGridView.setOnItemClickListener { _, _, position, _ ->
if (urls[position].isEmpty()) {
diff --git a/app/build.gradle b/app/build.gradle
index 71d0421..086bc5f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -72,7 +72,7 @@
dependencies {
//基础依赖库
- implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.3'
+ implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.4'
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 1afbbc9..82a23c9 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
@@ -46,8 +46,7 @@
val dataRows = it.data?.rows!!
when {
isRefresh -> {
- dataBeans.clear()
- dataBeans = dataRows
+ eventListAdapter.setRefreshData(dataRows)
eventLayout.finishRefresh()
isRefresh = false
}
@@ -55,15 +54,15 @@
if (dataRows.size == 0) {
"到底了,别拉了".show(requireContext())
}
- dataBeans.addAll(dataRows)
+ eventListAdapter.setLoadMoreData(dataRows)
eventLayout.finishLoadMore()
isLoadMore = false
}
else -> {
dataBeans = dataRows
+ weakReferenceHandler.sendEmptyMessage(20210712)
}
}
- weakReferenceHandler.sendEmptyMessage(20210712)
}
}
}
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 85df12a..477e914 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
@@ -48,8 +48,7 @@
val dataRows = it.data?.rows!!
when {
isRefresh -> {
- dataBeans.clear()
- dataBeans = dataRows
+ adapter.setRefreshData(dataRows)
inspectLayout.finishRefresh()
isRefresh = false
}
@@ -57,15 +56,15 @@
if (dataRows.size == 0) {
"到底了,别拉了".show(requireContext())
}
- dataBeans.addAll(dataRows)
+ adapter.setLoadMoreData(dataRows)
inspectLayout.finishLoadMore()
isLoadMore = false
}
else -> {
dataBeans = dataRows
+ weakReferenceHandler.sendEmptyMessage(20210709)
}
}
- weakReferenceHandler.sendEmptyMessage(20210709)
}
}
}
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
index 0a20be0..f00bbae 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
@@ -47,8 +47,7 @@
}
}
//绑定图片
- val imageAdapter = ReadOnlyImageAdapter(this)
- imageAdapter.setImageList(urls)
+ val imageAdapter = ReadOnlyImageAdapter(this, urls)
imageGridView.adapter = imageAdapter
imageGridView.setOnItemClickListener { _, _, position, _ ->
if (urls[position].isEmpty()) {
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
index 086b1a3..6f3d166 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
@@ -60,8 +60,7 @@
}
}
//绑定图片
- val imageAdapter = ReadOnlyImageAdapter(this)
- imageAdapter.setImageList(urls)
+ val imageAdapter = ReadOnlyImageAdapter(this, urls)
imageGridView.adapter = imageAdapter
imageGridView.setOnItemClickListener { _, _, position, _ ->
if (urls[position].isEmpty()) {
diff --git a/app/src/main/res/layout/fragment_query_event.xml b/app/src/main/res/layout/fragment_query_event.xml
index 326b046..fa2e5e4 100644
--- a/app/src/main/res/layout/fragment_query_event.xml
+++ b/app/src/main/res/layout/fragment_query_event.xml
@@ -18,18 +18,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
-
-
-
-
+ android:layout_height="wrap_content"
+ app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
{
- dataBeans.clear()
- dataBeans = dataRows
+ eventListAdapter.setRefreshData(dataRows)
eventLayout.finishRefresh()
isRefresh = false
}
@@ -55,15 +54,15 @@
if (dataRows.size == 0) {
"到底了,别拉了".show(requireContext())
}
- dataBeans.addAll(dataRows)
+ eventListAdapter.setLoadMoreData(dataRows)
eventLayout.finishLoadMore()
isLoadMore = false
}
else -> {
dataBeans = dataRows
+ weakReferenceHandler.sendEmptyMessage(20210712)
}
}
- weakReferenceHandler.sendEmptyMessage(20210712)
}
}
}
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 85df12a..477e914 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
@@ -48,8 +48,7 @@
val dataRows = it.data?.rows!!
when {
isRefresh -> {
- dataBeans.clear()
- dataBeans = dataRows
+ adapter.setRefreshData(dataRows)
inspectLayout.finishRefresh()
isRefresh = false
}
@@ -57,15 +56,15 @@
if (dataRows.size == 0) {
"到底了,别拉了".show(requireContext())
}
- dataBeans.addAll(dataRows)
+ adapter.setLoadMoreData(dataRows)
inspectLayout.finishLoadMore()
isLoadMore = false
}
else -> {
dataBeans = dataRows
+ weakReferenceHandler.sendEmptyMessage(20210709)
}
}
- weakReferenceHandler.sendEmptyMessage(20210709)
}
}
}
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
index 0a20be0..f00bbae 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
@@ -47,8 +47,7 @@
}
}
//绑定图片
- val imageAdapter = ReadOnlyImageAdapter(this)
- imageAdapter.setImageList(urls)
+ val imageAdapter = ReadOnlyImageAdapter(this, urls)
imageGridView.adapter = imageAdapter
imageGridView.setOnItemClickListener { _, _, position, _ ->
if (urls[position].isEmpty()) {
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
index 086b1a3..6f3d166 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
@@ -60,8 +60,7 @@
}
}
//绑定图片
- val imageAdapter = ReadOnlyImageAdapter(this)
- imageAdapter.setImageList(urls)
+ val imageAdapter = ReadOnlyImageAdapter(this, urls)
imageGridView.adapter = imageAdapter
imageGridView.setOnItemClickListener { _, _, position, _ ->
if (urls[position].isEmpty()) {
diff --git a/app/src/main/res/layout/fragment_query_event.xml b/app/src/main/res/layout/fragment_query_event.xml
index 326b046..fa2e5e4 100644
--- a/app/src/main/res/layout/fragment_query_event.xml
+++ b/app/src/main/res/layout/fragment_query_event.xml
@@ -18,18 +18,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
-
-
-
-
+ android:layout_height="wrap_content"
+ app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-
-
-
+ android:layout_height="wrap_content"
+ app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />