diff --git a/app/build.gradle b/app/build.gradle index 525a541d..25ace54e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,9 +73,7 @@ android { dependencies { - implementation project(':collect-library') - testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt index 92fa6dd0..7107bfb3 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt @@ -119,12 +119,12 @@ class MainViewModel @Inject constructor( } } - TraceDataBase.getDatabase( - context, - Constant.USER_DATA_PATH + "/trace.sqlite" - ).niLocationDao.insert(niLocation) - niLocationList.removeAt(0) - Log.e("qj", "saveTrace") + TraceDataBase.getDatabase(context, Constant.USER_DATA_PATH + "/trace.sqlite").niLocationDao.insert(niLocation) + + niLocationList.remove(niLocation) + + Log.e("qj", "saveTrace==${niLocationList.size}") + } Thread.sleep(30) } diff --git a/app/src/main/java/com/navinfo/omqs/ui/dialog/CommonDialog.java b/app/src/main/java/com/navinfo/omqs/ui/dialog/CommonDialog.java index d0959449..44a7f960 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/dialog/CommonDialog.java +++ b/app/src/main/java/com/navinfo/omqs/ui/dialog/CommonDialog.java @@ -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; diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterViewModel.kt index 7ff3c2d5..48deb66b 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterViewModel.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterViewModel.kt @@ -10,17 +10,22 @@ import com.blankj.utilcode.util.UriUtils import com.blankj.utilcode.util.ZipUtils import com.google.gson.Gson import com.navinfo.collect.library.data.entity.* +import com.navinfo.collect.library.map.NIMapController +import com.navinfo.collect.library.utils.GeometryTools import com.navinfo.omqs.bean.ScProblemTypeBean import com.navinfo.omqs.bean.ScRootCauseAnalysisBean import com.navinfo.omqs.db.ImportOMDBHelper import com.navinfo.omqs.db.RealmOperateHelper import com.navinfo.omqs.db.RoomAppDatabase import dagger.hilt.android.lifecycle.HiltViewModel +import dagger.hilt.android.scopes.ViewModelScoped +import io.realm.Realm +import io.realm.RealmDictionary import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import org.apache.poi.ss.usermodel.Row import org.apache.poi.ss.usermodel.WorkbookFactory -import org.apache.poi.xssf.usermodel.XSSFWorkbook +import org.locationtech.jts.geom.Point import java.io.File import java.io.FileInputStream import java.io.IOException @@ -50,7 +55,7 @@ class PersonalCenterViewModel @Inject constructor( for (tableName in listOf("HAD_LINK", "HAD_SPEEDLIMIT", "HAD_SPEEDLIMIT_COND", "HAD_SPEEDLIMIT_VAR")/*listOf("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() @@ -146,8 +151,9 @@ class PersonalCenterViewModel @Inject constructor( viewModelScope.launch(Dispatchers.IO) { try { val file = UriUtils.uri2File(uri) - val inputStream: InputStream = FileInputStream(file) //getAssets().open("sample.xlsx") - val workbook = XSSFWorkbook(inputStream) + val inputStream: InputStream = + FileInputStream(file) //getAssets().open("sample.xlsx") + val workbook = WorkbookFactory.create(inputStream) //获取所有sheet val sheet1 = workbook.getSheet("SC_PROBLEM_TYPE") sheet1?.let { diff --git a/collect-library/libs/armeabi/libvlcjni.so b/collect-library/libs/armeabi/libvlcjni.so deleted file mode 100644 index 37d9ae53..00000000 Binary files a/collect-library/libs/armeabi/libvlcjni.so and /dev/null differ