From 2242a796345bceb301cf3e2094f2a4871cb81cb6 Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期四, 13 八月 2020 18:22:25 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/endian11/DriveJudge
---
app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt b/app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt
index 2b1f5ea..ae0cc4e 100644
--- a/app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt
+++ b/app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt
@@ -4,7 +4,7 @@
import androidx.work.Data
import androidx.work.ListenableWorker
import com.anyun.exam.lib.AYSdk
-import com.anyun.exam.lib.MyLog
+import com.anyun.basecommonlib.MyLog
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
import com.google.gson.stream.JsonReader
@@ -142,10 +142,12 @@
}
}
-private var singalConfigs :List<SingalConfig> = ArrayList()
+private var singalConfigs :MutableList<SingalConfig> = mutableListOf()
fun sendSignalConfigToRemote(applicationContext: Context){
-
+ MyLog.i("sendSignalConfigToRemote")
+ singalConfigs.clear()
+ signalConfiglist.clear()
singalConfigs = WorkRoomDataBase.getWorkRoomDataBase(applicationContext).signalConfigDao._getSignalConfigs()
if (singalConfigs ==null){
MyLog.i("璇绘枃浠跺彂閫佷俊鍙烽厤缃�")
@@ -156,13 +158,16 @@
val gson = Gson()
val type = object : TypeToken<List<SingalConfig?>?>() {}.type
val mstus = gson.fromJson<List<SingalConfig>>(jsonReader, type)
- singalConfigs = mstus
+ for (j in mstus.indices){
+ singalConfigs[j] = mstus[j]
+ }
} catch (e: IOException) {
e.printStackTrace()
}
}else{
-
+ MyLog.i("璇诲埌鏁版嵁搴撻噷闈㈢殑淇″彿閰嶇疆"+ signalConfiglist.size);
}
+
for (i in singalConfigs.indices) {
val signalConfigRemote = SignalConfigRemote()
signalConfigRemote.func_id = singalConfigs.get(i).func_id
@@ -181,6 +186,7 @@
if (listContainsSameValue(indexs)) {
MyLog.i("sendSignalConfigsToRemote: 鏈夌浉鍚岀殑index锛屼笉鑳藉彂閫�" + gson.toJson(signalConfiglist))
} else {
+ MyLog.i("璋冪敤鍙戦�佸懡浠ゆ帴鍙ｅ彂閫佷俊鍙烽厤缃�")
AYSdk.getInstance().sendCmd(safeluck.drive.evaluation.Constant.SEND_CONFIG_SIGNAL, gson.toJson(signalConfiglist))
}
}
--
Gitblit v1.8.0