xiaoyan159/OneMapQS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: 合并代码

Browse Source
This commit is contained in:
xiaoyan
2023-04-26 11:46:12 +08:00
parent c4812eada4 a81e2f5d82
commit 743ea163f2
6 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
View File

@@ -119,14 +119,12 @@ class MainViewModel @Inject constructor(
}
}
TraceDataBase.getDatabase(
context,
Constant.USER_DATA_PATH + "/trace.sqlite"
).niLocationDao.insert(niLocation)
TraceDataBase.getDatabase(context, Constant.USER_DATA_PATH + "/trace.sqlite").niLocationDao.insert(niLocation)
if (niLocationList.isNotEmpty()) {
niLocationList.removeAt(0)
niLocationList.remove(niLocation)
}
Log.e("qj", "saveTrace")
Log.e("qj", "saveTrace==${niLocationList.size}")
}
Thread.sleep(30)
}

1
app/src/main/java/com/navinfo/omqs/ui/dialog/CommonDialog.java
View File

@@ -34,6 +34,7 @@ import com.navinfo.collect.library.sensor.ISensor.enmConnectionStatus;
import com.navinfo.collect.library.sensor.ISensor.SensorWorkingMode;
import com.navinfo.collect.library.garminvirbxe.SensorParams;
import com.navinfo.collect.library.garminvirbxe.HostBean;
import com.navinfo.collect.library.system.VLCApplication;
import com.navinfo.omqs.Constant;
import com.navinfo.omqs.R;
import com.navinfo.omqs.ui.activity.map.MainActivity;

2
app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterViewModel.kt
View File

@@ -55,7 +55,7 @@ class PersonalCenterViewModel @Inject constructor(
for (tableName in listOf<String>("HAD_LINK", "HAD_SPEEDLIMIT", "HAD_SPEEDLIMIT_COND", "HAD_SPEEDLIMIT_VAR")/*listOf<String>("HAD_LINK")*/) {
importOMDBHelper.getOMDBTableData(tableName).collect {
for (map in it) {
for (map in it) {
if ("HAD_LINK" == tableName) {
// 根据HAD_Link生成json文件
val hadLink = HAD_LINK()