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

app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt

@@ -66,9 +66,9 @@ class MainActivity : BaseActivity() {
         mapController.locationLayerHandler.startLocation()
         //启动轨迹存储
         mapController.locationLayerHandler.setNiLocationListener(NiLocationListener {
-            ToastUtils.showLong("定位${it.longitude}")
-            binding.viewModel!!.addSaveTrace(it)
-            binding.viewModel!!.startSaveTraceThread(this)
+            //ToastUtils.showLong("定位${it.longitude}")
+            binding!!.viewModel!!.addSaveTrace(it)
+            binding!!.viewModel!!.startSaveTraceThread(this)
         })
         //显示轨迹图层
 //        mapController.layerManagerHandler.showNiLocationLayer(Constant.DATA_PATH+ SystemConstant.USER_ID+"/trace.sqlite")

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

@@ -7,7 +7,6 @@ import android.util.Log
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.navigation.findNavController
-import com.blankj.utilcode.util.ToastUtils
 import com.navinfo.collect.library.data.dao.impl.TraceDataBase
 import com.navinfo.collect.library.data.entity.NiLocation
 import com.navinfo.collect.library.map.NIMapController
@@ -62,7 +61,7 @@ class MainViewModel @Inject constructor(
 
         Log.e("qj", LibVlcUtil.hasCompatibleCPU(context).toString())
 
-        ToastUtils.showShort("点击了相机")
+        //ToastUtils.showShort("点击了相机")
 
         if (mCameraDialog == null) {
             mCameraDialog = CommonDialog(

app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListAdapter.kt

@@ -10,6 +10,8 @@ import com.navinfo.omqs.R
 import com.navinfo.omqs.bean.TaskBean
 import com.navinfo.omqs.databinding.AdapterTaskListBinding
 import com.navinfo.omqs.http.taskdownload.TaskDownloadManager
+import com.navinfo.omqs.http.taskupload.TaskUploadManager
+import com.navinfo.omqs.tools.FileManager
 import com.navinfo.omqs.tools.FileManager.Companion.FileDownloadStatus
 import com.navinfo.omqs.ui.other.BaseRecyclerViewAdapter
 import com.navinfo.omqs.ui.other.BaseViewHolder
@@ -25,7 +27,8 @@ import javax.inject.Inject
  *使用 LifecycleRegistry 给 ViewHolder 分发生命周期(这里使用了这个)
  */
 class TaskListAdapter(
-    private val downloadManager: TaskDownloadManager
+    private val downloadManager: TaskDownloadManager,
+    private val uploadManager: TaskUploadManager
 ) : BaseRecyclerViewAdapter<TaskBean>() {
 
 
@@ -48,6 +51,18 @@ class TaskListAdapter(
         }
     }
 
+    private val uploadBtnClick = View.OnClickListener() {
+        if (it.tag != null) {
+            val taskBean = data[it.tag as Int]
+            Log.e("jingo", "开始上传 ${taskBean.syncStatus}")
+            when (taskBean.syncStatus) {
+                FileManager.Companion.FileUploadStatus.NONE->{
+                    uploadManager.start(taskBean.id)
+                }
+            }
+        }
+    }
+
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BaseViewHolder {
         val viewBinding =
             AdapterTaskListBinding.inflate(LayoutInflater.from(parent.context), parent, false)
@@ -69,8 +84,12 @@ class TaskListAdapter(
         changeViews(binding, taskBean)
         downloadManager.addTask(taskBean)
         downloadManager.observer(taskBean.id, holder, DownloadObserver(taskBean.id, binding))
+        uploadManager.addTask(taskBean)
+        uploadManager.observer(taskBean.id, holder, UploadObserver(taskBean.id, binding))
         binding.taskDownloadBtn.tag = position
         binding.taskDownloadBtn.setOnClickListener(downloadBtnClick)
+        binding.taskUploadBtn.tag = position
+        binding.taskUploadBtn.setOnClickListener(uploadBtnClick)
         binding.taskName.text = taskBean.evaluationTaskName
         binding.taskCityName.text = taskBean.cityName
         binding.taskDataVersion.text = "版本号：${taskBean.dataVersion}"
@@ -85,6 +104,31 @@ class TaskListAdapter(
         }
     }
 
+    inner class UploadObserver(val id: Int, val binding: AdapterTaskListBinding) :
+        Observer<TaskBean> {
+        override fun onChanged(t: TaskBean?) {
+            if (id == t?.id)
+                changeUploadTxtViews(binding, t)
+        }
+    }
+
+    private fun changeUploadTxtViews(binding: AdapterTaskListBinding, taskBean: TaskBean) {
+        when (taskBean.syncStatus) {
+            FileManager.Companion.FileUploadStatus.DONE -> {
+                binding.taskUploadBtn.text = "已上传"
+            }
+            FileManager.Companion.FileUploadStatus.ERROR -> {
+                binding.taskUploadBtn.text = "重新同步"
+            }
+            FileManager.Companion.FileUploadStatus.NONE -> {
+                binding.taskUploadBtn.text = "同步"
+            }
+            FileManager.Companion.FileUploadStatus.WAITING -> {
+                binding.taskUploadBtn.text = "等待同步"
+            }
+        }
+    }
+
 
     private fun changeViews(binding: AdapterTaskListBinding, taskBean: TaskBean) {
         if (taskBean.fileSize > 0L) {

app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListFragment.kt

@@ -9,6 +9,7 @@ import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.navinfo.omqs.databinding.FragmentTaskListBinding
 import com.navinfo.omqs.http.taskdownload.TaskDownloadManager
+import com.navinfo.omqs.http.taskupload.TaskUploadManager
 import com.navinfo.omqs.ui.fragment.BaseFragment
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
@@ -17,12 +18,14 @@ import javax.inject.Inject
 class TaskListFragment : BaseFragment(){
     @Inject
     lateinit var downloadManager: TaskDownloadManager
+    @Inject
+    lateinit var uploadManager: TaskUploadManager
     private var _binding: FragmentTaskListBinding? = null
     private val viewModel by viewModels<TaskListViewModel>()
     private val binding get() = _binding!!
     private val adapter: TaskListAdapter by lazy {
         TaskListAdapter(
-            downloadManager,
+            downloadManager,uploadManager
         )
     }
 
@@ -31,6 +34,7 @@ class TaskListFragment : BaseFragment(){
         savedInstanceState: Bundle?
     ): View {
         downloadManager.init(requireContext())
+        uploadManager.init(requireContext())
         _binding = FragmentTaskListBinding.inflate(inflater, container, false)
         return binding.root