diff --git a/app/src/main/java/com/casic/detector/base/BaseApplication.kt b/app/src/main/java/com/casic/detector/base/BaseApplication.kt index e61ea61..30ccb6b 100644 --- a/app/src/main/java/com/casic/detector/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/detector/base/BaseApplication.kt @@ -15,7 +15,7 @@ private val kTag = "BaseApplication" private val suffix = "/dev/ttysWK" - private var serialPorts: ArrayList = ArrayList() + private var serialPorts = ArrayList() @Throws(SecurityException::class, IOException::class, InvalidParameterException::class) fun getSerialPorts(): ArrayList { diff --git a/app/src/main/java/com/casic/detector/base/BaseApplication.kt b/app/src/main/java/com/casic/detector/base/BaseApplication.kt index e61ea61..30ccb6b 100644 --- a/app/src/main/java/com/casic/detector/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/detector/base/BaseApplication.kt @@ -15,7 +15,7 @@ private val kTag = "BaseApplication" private val suffix = "/dev/ttysWK" - private var serialPorts: ArrayList = ArrayList() + private var serialPorts = ArrayList() @Throws(SecurityException::class, IOException::class, InvalidParameterException::class) fun getSerialPorts(): ArrayList { diff --git a/app/src/main/java/com/casic/detector/cluster/ClusterOverlay.java b/app/src/main/java/com/casic/detector/cluster/ClusterOverlay.java index 3960a9e..09918f2 100644 --- a/app/src/main/java/com/casic/detector/cluster/ClusterOverlay.java +++ b/app/src/main/java/com/casic/detector/cluster/ClusterOverlay.java @@ -176,8 +176,7 @@ private void addSingleClusterToMap(Cluster cluster) { LatLng latlng = cluster.getCenterLatLng(); MarkerOptions markerOptions = new MarkerOptions(); - markerOptions.anchor(0.5f, 0.5f) - .icon(getBitmapDes(cluster.getClusterCount())).position(latlng); + markerOptions.icon(getBitmapDes(cluster.getClusterCount())).position(latlng); Marker marker = amap.addMarker(markerOptions); marker.setAnimation(addAnimation); marker.setObject(cluster); @@ -283,8 +282,8 @@ textView.setText(tile); } textView.setGravity(Gravity.CENTER); - textView.setTextColor(Color.BLACK); - textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 15); + textView.setTextColor(Color.WHITE); + textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 16); if (clusterRender != null && clusterRender.getDrawableByCount(num) != null) { textView.setBackgroundDrawable(clusterRender.getDrawableByCount(num)); } else { diff --git a/app/src/main/java/com/casic/detector/base/BaseApplication.kt b/app/src/main/java/com/casic/detector/base/BaseApplication.kt index e61ea61..30ccb6b 100644 --- a/app/src/main/java/com/casic/detector/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/detector/base/BaseApplication.kt @@ -15,7 +15,7 @@ private val kTag = "BaseApplication" private val suffix = "/dev/ttysWK" - private var serialPorts: ArrayList = ArrayList() + private var serialPorts = ArrayList() @Throws(SecurityException::class, IOException::class, InvalidParameterException::class) fun getSerialPorts(): ArrayList { diff --git a/app/src/main/java/com/casic/detector/cluster/ClusterOverlay.java b/app/src/main/java/com/casic/detector/cluster/ClusterOverlay.java index 3960a9e..09918f2 100644 --- a/app/src/main/java/com/casic/detector/cluster/ClusterOverlay.java +++ b/app/src/main/java/com/casic/detector/cluster/ClusterOverlay.java @@ -176,8 +176,7 @@ private void addSingleClusterToMap(Cluster cluster) { LatLng latlng = cluster.getCenterLatLng(); MarkerOptions markerOptions = new MarkerOptions(); - markerOptions.anchor(0.5f, 0.5f) - .icon(getBitmapDes(cluster.getClusterCount())).position(latlng); + markerOptions.icon(getBitmapDes(cluster.getClusterCount())).position(latlng); Marker marker = amap.addMarker(markerOptions); marker.setAnimation(addAnimation); marker.setObject(cluster); @@ -283,8 +282,8 @@ textView.setText(tile); } textView.setGravity(Gravity.CENTER); - textView.setTextColor(Color.BLACK); - textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 15); + textView.setTextColor(Color.WHITE); + textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 16); if (clusterRender != null && clusterRender.getDrawableByCount(num) != null) { textView.setBackgroundDrawable(clusterRender.getDrawableByCount(num)); } else { diff --git a/app/src/main/java/com/casic/detector/model/MarkerModel.kt b/app/src/main/java/com/casic/detector/model/MarkerModel.kt deleted file mode 100644 index dab32c3..0000000 --- a/app/src/main/java/com/casic/detector/model/MarkerModel.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.casic.detector.model - -/** - * 上传标识器的数据模型 - * */ -data class MarkerModel(private val id: String, private val imagePath: String) \ No newline at end of file diff --git a/app/src/main/java/com/casic/detector/base/BaseApplication.kt b/app/src/main/java/com/casic/detector/base/BaseApplication.kt index e61ea61..30ccb6b 100644 --- a/app/src/main/java/com/casic/detector/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/detector/base/BaseApplication.kt @@ -15,7 +15,7 @@ private val kTag = "BaseApplication" private val suffix = "/dev/ttysWK" - private var serialPorts: ArrayList = ArrayList() + private var serialPorts = ArrayList() @Throws(SecurityException::class, IOException::class, InvalidParameterException::class) fun getSerialPorts(): ArrayList { diff --git a/app/src/main/java/com/casic/detector/cluster/ClusterOverlay.java b/app/src/main/java/com/casic/detector/cluster/ClusterOverlay.java index 3960a9e..09918f2 100644 --- a/app/src/main/java/com/casic/detector/cluster/ClusterOverlay.java +++ b/app/src/main/java/com/casic/detector/cluster/ClusterOverlay.java @@ -176,8 +176,7 @@ private void addSingleClusterToMap(Cluster cluster) { LatLng latlng = cluster.getCenterLatLng(); MarkerOptions markerOptions = new MarkerOptions(); - markerOptions.anchor(0.5f, 0.5f) - .icon(getBitmapDes(cluster.getClusterCount())).position(latlng); + markerOptions.icon(getBitmapDes(cluster.getClusterCount())).position(latlng); Marker marker = amap.addMarker(markerOptions); marker.setAnimation(addAnimation); marker.setObject(cluster); @@ -283,8 +282,8 @@ textView.setText(tile); } textView.setGravity(Gravity.CENTER); - textView.setTextColor(Color.BLACK); - textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 15); + textView.setTextColor(Color.WHITE); + textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 16); if (clusterRender != null && clusterRender.getDrawableByCount(num) != null) { textView.setBackgroundDrawable(clusterRender.getDrawableByCount(num)); } else { diff --git a/app/src/main/java/com/casic/detector/model/MarkerModel.kt b/app/src/main/java/com/casic/detector/model/MarkerModel.kt deleted file mode 100644 index dab32c3..0000000 --- a/app/src/main/java/com/casic/detector/model/MarkerModel.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.casic.detector.model - -/** - * 上传标识器的数据模型 - * */ -data class MarkerModel(private val id: String, private val imagePath: String) \ No newline at end of file diff --git a/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt index db640cc..43a8484 100644 --- a/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt @@ -78,10 +78,10 @@ /** * 上传工单中标识器信息 + * info中的主键 */ @GET("/ems/rs/task/update-task-mark") suspend fun uploadMarker( - @Query("userName") userId: String, @Query("taskDetailId") taskId: String, ): String diff --git a/app/src/main/java/com/casic/detector/base/BaseApplication.kt b/app/src/main/java/com/casic/detector/base/BaseApplication.kt index e61ea61..30ccb6b 100644 --- a/app/src/main/java/com/casic/detector/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/detector/base/BaseApplication.kt @@ -15,7 +15,7 @@ private val kTag = "BaseApplication" private val suffix = "/dev/ttysWK" - private var serialPorts: ArrayList = ArrayList() + private var serialPorts = ArrayList() @Throws(SecurityException::class, IOException::class, InvalidParameterException::class) fun getSerialPorts(): ArrayList { diff --git a/app/src/main/java/com/casic/detector/cluster/ClusterOverlay.java b/app/src/main/java/com/casic/detector/cluster/ClusterOverlay.java index 3960a9e..09918f2 100644 --- a/app/src/main/java/com/casic/detector/cluster/ClusterOverlay.java +++ b/app/src/main/java/com/casic/detector/cluster/ClusterOverlay.java @@ -176,8 +176,7 @@ private void addSingleClusterToMap(Cluster cluster) { LatLng latlng = cluster.getCenterLatLng(); MarkerOptions markerOptions = new MarkerOptions(); - markerOptions.anchor(0.5f, 0.5f) - .icon(getBitmapDes(cluster.getClusterCount())).position(latlng); + markerOptions.icon(getBitmapDes(cluster.getClusterCount())).position(latlng); Marker marker = amap.addMarker(markerOptions); marker.setAnimation(addAnimation); marker.setObject(cluster); @@ -283,8 +282,8 @@ textView.setText(tile); } textView.setGravity(Gravity.CENTER); - textView.setTextColor(Color.BLACK); - textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 15); + textView.setTextColor(Color.WHITE); + textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 16); if (clusterRender != null && clusterRender.getDrawableByCount(num) != null) { textView.setBackgroundDrawable(clusterRender.getDrawableByCount(num)); } else { diff --git a/app/src/main/java/com/casic/detector/model/MarkerModel.kt b/app/src/main/java/com/casic/detector/model/MarkerModel.kt deleted file mode 100644 index dab32c3..0000000 --- a/app/src/main/java/com/casic/detector/model/MarkerModel.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.casic.detector.model - -/** - * 上传标识器的数据模型 - * */ -data class MarkerModel(private val id: String, private val imagePath: String) \ No newline at end of file diff --git a/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt index db640cc..43a8484 100644 --- a/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt @@ -78,10 +78,10 @@ /** * 上传工单中标识器信息 + * info中的主键 */ @GET("/ems/rs/task/update-task-mark") suspend fun uploadMarker( - @Query("userName") userId: String, @Query("taskDetailId") taskId: String, ): String diff --git a/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt index e0a45c3..8ae0794 100644 --- a/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt @@ -1,6 +1,5 @@ package com.casic.detector.retrofit -import com.casic.detector.model.MarkerModel import com.casic.detector.utils.LocaleConstant import com.google.gson.Gson import com.google.gson.JsonObject @@ -17,7 +16,7 @@ object RetrofitServiceManager { private val gson by lazy { Gson() } - private val typeToken = object : TypeToken>() {}.type + private val typeToken = object : TypeToken>() {}.type private fun createApi(): RetrofitService { val serverIp = SaveKeyValues.getValue(LocaleConstant.SERVER_IP, "") as String @@ -220,8 +219,8 @@ /** * 上传工单中标识器信息 */ - suspend fun uploadMarker(userName: String, taskDetailId: String): String { - return createApi().uploadMarker(userName, taskDetailId) + suspend fun uploadMarker(taskDetailId: String): String { + return createApi().uploadMarker(taskDetailId) } /** @@ -234,7 +233,7 @@ /** * 上传自由巡检过程中发现的标识器 */ - suspend fun uploadTaskMarker(taskId: String, models: List): String { + suspend fun uploadTaskMarker(taskId: String, models: List): String { val param = JsonObject() param.add("markers", gson.toJsonTree(models, typeToken).asJsonArray) val requestBody = param.toString().toRequestBody( diff --git a/app/src/main/java/com/casic/detector/base/BaseApplication.kt b/app/src/main/java/com/casic/detector/base/BaseApplication.kt index e61ea61..30ccb6b 100644 --- a/app/src/main/java/com/casic/detector/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/detector/base/BaseApplication.kt @@ -15,7 +15,7 @@ private val kTag = "BaseApplication" private val suffix = "/dev/ttysWK" - private var serialPorts: ArrayList = ArrayList() + private var serialPorts = ArrayList() @Throws(SecurityException::class, IOException::class, InvalidParameterException::class) fun getSerialPorts(): ArrayList { diff --git a/app/src/main/java/com/casic/detector/cluster/ClusterOverlay.java b/app/src/main/java/com/casic/detector/cluster/ClusterOverlay.java index 3960a9e..09918f2 100644 --- a/app/src/main/java/com/casic/detector/cluster/ClusterOverlay.java +++ b/app/src/main/java/com/casic/detector/cluster/ClusterOverlay.java @@ -176,8 +176,7 @@ private void addSingleClusterToMap(Cluster cluster) { LatLng latlng = cluster.getCenterLatLng(); MarkerOptions markerOptions = new MarkerOptions(); - markerOptions.anchor(0.5f, 0.5f) - .icon(getBitmapDes(cluster.getClusterCount())).position(latlng); + markerOptions.icon(getBitmapDes(cluster.getClusterCount())).position(latlng); Marker marker = amap.addMarker(markerOptions); marker.setAnimation(addAnimation); marker.setObject(cluster); @@ -283,8 +282,8 @@ textView.setText(tile); } textView.setGravity(Gravity.CENTER); - textView.setTextColor(Color.BLACK); - textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 15); + textView.setTextColor(Color.WHITE); + textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 16); if (clusterRender != null && clusterRender.getDrawableByCount(num) != null) { textView.setBackgroundDrawable(clusterRender.getDrawableByCount(num)); } else { diff --git a/app/src/main/java/com/casic/detector/model/MarkerModel.kt b/app/src/main/java/com/casic/detector/model/MarkerModel.kt deleted file mode 100644 index dab32c3..0000000 --- a/app/src/main/java/com/casic/detector/model/MarkerModel.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.casic.detector.model - -/** - * 上传标识器的数据模型 - * */ -data class MarkerModel(private val id: String, private val imagePath: String) \ No newline at end of file diff --git a/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt index db640cc..43a8484 100644 --- a/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt @@ -78,10 +78,10 @@ /** * 上传工单中标识器信息 + * info中的主键 */ @GET("/ems/rs/task/update-task-mark") suspend fun uploadMarker( - @Query("userName") userId: String, @Query("taskDetailId") taskId: String, ): String diff --git a/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt index e0a45c3..8ae0794 100644 --- a/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt @@ -1,6 +1,5 @@ package com.casic.detector.retrofit -import com.casic.detector.model.MarkerModel import com.casic.detector.utils.LocaleConstant import com.google.gson.Gson import com.google.gson.JsonObject @@ -17,7 +16,7 @@ object RetrofitServiceManager { private val gson by lazy { Gson() } - private val typeToken = object : TypeToken>() {}.type + private val typeToken = object : TypeToken>() {}.type private fun createApi(): RetrofitService { val serverIp = SaveKeyValues.getValue(LocaleConstant.SERVER_IP, "") as String @@ -220,8 +219,8 @@ /** * 上传工单中标识器信息 */ - suspend fun uploadMarker(userName: String, taskDetailId: String): String { - return createApi().uploadMarker(userName, taskDetailId) + suspend fun uploadMarker(taskDetailId: String): String { + return createApi().uploadMarker(taskDetailId) } /** @@ -234,7 +233,7 @@ /** * 上传自由巡检过程中发现的标识器 */ - suspend fun uploadTaskMarker(taskId: String, models: List): String { + suspend fun uploadTaskMarker(taskId: String, models: List): String { val param = JsonObject() param.add("markers", gson.toJsonTree(models, typeToken).asJsonArray) val requestBody = param.toString().toRequestBody( diff --git a/app/src/main/java/com/casic/detector/utils/GpioManager.java b/app/src/main/java/com/casic/detector/utils/GpioManager.java index 0f54f1a..6459208 100644 --- a/app/src/main/java/com/casic/detector/utils/GpioManager.java +++ b/app/src/main/java/com/casic/detector/utils/GpioManager.java @@ -1,8 +1,10 @@ package com.casic.detector.utils; -public class GpioManager { +import android.util.Log; +public class GpioManager { + private static final String TAG = "GpioManager"; private static final int MT6761 = 0; private int selected; private final MT6761Gpio mt6761; @@ -38,6 +40,7 @@ * 璁剧疆GPIO杈撳嚭楂� * *********************************************************************/ public void setGpioHigh(String gpio) { + Log.d(TAG, "setGpioHigh: 调高电位"); if (this.getSelected() == MT6761) { mt6761.setCtrlPin(gpio); mt6761.setGpioHigh(); @@ -48,6 +51,7 @@ * 璁剧疆GPIO杈撳嚭浣� * *********************************************************************/ public void setGpioLow(String gpio) { + Log.d(TAG, "setGpioLow: 调低电位"); if (this.getSelected() == MT6761) { mt6761.setCtrlPin(gpio); mt6761.setGpioLow(); diff --git a/app/src/main/java/com/casic/detector/base/BaseApplication.kt b/app/src/main/java/com/casic/detector/base/BaseApplication.kt index e61ea61..30ccb6b 100644 --- a/app/src/main/java/com/casic/detector/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/detector/base/BaseApplication.kt @@ -15,7 +15,7 @@ private val kTag = "BaseApplication" private val suffix = "/dev/ttysWK" - private var serialPorts: ArrayList = ArrayList() + private var serialPorts = ArrayList() @Throws(SecurityException::class, IOException::class, InvalidParameterException::class) fun getSerialPorts(): ArrayList { diff --git a/app/src/main/java/com/casic/detector/cluster/ClusterOverlay.java b/app/src/main/java/com/casic/detector/cluster/ClusterOverlay.java index 3960a9e..09918f2 100644 --- a/app/src/main/java/com/casic/detector/cluster/ClusterOverlay.java +++ b/app/src/main/java/com/casic/detector/cluster/ClusterOverlay.java @@ -176,8 +176,7 @@ private void addSingleClusterToMap(Cluster cluster) { LatLng latlng = cluster.getCenterLatLng(); MarkerOptions markerOptions = new MarkerOptions(); - markerOptions.anchor(0.5f, 0.5f) - .icon(getBitmapDes(cluster.getClusterCount())).position(latlng); + markerOptions.icon(getBitmapDes(cluster.getClusterCount())).position(latlng); Marker marker = amap.addMarker(markerOptions); marker.setAnimation(addAnimation); marker.setObject(cluster); @@ -283,8 +282,8 @@ textView.setText(tile); } textView.setGravity(Gravity.CENTER); - textView.setTextColor(Color.BLACK); - textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 15); + textView.setTextColor(Color.WHITE); + textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 16); if (clusterRender != null && clusterRender.getDrawableByCount(num) != null) { textView.setBackgroundDrawable(clusterRender.getDrawableByCount(num)); } else { diff --git a/app/src/main/java/com/casic/detector/model/MarkerModel.kt b/app/src/main/java/com/casic/detector/model/MarkerModel.kt deleted file mode 100644 index dab32c3..0000000 --- a/app/src/main/java/com/casic/detector/model/MarkerModel.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.casic.detector.model - -/** - * 上传标识器的数据模型 - * */ -data class MarkerModel(private val id: String, private val imagePath: String) \ No newline at end of file diff --git a/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt index db640cc..43a8484 100644 --- a/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt @@ -78,10 +78,10 @@ /** * 上传工单中标识器信息 + * info中的主键 */ @GET("/ems/rs/task/update-task-mark") suspend fun uploadMarker( - @Query("userName") userId: String, @Query("taskDetailId") taskId: String, ): String diff --git a/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt index e0a45c3..8ae0794 100644 --- a/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt @@ -1,6 +1,5 @@ package com.casic.detector.retrofit -import com.casic.detector.model.MarkerModel import com.casic.detector.utils.LocaleConstant import com.google.gson.Gson import com.google.gson.JsonObject @@ -17,7 +16,7 @@ object RetrofitServiceManager { private val gson by lazy { Gson() } - private val typeToken = object : TypeToken>() {}.type + private val typeToken = object : TypeToken>() {}.type private fun createApi(): RetrofitService { val serverIp = SaveKeyValues.getValue(LocaleConstant.SERVER_IP, "") as String @@ -220,8 +219,8 @@ /** * 上传工单中标识器信息 */ - suspend fun uploadMarker(userName: String, taskDetailId: String): String { - return createApi().uploadMarker(userName, taskDetailId) + suspend fun uploadMarker(taskDetailId: String): String { + return createApi().uploadMarker(taskDetailId) } /** @@ -234,7 +233,7 @@ /** * 上传自由巡检过程中发现的标识器 */ - suspend fun uploadTaskMarker(taskId: String, models: List): String { + suspend fun uploadTaskMarker(taskId: String, models: List): String { val param = JsonObject() param.add("markers", gson.toJsonTree(models, typeToken).asJsonArray) val requestBody = param.toString().toRequestBody( diff --git a/app/src/main/java/com/casic/detector/utils/GpioManager.java b/app/src/main/java/com/casic/detector/utils/GpioManager.java index 0f54f1a..6459208 100644 --- a/app/src/main/java/com/casic/detector/utils/GpioManager.java +++ b/app/src/main/java/com/casic/detector/utils/GpioManager.java @@ -1,8 +1,10 @@ package com.casic.detector.utils; -public class GpioManager { +import android.util.Log; +public class GpioManager { + private static final String TAG = "GpioManager"; private static final int MT6761 = 0; private int selected; private final MT6761Gpio mt6761; @@ -38,6 +40,7 @@ * 璁剧疆GPIO杈撳嚭楂� * *********************************************************************/ public void setGpioHigh(String gpio) { + Log.d(TAG, "setGpioHigh: 调高电位"); if (this.getSelected() == MT6761) { mt6761.setCtrlPin(gpio); mt6761.setGpioHigh(); @@ -48,6 +51,7 @@ * 璁剧疆GPIO杈撳嚭浣� * *********************************************************************/ public void setGpioLow(String gpio) { + Log.d(TAG, "setGpioLow: 调低电位"); if (this.getSelected() == MT6761) { mt6761.setCtrlPin(gpio); mt6761.setGpioLow(); diff --git a/app/src/main/java/com/casic/detector/view/LoginActivity.kt b/app/src/main/java/com/casic/detector/view/LoginActivity.kt index 4b8618a..6a0cce9 100644 --- a/app/src/main/java/com/casic/detector/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/detector/view/LoginActivity.kt @@ -4,7 +4,6 @@ import androidx.lifecycle.ViewModelProvider import com.amap.api.navi.NaviSetting import com.casic.detector.databinding.ActivityLoginBinding -import com.casic.detector.utils.GpioManager import com.casic.detector.utils.LoadingDialogHub import com.casic.detector.utils.LocaleConstant import com.casic.detector.vm.UserViewModel @@ -19,10 +18,8 @@ private val kTag = "LoginActivity" private lateinit var userViewModel: UserViewModel - private val gpioManager by lazy { GpioManager() } override fun initOnCreate(savedInstanceState: Bundle?) { - gpioManager.setGpioLow("18") //先把导航隐私政策声明，后面导航会用到 NaviSetting.updatePrivacyShow(this, true, true) NaviSetting.updatePrivacyAgree(this, true) diff --git a/app/src/main/java/com/casic/detector/base/BaseApplication.kt b/app/src/main/java/com/casic/detector/base/BaseApplication.kt index e61ea61..30ccb6b 100644 --- a/app/src/main/java/com/casic/detector/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/detector/base/BaseApplication.kt @@ -15,7 +15,7 @@ private val kTag = "BaseApplication" private val suffix = "/dev/ttysWK" - private var serialPorts: ArrayList = ArrayList() + private var serialPorts = ArrayList() @Throws(SecurityException::class, IOException::class, InvalidParameterException::class) fun getSerialPorts(): ArrayList { diff --git a/app/src/main/java/com/casic/detector/cluster/ClusterOverlay.java b/app/src/main/java/com/casic/detector/cluster/ClusterOverlay.java index 3960a9e..09918f2 100644 --- a/app/src/main/java/com/casic/detector/cluster/ClusterOverlay.java +++ b/app/src/main/java/com/casic/detector/cluster/ClusterOverlay.java @@ -176,8 +176,7 @@ private void addSingleClusterToMap(Cluster cluster) { LatLng latlng = cluster.getCenterLatLng(); MarkerOptions markerOptions = new MarkerOptions(); - markerOptions.anchor(0.5f, 0.5f) - .icon(getBitmapDes(cluster.getClusterCount())).position(latlng); + markerOptions.icon(getBitmapDes(cluster.getClusterCount())).position(latlng); Marker marker = amap.addMarker(markerOptions); marker.setAnimation(addAnimation); marker.setObject(cluster); @@ -283,8 +282,8 @@ textView.setText(tile); } textView.setGravity(Gravity.CENTER); - textView.setTextColor(Color.BLACK); - textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 15); + textView.setTextColor(Color.WHITE); + textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 16); if (clusterRender != null && clusterRender.getDrawableByCount(num) != null) { textView.setBackgroundDrawable(clusterRender.getDrawableByCount(num)); } else { diff --git a/app/src/main/java/com/casic/detector/model/MarkerModel.kt b/app/src/main/java/com/casic/detector/model/MarkerModel.kt deleted file mode 100644 index dab32c3..0000000 --- a/app/src/main/java/com/casic/detector/model/MarkerModel.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.casic.detector.model - -/** - * 上传标识器的数据模型 - * */ -data class MarkerModel(private val id: String, private val imagePath: String) \ No newline at end of file diff --git a/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt index db640cc..43a8484 100644 --- a/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt @@ -78,10 +78,10 @@ /** * 上传工单中标识器信息 + * info中的主键 */ @GET("/ems/rs/task/update-task-mark") suspend fun uploadMarker( - @Query("userName") userId: String, @Query("taskDetailId") taskId: String, ): String diff --git a/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt index e0a45c3..8ae0794 100644 --- a/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt @@ -1,6 +1,5 @@ package com.casic.detector.retrofit -import com.casic.detector.model.MarkerModel import com.casic.detector.utils.LocaleConstant import com.google.gson.Gson import com.google.gson.JsonObject @@ -17,7 +16,7 @@ object RetrofitServiceManager { private val gson by lazy { Gson() } - private val typeToken = object : TypeToken>() {}.type + private val typeToken = object : TypeToken>() {}.type private fun createApi(): RetrofitService { val serverIp = SaveKeyValues.getValue(LocaleConstant.SERVER_IP, "") as String @@ -220,8 +219,8 @@ /** * 上传工单中标识器信息 */ - suspend fun uploadMarker(userName: String, taskDetailId: String): String { - return createApi().uploadMarker(userName, taskDetailId) + suspend fun uploadMarker(taskDetailId: String): String { + return createApi().uploadMarker(taskDetailId) } /** @@ -234,7 +233,7 @@ /** * 上传自由巡检过程中发现的标识器 */ - suspend fun uploadTaskMarker(taskId: String, models: List): String { + suspend fun uploadTaskMarker(taskId: String, models: List): String { val param = JsonObject() param.add("markers", gson.toJsonTree(models, typeToken).asJsonArray) val requestBody = param.toString().toRequestBody( diff --git a/app/src/main/java/com/casic/detector/utils/GpioManager.java b/app/src/main/java/com/casic/detector/utils/GpioManager.java index 0f54f1a..6459208 100644 --- a/app/src/main/java/com/casic/detector/utils/GpioManager.java +++ b/app/src/main/java/com/casic/detector/utils/GpioManager.java @@ -1,8 +1,10 @@ package com.casic.detector.utils; -public class GpioManager { +import android.util.Log; +public class GpioManager { + private static final String TAG = "GpioManager"; private static final int MT6761 = 0; private int selected; private final MT6761Gpio mt6761; @@ -38,6 +40,7 @@ * 璁剧疆GPIO杈撳嚭楂� * *********************************************************************/ public void setGpioHigh(String gpio) { + Log.d(TAG, "setGpioHigh: 调高电位"); if (this.getSelected() == MT6761) { mt6761.setCtrlPin(gpio); mt6761.setGpioHigh(); @@ -48,6 +51,7 @@ * 璁剧疆GPIO杈撳嚭浣� * *********************************************************************/ public void setGpioLow(String gpio) { + Log.d(TAG, "setGpioLow: 调低电位"); if (this.getSelected() == MT6761) { mt6761.setCtrlPin(gpio); mt6761.setGpioLow(); diff --git a/app/src/main/java/com/casic/detector/view/LoginActivity.kt b/app/src/main/java/com/casic/detector/view/LoginActivity.kt index 4b8618a..6a0cce9 100644 --- a/app/src/main/java/com/casic/detector/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/detector/view/LoginActivity.kt @@ -4,7 +4,6 @@ import androidx.lifecycle.ViewModelProvider import com.amap.api.navi.NaviSetting import com.casic.detector.databinding.ActivityLoginBinding -import com.casic.detector.utils.GpioManager import com.casic.detector.utils.LoadingDialogHub import com.casic.detector.utils.LocaleConstant import com.casic.detector.vm.UserViewModel @@ -19,10 +18,8 @@ private val kTag = "LoginActivity" private lateinit var userViewModel: UserViewModel - private val gpioManager by lazy { GpioManager() } override fun initOnCreate(savedInstanceState: Bundle?) { - gpioManager.setGpioLow("18") //先把导航隐私政策声明，后面导航会用到 NaviSetting.updatePrivacyShow(this, true, true) NaviSetting.updatePrivacyAgree(this, true) diff --git a/app/src/main/java/com/casic/detector/view/UploadEventActivity.kt b/app/src/main/java/com/casic/detector/view/UploadEventActivity.kt index 41394b0..bef0425 100644 --- a/app/src/main/java/com/casic/detector/view/UploadEventActivity.kt +++ b/app/src/main/java/com/casic/detector/view/UploadEventActivity.kt @@ -162,4 +162,9 @@ } }) } + + override fun onDestroy() { + super.onDestroy() + locationHub.stopLocation() + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/detector/base/BaseApplication.kt b/app/src/main/java/com/casic/detector/base/BaseApplication.kt index e61ea61..30ccb6b 100644 --- a/app/src/main/java/com/casic/detector/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/detector/base/BaseApplication.kt @@ -15,7 +15,7 @@ private val kTag = "BaseApplication" private val suffix = "/dev/ttysWK" - private var serialPorts: ArrayList = ArrayList() + private var serialPorts = ArrayList() @Throws(SecurityException::class, IOException::class, InvalidParameterException::class) fun getSerialPorts(): ArrayList { diff --git a/app/src/main/java/com/casic/detector/cluster/ClusterOverlay.java b/app/src/main/java/com/casic/detector/cluster/ClusterOverlay.java index 3960a9e..09918f2 100644 --- a/app/src/main/java/com/casic/detector/cluster/ClusterOverlay.java +++ b/app/src/main/java/com/casic/detector/cluster/ClusterOverlay.java @@ -176,8 +176,7 @@ private void addSingleClusterToMap(Cluster cluster) { LatLng latlng = cluster.getCenterLatLng(); MarkerOptions markerOptions = new MarkerOptions(); - markerOptions.anchor(0.5f, 0.5f) - .icon(getBitmapDes(cluster.getClusterCount())).position(latlng); + markerOptions.icon(getBitmapDes(cluster.getClusterCount())).position(latlng); Marker marker = amap.addMarker(markerOptions); marker.setAnimation(addAnimation); marker.setObject(cluster); @@ -283,8 +282,8 @@ textView.setText(tile); } textView.setGravity(Gravity.CENTER); - textView.setTextColor(Color.BLACK); - textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 15); + textView.setTextColor(Color.WHITE); + textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 16); if (clusterRender != null && clusterRender.getDrawableByCount(num) != null) { textView.setBackgroundDrawable(clusterRender.getDrawableByCount(num)); } else { diff --git a/app/src/main/java/com/casic/detector/model/MarkerModel.kt b/app/src/main/java/com/casic/detector/model/MarkerModel.kt deleted file mode 100644 index dab32c3..0000000 --- a/app/src/main/java/com/casic/detector/model/MarkerModel.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.casic.detector.model - -/** - * 上传标识器的数据模型 - * */ -data class MarkerModel(private val id: String, private val imagePath: String) \ No newline at end of file diff --git a/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt index db640cc..43a8484 100644 --- a/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt @@ -78,10 +78,10 @@ /** * 上传工单中标识器信息 + * info中的主键 */ @GET("/ems/rs/task/update-task-mark") suspend fun uploadMarker( - @Query("userName") userId: String, @Query("taskDetailId") taskId: String, ): String diff --git a/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt index e0a45c3..8ae0794 100644 --- a/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt @@ -1,6 +1,5 @@ package com.casic.detector.retrofit -import com.casic.detector.model.MarkerModel import com.casic.detector.utils.LocaleConstant import com.google.gson.Gson import com.google.gson.JsonObject @@ -17,7 +16,7 @@ object RetrofitServiceManager { private val gson by lazy { Gson() } - private val typeToken = object : TypeToken>() {}.type + private val typeToken = object : TypeToken>() {}.type private fun createApi(): RetrofitService { val serverIp = SaveKeyValues.getValue(LocaleConstant.SERVER_IP, "") as String @@ -220,8 +219,8 @@ /** * 上传工单中标识器信息 */ - suspend fun uploadMarker(userName: String, taskDetailId: String): String { - return createApi().uploadMarker(userName, taskDetailId) + suspend fun uploadMarker(taskDetailId: String): String { + return createApi().uploadMarker(taskDetailId) } /** @@ -234,7 +233,7 @@ /** * 上传自由巡检过程中发现的标识器 */ - suspend fun uploadTaskMarker(taskId: String, models: List): String { + suspend fun uploadTaskMarker(taskId: String, models: List): String { val param = JsonObject() param.add("markers", gson.toJsonTree(models, typeToken).asJsonArray) val requestBody = param.toString().toRequestBody( diff --git a/app/src/main/java/com/casic/detector/utils/GpioManager.java b/app/src/main/java/com/casic/detector/utils/GpioManager.java index 0f54f1a..6459208 100644 --- a/app/src/main/java/com/casic/detector/utils/GpioManager.java +++ b/app/src/main/java/com/casic/detector/utils/GpioManager.java @@ -1,8 +1,10 @@ package com.casic.detector.utils; -public class GpioManager { +import android.util.Log; +public class GpioManager { + private static final String TAG = "GpioManager"; private static final int MT6761 = 0; private int selected; private final MT6761Gpio mt6761; @@ -38,6 +40,7 @@ * 璁剧疆GPIO杈撳嚭楂� * *********************************************************************/ public void setGpioHigh(String gpio) { + Log.d(TAG, "setGpioHigh: 调高电位"); if (this.getSelected() == MT6761) { mt6761.setCtrlPin(gpio); mt6761.setGpioHigh(); @@ -48,6 +51,7 @@ * 璁剧疆GPIO杈撳嚭浣� * *********************************************************************/ public void setGpioLow(String gpio) { + Log.d(TAG, "setGpioLow: 调低电位"); if (this.getSelected() == MT6761) { mt6761.setCtrlPin(gpio); mt6761.setGpioLow(); diff --git a/app/src/main/java/com/casic/detector/view/LoginActivity.kt b/app/src/main/java/com/casic/detector/view/LoginActivity.kt index 4b8618a..6a0cce9 100644 --- a/app/src/main/java/com/casic/detector/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/detector/view/LoginActivity.kt @@ -4,7 +4,6 @@ import androidx.lifecycle.ViewModelProvider import com.amap.api.navi.NaviSetting import com.casic.detector.databinding.ActivityLoginBinding -import com.casic.detector.utils.GpioManager import com.casic.detector.utils.LoadingDialogHub import com.casic.detector.utils.LocaleConstant import com.casic.detector.vm.UserViewModel @@ -19,10 +18,8 @@ private val kTag = "LoginActivity" private lateinit var userViewModel: UserViewModel - private val gpioManager by lazy { GpioManager() } override fun initOnCreate(savedInstanceState: Bundle?) { - gpioManager.setGpioLow("18") //先把导航隐私政策声明，后面导航会用到 NaviSetting.updatePrivacyShow(this, true, true) NaviSetting.updatePrivacyAgree(this, true) diff --git a/app/src/main/java/com/casic/detector/view/UploadEventActivity.kt b/app/src/main/java/com/casic/detector/view/UploadEventActivity.kt index 41394b0..bef0425 100644 --- a/app/src/main/java/com/casic/detector/view/UploadEventActivity.kt +++ b/app/src/main/java/com/casic/detector/view/UploadEventActivity.kt @@ -162,4 +162,9 @@ } }) } + + override fun onDestroy() { + super.onDestroy() + locationHub.stopLocation() + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/detector/vm/TaskViewModel.kt b/app/src/main/java/com/casic/detector/vm/TaskViewModel.kt index 483cebd..b87e764 100644 --- a/app/src/main/java/com/casic/detector/vm/TaskViewModel.kt +++ b/app/src/main/java/com/casic/detector/vm/TaskViewModel.kt @@ -5,7 +5,6 @@ import com.casic.detector.extensions.getResponseMessage import com.casic.detector.extensions.getResponseState import com.casic.detector.model.MarkerFileModel -import com.casic.detector.model.MarkerModel import com.casic.detector.model.TaskModel import com.casic.detector.retrofit.RetrofitServiceManager import com.casic.detector.utils.DataBaseManager @@ -36,7 +35,7 @@ it.printStackTrace() }) - fun uploadTaskMarker(taskId: String, models: List) = launch({ + fun uploadTaskMarker(taskId: String, models: List) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.uploadTaskMarker(taskId, models) if (response.getResponseState()) { @@ -180,9 +179,9 @@ loadState.value = LoadState.Fail }) - fun uploadMarker(userName: String, taskDetailId: String) = launch({ + fun uploadMarker(taskDetailId: String) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.uploadMarker(userName, taskDetailId) + val response = RetrofitServiceManager.uploadMarker(taskDetailId) if (response.getResponseState()) { loadState.value = LoadState.Success } else { diff --git a/app/src/main/java/com/casic/detector/base/BaseApplication.kt b/app/src/main/java/com/casic/detector/base/BaseApplication.kt index e61ea61..30ccb6b 100644 --- a/app/src/main/java/com/casic/detector/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/detector/base/BaseApplication.kt @@ -15,7 +15,7 @@ private val kTag = "BaseApplication" private val suffix = "/dev/ttysWK" - private var serialPorts: ArrayList = ArrayList() + private var serialPorts = ArrayList() @Throws(SecurityException::class, IOException::class, InvalidParameterException::class) fun getSerialPorts(): ArrayList { diff --git a/app/src/main/java/com/casic/detector/cluster/ClusterOverlay.java b/app/src/main/java/com/casic/detector/cluster/ClusterOverlay.java index 3960a9e..09918f2 100644 --- a/app/src/main/java/com/casic/detector/cluster/ClusterOverlay.java +++ b/app/src/main/java/com/casic/detector/cluster/ClusterOverlay.java @@ -176,8 +176,7 @@ private void addSingleClusterToMap(Cluster cluster) { LatLng latlng = cluster.getCenterLatLng(); MarkerOptions markerOptions = new MarkerOptions(); - markerOptions.anchor(0.5f, 0.5f) - .icon(getBitmapDes(cluster.getClusterCount())).position(latlng); + markerOptions.icon(getBitmapDes(cluster.getClusterCount())).position(latlng); Marker marker = amap.addMarker(markerOptions); marker.setAnimation(addAnimation); marker.setObject(cluster); @@ -283,8 +282,8 @@ textView.setText(tile); } textView.setGravity(Gravity.CENTER); - textView.setTextColor(Color.BLACK); - textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 15); + textView.setTextColor(Color.WHITE); + textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 16); if (clusterRender != null && clusterRender.getDrawableByCount(num) != null) { textView.setBackgroundDrawable(clusterRender.getDrawableByCount(num)); } else { diff --git a/app/src/main/java/com/casic/detector/model/MarkerModel.kt b/app/src/main/java/com/casic/detector/model/MarkerModel.kt deleted file mode 100644 index dab32c3..0000000 --- a/app/src/main/java/com/casic/detector/model/MarkerModel.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.casic.detector.model - -/** - * 上传标识器的数据模型 - * */ -data class MarkerModel(private val id: String, private val imagePath: String) \ No newline at end of file diff --git a/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt index db640cc..43a8484 100644 --- a/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/detector/retrofit/RetrofitService.kt @@ -78,10 +78,10 @@ /** * 上传工单中标识器信息 + * info中的主键 */ @GET("/ems/rs/task/update-task-mark") suspend fun uploadMarker( - @Query("userName") userId: String, @Query("taskDetailId") taskId: String, ): String diff --git a/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt index e0a45c3..8ae0794 100644 --- a/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt @@ -1,6 +1,5 @@ package com.casic.detector.retrofit -import com.casic.detector.model.MarkerModel import com.casic.detector.utils.LocaleConstant import com.google.gson.Gson import com.google.gson.JsonObject @@ -17,7 +16,7 @@ object RetrofitServiceManager { private val gson by lazy { Gson() } - private val typeToken = object : TypeToken>() {}.type + private val typeToken = object : TypeToken>() {}.type private fun createApi(): RetrofitService { val serverIp = SaveKeyValues.getValue(LocaleConstant.SERVER_IP, "") as String @@ -220,8 +219,8 @@ /** * 上传工单中标识器信息 */ - suspend fun uploadMarker(userName: String, taskDetailId: String): String { - return createApi().uploadMarker(userName, taskDetailId) + suspend fun uploadMarker(taskDetailId: String): String { + return createApi().uploadMarker(taskDetailId) } /** @@ -234,7 +233,7 @@ /** * 上传自由巡检过程中发现的标识器 */ - suspend fun uploadTaskMarker(taskId: String, models: List): String { + suspend fun uploadTaskMarker(taskId: String, models: List): String { val param = JsonObject() param.add("markers", gson.toJsonTree(models, typeToken).asJsonArray) val requestBody = param.toString().toRequestBody( diff --git a/app/src/main/java/com/casic/detector/utils/GpioManager.java b/app/src/main/java/com/casic/detector/utils/GpioManager.java index 0f54f1a..6459208 100644 --- a/app/src/main/java/com/casic/detector/utils/GpioManager.java +++ b/app/src/main/java/com/casic/detector/utils/GpioManager.java @@ -1,8 +1,10 @@ package com.casic.detector.utils; -public class GpioManager { +import android.util.Log; +public class GpioManager { + private static final String TAG = "GpioManager"; private static final int MT6761 = 0; private int selected; private final MT6761Gpio mt6761; @@ -38,6 +40,7 @@ * 璁剧疆GPIO杈撳嚭楂� * *********************************************************************/ public void setGpioHigh(String gpio) { + Log.d(TAG, "setGpioHigh: 调高电位"); if (this.getSelected() == MT6761) { mt6761.setCtrlPin(gpio); mt6761.setGpioHigh(); @@ -48,6 +51,7 @@ * 璁剧疆GPIO杈撳嚭浣� * *********************************************************************/ public void setGpioLow(String gpio) { + Log.d(TAG, "setGpioLow: 调低电位"); if (this.getSelected() == MT6761) { mt6761.setCtrlPin(gpio); mt6761.setGpioLow(); diff --git a/app/src/main/java/com/casic/detector/view/LoginActivity.kt b/app/src/main/java/com/casic/detector/view/LoginActivity.kt index 4b8618a..6a0cce9 100644 --- a/app/src/main/java/com/casic/detector/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/detector/view/LoginActivity.kt @@ -4,7 +4,6 @@ import androidx.lifecycle.ViewModelProvider import com.amap.api.navi.NaviSetting import com.casic.detector.databinding.ActivityLoginBinding -import com.casic.detector.utils.GpioManager import com.casic.detector.utils.LoadingDialogHub import com.casic.detector.utils.LocaleConstant import com.casic.detector.vm.UserViewModel @@ -19,10 +18,8 @@ private val kTag = "LoginActivity" private lateinit var userViewModel: UserViewModel - private val gpioManager by lazy { GpioManager() } override fun initOnCreate(savedInstanceState: Bundle?) { - gpioManager.setGpioLow("18") //先把导航隐私政策声明，后面导航会用到 NaviSetting.updatePrivacyShow(this, true, true) NaviSetting.updatePrivacyAgree(this, true) diff --git a/app/src/main/java/com/casic/detector/view/UploadEventActivity.kt b/app/src/main/java/com/casic/detector/view/UploadEventActivity.kt index 41394b0..bef0425 100644 --- a/app/src/main/java/com/casic/detector/view/UploadEventActivity.kt +++ b/app/src/main/java/com/casic/detector/view/UploadEventActivity.kt @@ -162,4 +162,9 @@ } }) } + + override fun onDestroy() { + super.onDestroy() + locationHub.stopLocation() + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/detector/vm/TaskViewModel.kt b/app/src/main/java/com/casic/detector/vm/TaskViewModel.kt index 483cebd..b87e764 100644 --- a/app/src/main/java/com/casic/detector/vm/TaskViewModel.kt +++ b/app/src/main/java/com/casic/detector/vm/TaskViewModel.kt @@ -5,7 +5,6 @@ import com.casic.detector.extensions.getResponseMessage import com.casic.detector.extensions.getResponseState import com.casic.detector.model.MarkerFileModel -import com.casic.detector.model.MarkerModel import com.casic.detector.model.TaskModel import com.casic.detector.retrofit.RetrofitServiceManager import com.casic.detector.utils.DataBaseManager @@ -36,7 +35,7 @@ it.printStackTrace() }) - fun uploadTaskMarker(taskId: String, models: List) = launch({ + fun uploadTaskMarker(taskId: String, models: List) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.uploadTaskMarker(taskId, models) if (response.getResponseState()) { @@ -180,9 +179,9 @@ loadState.value = LoadState.Fail }) - fun uploadMarker(userName: String, taskDetailId: String) = launch({ + fun uploadMarker(taskDetailId: String) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.uploadMarker(userName, taskDetailId) + val response = RetrofitServiceManager.uploadMarker(taskDetailId) if (response.getResponseState()) { loadState.value = LoadState.Success } else { diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 5970be0..ceb1e46 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -94,6 +94,21 @@ android:src="@drawable/ic_aim" /> + +