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

Conflicts: app/src/main/java/com/navinfo/omqs/ui/activity/PermissionsActivity.kt app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt collect-library/src/main/java/com/navinfo/collect/library/map/handler/LayerManagerHandler.kt
2023-04-21 14:14:32 +08:00
parent d8735d67d6 95019f7f3d
commit 5db8bfaade
168 changed files with 11644 additions and 99 deletions
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/PermissionsActivity.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/PermissionsActivity.kt
@@ -31,8 +31,11 @@ open class PermissionsActivity : BaseActivity() {
        permissionList.add(Permission.ACCESS_COARSE_LOCATION)
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
 //            permissionList.add(Permission.ACCESS_BACKGROUND_LOCATION)
+        //android10
+        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.Q) {
+            permissionList.add(Permission.ACCESS_BACKGROUND_LOCATION)
        }
-        XXPermissions.with(this)
+/*        XXPermissions.with(this)
            // 申请单个权限
            .permission(permissionList)
            // 设置权限请求拦截器（局部设置）
@@ -72,7 +75,7 @@ open class PermissionsActivity : BaseActivity() {
                        onPermissionsDenied()
                    }
                }
-            })
+            })*/
    }

    /**
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
@@ -1,19 +1,22 @@
 package com.navinfo.omqs.ui.activity.map

 import android.os.Bundle
-import android.provider.ContactsContract.Contacts
 import android.util.Log
 import androidx.activity.viewModels
 import androidx.core.view.WindowCompat
 import androidx.databinding.DataBindingUtil
+import com.blankj.utilcode.util.ToastUtils
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.viewModelScope
 import androidx.navigation.findNavController
 import com.navinfo.collect.library.map.NIMapController
+import com.navinfo.collect.library.map.handler.NiLocationListener
 import com.navinfo.omqs.Constant
 import com.navinfo.omqs.R
 import com.navinfo.omqs.databinding.ActivityMainBinding
+import com.navinfo.omqs.db.TraceDataBase
 import com.navinfo.omqs.http.offlinemapdownload.OfflineMapDownloadManager
+import com.navinfo.omqs.system.SystemConstant
 import com.navinfo.omqs.ui.activity.BaseActivity
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
@@ -69,6 +72,13 @@ class MainActivity : BaseActivity() {

        //开启定位
        mapController.locationLayerHandler.startLocation()
+        //启动轨迹存储
+        mapController.locationLayerHandler.setNiLocationListener(NiLocationListener {
+            binding!!.viewModel!!.addSaveTrace(it)
+            binding!!.viewModel!!.startSaveTraceThread(this)
+        })
+        //显示轨迹图层
+        mapController.layerManagerHandler.showNiLocationLayer(Constant.DATA_PATH+ SystemConstant.USER_ID+"/trace.sqlite")
    }

    override fun onPause() {
@@ -94,6 +104,13 @@ class MainActivity : BaseActivity() {
        binding.mainActivityDrawer.open()
    }

+    /**
+     * 打开相机预览
+     */
+    fun openCamera() {
+        binding!!.viewModel!!.onClickCameraButton(this)
+    }
+
    /**
     * 点击录音按钮
     */
--- 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
@@ -1,14 +1,28 @@
 package com.navinfo.omqs.ui.activity.map

+import android.content.Context
+import android.content.DialogInterface
 import android.util.Log
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import com.navinfo.collect.library.data.entity.NiLocation
+import com.blankj.utilcode.util.ToastUtils
+import com.navinfo.collect.library.data.entity.NiLocation
 import com.navinfo.collect.library.map.NIMapController
 import com.navinfo.collect.library.map.handler.OnQsRecordItemClickListener
+import com.navinfo.collect.library.utils.GeometryTools
+import com.navinfo.collect.library.utils.GeometryToolsKt
+import com.navinfo.omqs.Constant
+import com.navinfo.omqs.R
+import com.navinfo.omqs.db.TraceDataBase
+import com.navinfo.omqs.system.SystemConstant
+import com.navinfo.omqs.ui.dialog.CommonDialog
+import com.navinfo.omqs.ui.manager.TakePhotoManager
 import dagger.hilt.android.lifecycle.HiltViewModel
-import dagger.hilt.android.scopes.ActivityRetainedScoped
+import io.realm.RealmSet
+import org.videolan.libvlc.LibVlcUtil
+import java.util.*
 import javax.inject.Inject
-import javax.inject.Singleton

 /**
 * 创建Activity全局viewmode
@@ -19,6 +33,9 @@ class MainViewModel @Inject constructor(
 ) : ViewModel() {

    val liveDataQsRecordIdList = MutableLiveData<List<String>>()
+    private var mCameraDialog: CommonDialog? = null
+
+    private var niLocationList:MutableList<NiLocation> = ArrayList<NiLocation>()

    init {
        mapController.layerManagerHandler.setOnQsRecordItemClickListener(object :
@@ -39,4 +56,81 @@ class MainViewModel @Inject constructor(
    override fun onCleared() {
        super.onCleared()
    }
+
+    //点击相机按钮
+    fun onClickCameraButton(context: Context){
+
+        Log.e("qj", LibVlcUtil.hasCompatibleCPU(context).toString())
+
+        ToastUtils.showShort("点击了相机")
+
+        if (mCameraDialog == null) {
+            mCameraDialog = CommonDialog(context, context.resources.getDimension(R.dimen.head_img_width).toInt() * 3 + context.resources.getDimension(R.dimen.ten).toInt() + context.resources.getDimension(R.dimen.twenty_four).toInt(), context.resources.getDimension(R.dimen.head_img_width).toInt() + 10, 1)
+            mCameraDialog!!.setCancelable(true)
+        }
+        mCameraDialog!!.openCamear(mCameraDialog!!.getmShareUtil().continusTakePhotoState)
+        mCameraDialog!!.show()
+        mCameraDialog!!.setOnDismissListener(DialogInterface.OnDismissListener {
+            mCameraDialog!!.hideLoading()
+            mCameraDialog!!.stopVideo()
+            try {
+                if (!mCameraDialog!!.getmShareUtil().connectstate){
+                    mCameraDialog!!.updateCameraResources(1, mCameraDialog!!.getmDeviceNum())
+                }
+                TakePhotoManager.getInstance().getCameraVedioClent(mCameraDialog!!.getmDeviceNum()).StopSearch()
+            } catch (e: Exception) {
+            }
+        })
+        mCameraDialog!!.setOnShowListener(DialogInterface.OnShowListener {
+            mCameraDialog!!.initmTakePhotoOrRecord(mCameraDialog!!.getmShareUtil().selectTakePhotoOrRecord)
+            if (!mCameraDialog!!.isShowVideo && mCameraDialog!!.getmShareUtil().connectstate && mCameraDialog!!.getmShareUtil().continusTakePhotoState) {
+                mCameraDialog!!.playVideo()
+            }
+        })
+    }
+
+    fun startSaveTraceThread(context: Context){
+        Thread(Runnable {
+            try {
+                while (true){
+
+                    if(niLocationList!=null&&niLocationList.size>0){
+
+                        var niLocation = niLocationList[0]
+                        var doubleArray = doubleArrayOf()
+                        doubleArray[0] = niLocation.longitude
+                        doubleArray[1] = niLocation.latitude
+                        val geometry = GeometryTools.createGeometry(doubleArray)
+                        val tileX = RealmSet<Int>()
+                        GeometryToolsKt.getTileXByGeometry(geometry.toString(), tileX)
+                        val tileY = RealmSet<Int>()
+                        GeometryToolsKt.getTileYByGeometry(geometry.toString(), tileY)
+
+                        //遍历存储tile对应的x与y的值
+                        tileX.forEach { x ->
+                            tileY.forEach { y ->
+                                niLocation.tilex = x
+                                niLocation.tiley = y
+                            }
+                        }
+
+                        TraceDataBase.getDatabase(context, Constant.DATA_PATH+ SystemConstant.USER_ID+"/trace.sqlite").niLocationDao.insert(niLocation)
+                        niLocationList.removeAt(0)
+                        Log.e("qj","saveTrace")
+                    }
+                    Thread.sleep(30)
+                }
+            } catch (e: InterruptedException) {
+                e.printStackTrace()
+                Log.e("qj","异常==${e.message}")
+            }
+        }).start()
+    }
+
+    //增加轨迹存储
+    fun addSaveTrace(niLocation: NiLocation){
+        if(niLocation!=null&&niLocationList!=null){
+            niLocationList.add(niLocation)
+        }
+    }
 }