diff --git a/.gitignore b/.gitignore index 5a35d83..f35583f 100644 --- a/.gitignore +++ b/.gitignore @@ -19,5 +19,6 @@ local.properties /app/build +/app/old /app/release *.zip \ No newline at end of file diff --git a/.gitignore b/.gitignore index 5a35d83..f35583f 100644 --- a/.gitignore +++ b/.gitignore @@ -19,5 +19,6 @@ local.properties /app/build +/app/old /app/release *.zip \ No newline at end of file diff --git a/app/src/main/java/com/casic/detector/common/view/MainActivity.kt b/app/src/main/java/com/casic/detector/common/view/MainActivity.kt index 6d8a187..8262bd5 100644 --- a/app/src/main/java/com/casic/detector/common/view/MainActivity.kt +++ b/app/src/main/java/com/casic/detector/common/view/MainActivity.kt @@ -124,7 +124,6 @@ import java.util.TimerTask import kotlin.math.atan2 - class MainActivity : SerialPortActivity(), SensorEventListener, OnSocketConnectListener, Handler.Callback { @@ -188,6 +187,8 @@ //保留小数2位 decimalFormat.roundingMode = RoundingMode.HALF_UP +// gpioManager.setGpioHigh("18") + RtkLocationTool.getCurrentLocation(this) { if (connectState == ConnectState.SUCCESS) { //连接成功就发送千寻请求报文 @@ -272,7 +273,6 @@ bean.isFreeTask = "1" DataBaseManager.get.saveTaskInLocale(bean) } - taskViewModel.uploadTaskMarkerResult.observe(this) { "自由巡检任务已完成".show(this) ids.clear() @@ -280,7 +280,6 @@ aMap.clear() showLabelsOnMap() } - taskViewModel.executeTaskResult.observe(this) { "工单任务已完成".show(this) aMap.clear() @@ -1047,6 +1046,8 @@ } } else { Log.d(kTag, data.contentToString()) +// out.write(data) +// out.flush() } }