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

Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS

Browse Source 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
	app/src/main/java/com/navinfo/omqs/ui/activity/map/SignAdapter.kt
	app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultFragment.kt
	app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt
This commit is contained in:
squallzhjch
2023-05-04 14:18:10 +08:00
parent ebbb9b99b2 ebfdd778b9
commit eace5d2521
55 changed files with 1284 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
collect-library/build.gradle
View File

@@ -38,8 +38,8 @@ android {
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
sourceSets {

3
collect-library/src/main/java/com/navinfo/collect/library/data/dao/impl/INiLocationDao.java
View File

@@ -43,4 +43,7 @@ public interface INiLocationDao {
@Query("SELECT * FROM niLocation where tilex>=:minx and tilex<=:maxx and tiley>=:miny and tiley <=:maxy and time>=:startTime and time<=:endTime")
List<NiLocation> timeTofindList(int minx, int maxx, int miny, int maxy,long startTime,long endTime);
@Query("SELECT * FROM niLocation")
List<NiLocation> findAll();
}

15
collect-library/src/main/java/com/navinfo/collect/library/data/entity/AttachmentBean.kt Normal file
View File

@@ -0,0 +1,15 @@
package com.navinfo.collect.library.data.entity
import io.realm.RealmObject
open class AttachmentBean @JvmOverloads constructor(
/**
* 文件名称
*/
var name: String = "",
/**
* 默认0 照片 录音1
*/
var type: Int = 0
) : RealmObject()

5
collect-library/src/main/java/com/navinfo/collect/library/data/entity/QsRecordBean.kt
View File

@@ -1,11 +1,11 @@
package com.navinfo.collect.library.data.entity
import com.navinfo.collect.library.utils.GeometryToolsKt
import io.realm.RealmList
import io.realm.RealmObject
import io.realm.RealmSet
import io.realm.annotations.PrimaryKey
/**
* @author zhjch
* @version V1.0
@@ -77,6 +77,8 @@ open class QsRecordBean @JvmOverloads constructor(
* 问题记录提交状态 0 未提交；1 已提交；
*/
var t_status: Int = 0,
var attachmentBeanList: RealmList<AttachmentBean> = RealmList<AttachmentBean>(),
/**
* 显示坐标
*/
@@ -104,6 +106,7 @@ open class QsRecordBean @JvmOverloads constructor(
confirmUserId = confirmUserId,
t_lifecycle = t_lifecycle,
t_status = t_status,
attachmentBeanList = attachmentBeanList,
)
qs.geometry = geometry
return qs

3
collect-library/src/main/java/com/navinfo/collect/library/map/source/MapLifeNiLocationTileDataSource.java
View File

@@ -53,7 +53,8 @@ public class MapLifeNiLocationTileDataSource implements ITileDataSource {
if(mEndTime!=0){
list = TraceDataBase.getDatabase(mCon, dbName).getNiLocationDao().timeTofindList(xStart, xEnd, yStart, yEnd,mStartTime,mEndTime);
}else{
list = TraceDataBase.getDatabase(mCon, dbName).getNiLocationDao().findList(xStart, xEnd, yStart, yEnd);
//list = TraceDataBase.getDatabase(mCon, dbName).getNiLocationDao().findList(xStart, xEnd, yStart, yEnd);
list = TraceDataBase.getDatabase(mCon, dbName).getNiLocationDao().findAll();
}
Log.e("qj","query"+(list==null?0:list.size())+"==="+xStart+"==="+xEnd+"==="+yStart+"==="+yEnd);