From a5d862051462a5fcc2717b405896a6d424002e54 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 22 十二月 2020 15:43:06 +0800
Subject: [PATCH] 1. 调整了数控实体的存储位置； 2. 新增数据表“媒体文件类型别名表”； 3. 修改任意拍模块，将图片分类改为根据场景类型动态生成，同时新增修改分类别名功能； 4. 优化子任务选择界面的任务排序方式，按照“待开始”、“执行中”、“未执行”的顺序进行排序；
---
app/src/main/java/cn/flightfeather/thirdapp/module/task/NewSubTaskViewModel.kt | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/module/task/NewSubTaskViewModel.kt b/app/src/main/java/cn/flightfeather/thirdapp/module/task/NewSubTaskViewModel.kt
index 3e46fba..ea869ad 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/module/task/NewSubTaskViewModel.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/module/task/NewSubTaskViewModel.kt
@@ -5,10 +5,10 @@
import android.arch.lifecycle.MutableLiveData
import android.arch.lifecycle.ViewModel
import cn.flightfeather.thirdapp.CommonApplication
-import cn.flightfeather.thirdapp.bean.Monitorobjectversion
-import cn.flightfeather.thirdapp.bean.Scense
-import cn.flightfeather.thirdapp.bean.Subtask
-import cn.flightfeather.thirdapp.bean.Task
+import cn.flightfeather.thirdapp.bean.entity.Monitorobjectversion
+import cn.flightfeather.thirdapp.bean.entity.Scense
+import cn.flightfeather.thirdapp.bean.entity.Subtask
+import cn.flightfeather.thirdapp.bean.entity.Task
import cn.flightfeather.thirdapp.bean.vo.TaskVo
import cn.flightfeather.thirdapp.common.net.ResultCallBack
import cn.flightfeather.thirdapp.model.event.TopTaskEvent
@@ -169,6 +169,10 @@
* 鏍规嵁鎵�閫夊満鏅被鍨嬪強鏄惁鐩戠鍒锋柊鍦烘櫙
*/
fun refreshScene() {
+ //sceneTypeList浼氭牴鎹仈缃戣幏鍙栫殑鍦烘櫙鍙樻洿鍐呭锛屾澶勫垽鏂繚璇佷笅鏍囦笉浼氳秺鐣�
+ if (selectedTypeIndex >= sceneTypeList.size) {
+ selectedTypeIndex = 0
+ }
//绛涢�夊満鏅被鍨�
val tmp = ArrayList<Scense>()
if (selectedTypeIndex == 0) {
--
Gitblit v1.9.3