From 7be66bc9663c1106ebc78748dc22f394680ac86b Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 29 十二月 2020 09:57:09 +0800
Subject: [PATCH] 1. 修复场景地图界面选择场景点时可能由于列表下标越界导致崩溃问题； 2. 修复自定义PagerAdapter时，没有重写destroyItem可能会导致的崩溃问题； 3. 修改数据库实体类MediaTypeAlias的主键id类型从龙变更为Long，否则无法自增； 4. 新增部分列表相关的工具函数；
---
app/src/main/java/cn/flightfeather/thirdapp/module/inspection/BaseProblemListActivity.kt | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/BaseProblemListActivity.kt b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/BaseProblemListActivity.kt
index 4400f98..cce3bee 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/BaseProblemListActivity.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/BaseProblemListActivity.kt
@@ -9,10 +9,14 @@
import cn.flightfeather.thirdapp.activity.ProblemDetailActivity
import cn.flightfeather.thirdapp.adapter.ProblemListAdapter
import cn.flightfeather.thirdapp.adapter.RecyclerItemClickListener
-import cn.flightfeather.thirdapp.bean.Inspection
-import cn.flightfeather.thirdapp.bean.Subtask
+import cn.flightfeather.thirdapp.bean.entity.Inspection
+import cn.flightfeather.thirdapp.bean.entity.Scense
+import cn.flightfeather.thirdapp.bean.entity.Subtask
+import cn.flightfeather.thirdapp.model.event.ProblemEvent
import cn.flightfeather.thirdapp.module.base.BaseActivity
import kotlinx.android.synthetic.main.dialog_problem_list.*
+import org.greenrobot.eventbus.EventBus
+import org.greenrobot.eventbus.Subscribe
/**
* @author riku
@@ -33,17 +37,21 @@
*/
abstract var type: Int
- var subTaskSelected: Subtask? = null
- var inspection: Inspection? = null
- var lat: Double = 0.0
- var lng: Double = 0.0
+ protected var subTaskSelected: Subtask? = null
+ protected var inspection: Inspection? = null
+ protected var scene: Scense? = null
+ protected var lat: Double = 0.0
+ protected var lng: Double = 0.0
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
+ EventBus.getDefault().register(this)
+
viewModel = ViewModelProviders.of(this).get(BaseProblemListViewModel::class.java)
subTaskSelected = intent.getSerializableExtra("subTask") as Subtask?
inspection = intent.getSerializableExtra("inspection") as Inspection?
+ scene = intent.getSerializableExtra("scene") as Scense?
lat = intent.getDoubleExtra("lat", 0.0)
lng = intent.getDoubleExtra("lng", 0.0)
@@ -67,6 +75,7 @@
}
override fun onItemLongClick(view: View?, position: Int) {
+ onItemViewLongClick(view, position)
}
}))
@@ -74,10 +83,10 @@
tv_title.text = when (type) {
InspectionDetailActivity.PROBLEM_LIST -> "闂娓呭崟"
- InspectionDetailActivity.PROBLEM_CHECK -> "闂瀹℃牳"
- InspectionDetailActivity.CHANGE_CHECK -> "鏁存敼瀹℃牳"
InspectionDetailActivity.PROBLEM_CHANGE -> "鐜板満鏁存敼"
InspectionDetailActivity.PROBLEM_RECHECK -> "闂澶嶆牳"
+ InspectionDetailActivity.PROBLEM_CHECK -> "闂瀹℃牳"
+ InspectionDetailActivity.CHANGE_CHECK -> "鏁存敼瀹℃牳"
else -> ""
}
@@ -85,4 +94,13 @@
finish()
}
}
+
+ open fun onItemViewLongClick(view: View?, position: Int) {
+
+ }
+
+ @Subscribe
+ fun onPutProblem(problemEvent: ProblemEvent) {
+ viewModel.getProblems(inspection?.guid)
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3