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

Conflicts: vtm
2023-06-29 17:23:12 +08:00
parent c00592f6d5 827e6b31b8
commit f415ded353
53 changed files with 1142 additions and 68 deletions
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/CheckPermissionsActivity.java
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/CheckPermissionsActivity.java
@@ -37,7 +37,8 @@ public class CheckPermissionsActivity extends BaseActivity {
 			Manifest.permission.ACCESS_FINE_LOCATION,
 			Manifest.permission.WRITE_EXTERNAL_STORAGE,
 			Manifest.permission.READ_EXTERNAL_STORAGE,
-			Manifest.permission.RECORD_AUDIO
+			Manifest.permission.RECORD_AUDIO,
+			Manifest.permission.CAMERA,
 	};

 	private static final int PERMISSON_REQUESTCODE = 0;
@@ -53,6 +54,7 @@ public class CheckPermissionsActivity extends BaseActivity {
 					Manifest.permission.WRITE_EXTERNAL_STORAGE,
 					Manifest.permission.READ_EXTERNAL_STORAGE,
 					Manifest.permission.RECORD_AUDIO,
+					Manifest.permission.CAMERA,
 					BACKGROUND_LOCATION_PERMISSION
 			};
 		}
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/scan/QRCodeViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/scan/QRCodeViewModel.kt
@@ -0,0 +1,256 @@
+package com.navinfo.omqs.ui.activity.scan
+
+import android.content.Context
+import android.text.TextUtils
+import android.widget.Toast
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.navinfo.omqs.Constant
+import com.navinfo.omqs.bean.IndoorConnectionInfoBean
+import com.navinfo.omqs.bean.QRCodeBean
+import com.navinfo.omqs.bean.SysUserBean
+import com.navinfo.omqs.http.DefaultResponse
+import com.navinfo.omqs.http.NetResult
+import com.navinfo.omqs.http.NetworkService
+import com.navinfo.omqs.ui.activity.login.LoginStatus
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import java.io.IOException
+import javax.inject.Inject
+
+enum class QrCodeStatus {
+    /**
+     * 网络访问失败
+     */
+    QR_CODE_STATUS_NET_FAILURE,
+
+    /**
+     * 成功
+     */
+    QR_CODE_STATUS_SUCCESS,
+
+    /**
+     * 信息更新成功
+     */
+    QR_CODE_STATUS_SERVER_INFO_SUCCESS,
+}
+
+@HiltViewModel
+class QrCodeViewModel @Inject constructor(
+    private val networkService: NetworkService
+) : ViewModel() {
+    //用户信息
+    val qrCodeBean: MutableLiveData<QRCodeBean> = MutableLiveData()
+
+    //是不是连接成功
+    val qrCodeStatus: MutableLiveData<QrCodeStatus> = MutableLiveData()
+
+
+    init {
+        qrCodeBean.value = QRCodeBean()
+    }
+
+
+    /**
+     * 扫一扫按钮
+     */
+    fun connect(context: Context, ips: String) {
+
+        if (TextUtils.isEmpty(ips)) {
+            Toast.makeText(context, "获取ip失败！", Toast.LENGTH_LONG).show()
+            return
+        }
+
+        val ipArray = ips.split(";".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
+        //测试代码
+        //final String[] ipArray = new String[]{"172.21.2.137"};
+        if (ipArray.isEmpty()) {
+            Toast.makeText(context, "获取ip失败！", Toast.LENGTH_SHORT).show()
+            return
+        }
+
+        ipArray.forEach { ip ->
+            if (!TextUtils.isEmpty(ip)) {
+                viewModelScope.launch(Dispatchers.Default) {
+                    val ipTemp: String = ip
+                    val url = "http://$ipTemp:8080/sensor/service/keepalive"
+                    when (val result = networkService.connectIndoorTools(url)) {
+                        is NetResult.Success<*> -> {
+
+                            if (result.data != null) {
+                                try {
+
+                                    val defaultUserResponse = result.data as QRCodeBean
+
+                                    if (defaultUserResponse.errcode == 0) {
+
+                                        Constant.INDOOR_IP = ipTemp
+
+                                        qrCodeStatus.postValue(QrCodeStatus.QR_CODE_STATUS_SUCCESS)
+
+                                        withContext(Dispatchers.Main) {
+                                            Toast.makeText(
+                                                context,
+                                                "连接室内整理工具成功。",
+                                                Toast.LENGTH_LONG
+                                            ).show()
+                                        }
+                                    } else {
+                                        withContext(Dispatchers.Main) {
+                                            Toast.makeText(
+                                                context,
+                                                "${defaultUserResponse.msg}",
+                                                Toast.LENGTH_SHORT
+                                            )
+                                                .show()
+                                        }
+                                    }
+
+                                } catch (e: IOException) {
+                                    withContext(Dispatchers.Main) {
+                                        Toast.makeText(
+                                            context,
+                                            "${e.message}",
+                                            Toast.LENGTH_SHORT
+                                        ).show()
+                                    }
+                                }
+                            }
+                        }
+
+                        is NetResult.Error<*> -> {
+                            withContext(Dispatchers.Main) {
+                                Toast.makeText(
+                                    context,
+                                    "${result.exception.message}",
+                                    Toast.LENGTH_SHORT
+                                )
+                                    .show()
+                            }
+                            qrCodeStatus.postValue(QrCodeStatus.QR_CODE_STATUS_NET_FAILURE)
+                        }
+
+                        is NetResult.Failure<*> -> {
+                            withContext(Dispatchers.Main) {
+                                Toast.makeText(
+                                    context,
+                                    "${result.code}:${result.msg}",
+                                    Toast.LENGTH_SHORT
+                                )
+                                    .show()
+                            }
+                            qrCodeStatus.postValue(QrCodeStatus.QR_CODE_STATUS_NET_FAILURE)
+                        }
+
+                        else -> {}
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * 扫一扫按钮
+     */
+    fun updateServerInfo(context: Context) {
+
+        if (TextUtils.isEmpty(Constant.INDOOR_IP)) {
+            Toast.makeText(context, "获取ip失败！", Toast.LENGTH_LONG).show()
+            return
+        }
+
+        viewModelScope.launch(Dispatchers.Default) {
+            val url = "http://${Constant.INDOOR_IP}:8080/sensor/service/connection"
+            when (val result = networkService.updateServerInfo(
+                url = url,
+                indoorConnectionInfoBean = IndoorConnectionInfoBean(
+                    Constant.USER_ID,
+                    Constant.USER_ID,
+                    Constant.USER_ID,
+                    Constant.USER_ID,
+                    com.navinfo.collect.library.system.Constant.SERVER_ADDRESS,
+                    Constant.USER_ID,
+                    "Android"
+                )
+            )) {
+                is NetResult.Success<*> -> {
+
+                    if (result.data != null) {
+                        try {
+
+                            val defaultUserResponse = result.data as QRCodeBean
+
+                            if (defaultUserResponse.errcode == 0) {
+
+                                withContext(Dispatchers.Main) {
+                                    Toast.makeText(
+                                        context,
+                                        "信息更新成功。",
+                                        Toast.LENGTH_LONG
+                                    ).show()
+                                    qrCodeStatus.postValue(QrCodeStatus.QR_CODE_STATUS_SERVER_INFO_SUCCESS)
+                                }
+                            } else {
+                                withContext(Dispatchers.Main) {
+                                    Toast.makeText(
+                                        context,
+                                        "${defaultUserResponse.msg}",
+                                        Toast.LENGTH_SHORT
+                                    )
+                                        .show()
+                                }
+                            }
+
+                        } catch (e: IOException) {
+                            withContext(Dispatchers.Main) {
+                                Toast.makeText(
+                                    context,
+                                    "${e.message}",
+                                    Toast.LENGTH_SHORT
+                                ).show()
+                            }
+                        }
+                    }
+                }
+
+                is NetResult.Error<*> -> {
+                    withContext(Dispatchers.Main) {
+                        Toast.makeText(
+                            context,
+                            "${result.exception.message}",
+                            Toast.LENGTH_SHORT
+                        )
+                            .show()
+                    }
+                    qrCodeStatus.postValue(QrCodeStatus.QR_CODE_STATUS_NET_FAILURE)
+                }
+
+                is NetResult.Failure<*> -> {
+                    withContext(Dispatchers.Main) {
+                        Toast.makeText(
+                            context,
+                            "${result.code}:${result.msg}",
+                            Toast.LENGTH_SHORT
+                        )
+                            .show()
+                    }
+                    qrCodeStatus.postValue(QrCodeStatus.QR_CODE_STATUS_NET_FAILURE)
+                }
+
+                else -> {}
+            }
+
+        }
+
+    }
+
+
+    override fun onCleared() {
+        super.onCleared()
+    }
+
+}
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/scan/QrCodeActivity.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/scan/QrCodeActivity.kt
@@ -0,0 +1,147 @@
+package com.navinfo.omqs.ui.activity.scan
+
+import android.annotation.SuppressLint
+import android.graphics.Rect
+import android.graphics.RectF
+import android.os.Bundle
+import android.util.Log
+import androidx.activity.viewModels
+import androidx.camera.core.ImageCapture
+import androidx.camera.view.LifecycleCameraController
+import androidx.databinding.DataBindingUtil
+import com.navinfo.omqs.R
+import com.navinfo.omqs.databinding.ActivityQrCodeBinding
+import com.navinfo.omqs.ui.activity.BaseActivity
+import com.navinfo.omqs.ui.listener.QRCodeAnalyser
+import dagger.hilt.android.AndroidEntryPoint
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.Executors
+import androidx.lifecycle.Observer
+import com.navinfo.omqs.ui.activity.login.LoginStatus
+
+/**
+ * date:2023/6/18
+ * author:qj
+ * description:二维码扫描
+ */
+@AndroidEntryPoint
+class QrCodeActivity : BaseActivity() {
+    private lateinit var binding: ActivityQrCodeBinding
+    private lateinit var lifecycleCameraController: LifecycleCameraController
+    private lateinit var cameraExecutor: ExecutorService
+    private val viewModel by viewModels<QrCodeViewModel>()
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_qr_code)
+
+        binding.qrCodeModel = viewModel
+        binding.lifecycleOwner = this
+        binding.activity = this
+
+        initView()
+        initController()
+    }
+
+    private fun initView() {
+        //登录校验，初始化成功
+        viewModel.qrCodeStatus.observe(this, qrCodeObserve)
+    }
+
+    /*
+    * 监听扫描结果
+    * */
+    private val qrCodeObserve = Observer<QrCodeStatus> {
+        when (it) {
+            QrCodeStatus.QR_CODE_STATUS_SUCCESS -> {
+                finish()
+            }
+            QrCodeStatus.QR_CODE_STATUS_NET_FAILURE -> {
+
+            }
+            QrCodeStatus.QR_CODE_STATUS_SERVER_INFO_SUCCESS -> {
+
+            }
+        }
+    }
+
+    @SuppressLint("ClickableViewAccessibility", "UnsafeOptInUsageError")
+    private fun initController() {
+        cameraExecutor = Executors.newSingleThreadExecutor()
+        lifecycleCameraController = LifecycleCameraController(this)
+        lifecycleCameraController.bindToLifecycle(this)
+        lifecycleCameraController.imageCaptureFlashMode = ImageCapture.FLASH_MODE_AUTO
+        lifecycleCameraController.setImageAnalysisAnalyzer(
+            cameraExecutor,
+            QRCodeAnalyser { barcodes, imageWidth, imageHeight ->
+                if (barcodes.isEmpty()) {
+                    return@QRCodeAnalyser
+                }
+                initScale(imageWidth, imageHeight)
+                val list = ArrayList<RectF>()
+                val strList = ArrayList<String>()
+
+                barcodes.forEach { barcode ->
+                    barcode.boundingBox?.let { rect ->
+                        val translateRect = translateRect(rect)
+                        list.add(translateRect)
+                        Log.e(
+                            "ztzt", "left：${translateRect.left}  +" +
+                                    "  top：${translateRect.top}  +  right：${translateRect.right}" +
+                                    "  +  bottom：${translateRect.bottom}"
+                        )
+                        Log.e("ztzt", "barcode.rawValue：${barcode.rawValue}")
+                        strList.add(barcode.rawValue ?: "No Value")
+                    }
+                }
+                judgeIntent(strList)
+                binding.scanView.setRectList(list)
+
+            })
+        binding.previewView.controller = lifecycleCameraController
+    }
+
+    fun judgeIntent(list: ArrayList<String>) {
+        val sb = StringBuilder()
+        list.forEach {
+            sb.append(it)
+            sb.append("\n")
+        }
+        intentToResult(sb.toString())
+    }
+
+    private fun intentToResult(result: String) {
+
+        Log.e("qj", "QRCodeActivity === $result")
+
+        viewModel.connect(this, result)
+
+        /*        val intent = Intent(this, QRCodeResultActivity::class.java)
+                intent.putExtra(QRCodeResultActivity.RESULT_KEY, result)
+                startActivity(intent)
+                finish()*/
+    }
+
+
+    private var scaleX = 0f
+    private var scaleY = 0f
+
+    private fun translateX(x: Float): Float = x * scaleX
+    private fun translateY(y: Float): Float = y * scaleY
+
+    //将扫描的矩形换算为当前屏幕大小
+    private fun translateRect(rect: Rect) = RectF(
+        translateX(rect.left.toFloat()),
+        translateY(rect.top.toFloat()),
+        translateX(rect.right.toFloat()),
+        translateY(rect.bottom.toFloat())
+    )
+
+    //初始化缩放比例
+    private fun initScale(imageWidth: Int, imageHeight: Int) {
+        Log.e("ztzt", "imageWidth：${imageWidth} + imageHeight：${imageHeight}")
+        scaleY = binding.scanView.height.toFloat() / imageWidth.toFloat()
+        scaleX = binding.scanView.width.toFloat() / imageHeight.toFloat()
+        Log.e("ztzt", "scaleX：${scaleX} + scaleY：${scaleY}")
+    }
+}
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/scan/QrCodeResultActivity.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/scan/QrCodeResultActivity.kt
@@ -0,0 +1,30 @@
+package com.navinfo.omqs.ui.activity.scan
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import com.navinfo.omqs.databinding.ActivityResultBinding
+
+/**
+ * date:2021/6/18
+ * author:zhangteng
+ * description:
+ */
+class QRCodeResultActivity : AppCompatActivity() {
+    private lateinit var binding: ActivityResultBinding
+
+    companion object {
+        const val RESULT_KEY = "result_key";
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivityResultBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        val intent = intent
+        binding.text.text = intent.getStringExtra(RESULT_KEY)
+        binding.button.setOnClickListener {
+            finish()
+        }
+    }
+}