[6.2.4]数据采集选择两个以上类型时,在列表中名称是没有分开的,建议使用&连接
This commit is contained in:
@@ -42,6 +42,7 @@ import org.json.JSONObject
|
||||
import record_cache.RecordPanelOuterClass
|
||||
import java.lang.StringBuilder
|
||||
import java.util.*
|
||||
import kotlin.collections.ArrayList
|
||||
|
||||
/**
|
||||
* @author XuXinChao
|
||||
@@ -66,6 +67,7 @@ class AIDataCollectWindow constructor(activity: Activity) : View.OnTouchListener
|
||||
private lateinit var tvCollectCancel: TextView //取消按钮
|
||||
|
||||
private var collectReason: StringBuilder = StringBuilder()
|
||||
private var collectList = ArrayList<String>()
|
||||
|
||||
private var aiDataListAdapter: AiDataListAdapter?= null
|
||||
|
||||
@@ -122,10 +124,13 @@ class AIDataCollectWindow constructor(activity: Activity) : View.OnTouchListener
|
||||
aiDataListAdapter?.setListener(object: AiDataListAdapter.AiDataClickListener{
|
||||
override fun onClick(reason: String, isChecked: Boolean) {
|
||||
if(isChecked){
|
||||
collectReason.append(reason)
|
||||
if(!collectList.contains(reason)){
|
||||
collectList.add(reason)
|
||||
}
|
||||
}else{
|
||||
val index = collectReason.indexOf(reason)
|
||||
collectReason.delete(index,index+reason.length)
|
||||
if(collectList.contains(reason)){
|
||||
collectList.remove(reason)
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
@@ -137,10 +142,17 @@ class AIDataCollectWindow constructor(activity: Activity) : View.OnTouchListener
|
||||
|
||||
//上报
|
||||
tvCollectReport.setOnClickListener {
|
||||
if(collectReason.isBlank()){
|
||||
if(collectList.isEmpty()){
|
||||
ToastUtils.showShort("请选择最少一个原因")
|
||||
return@setOnClickListener
|
||||
}
|
||||
collectReason.clear()
|
||||
for(index in collectList.indices){
|
||||
if(index!=0){
|
||||
collectReason.append("&")
|
||||
}
|
||||
collectReason.append(collectList[index])
|
||||
}
|
||||
//上报到工控机
|
||||
CallerAutoPilotControlManager.recordCause(recordKey.toString(),recordFileName,"",
|
||||
collectReason.toString())
|
||||
|
||||
Reference in New Issue
Block a user