diff --git a/app/src/main/java/com/casic/detector/common/service/NtripConnectService.kt b/app/src/main/java/com/casic/detector/common/service/NtripConnectService.kt index 5916711..3279043 100644 --- a/app/src/main/java/com/casic/detector/common/service/NtripConnectService.kt +++ b/app/src/main/java/com/casic/detector/common/service/NtripConnectService.kt @@ -9,6 +9,8 @@ import android.os.IBinder import android.os.Message import android.util.Log +import android.view.Gravity +import android.widget.Toast import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.LifecycleRegistry @@ -20,9 +22,8 @@ import com.casic.detector.common.utils.tcp.ConnectState import com.casic.detector.common.utils.tcp.OnSocketConnectListener import com.casic.detector.common.utils.tcp.SocketClient -import com.pengxh.kt.lite.extensions.createLogFile +import com.casic.detector.common.view.MainActivity import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.extensions.writeToFile import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler import io.netty.buffer.Unpooled @@ -70,14 +71,17 @@ } RtkLocationTool.getCurrentLocation(this) { + val weakHandler = MainActivity.weakReferenceHandler ?: return@getCurrentLocation + val message = weakHandler.obtainMessage() + message.what = 2024090301 + message.obj = "${it.longitude},${it.latitude}" + weakHandler.sendMessage(message) + if (connectState == ConnectState.SUCCESS) { //连接成功就发送千寻请求报文 val gga = it.convertToGPGGA() Log.d(kTag, gga) socketClient.sendData(gga) - } else { - //TODO 最好改为可以手动重连 - "千寻定位服务已断开，请重新连接".show(this) } } } @@ -116,8 +120,11 @@ outStream = serialPortService?.getOutputStream() } } else { - "收到千寻数据返回，长度：${data.size}".show(this) - data.contentToString().writeToFile(createLogFile()) + //居中显示 + val toast = Toast.makeText(this, "收到千寻数据，长度：${data.size}", Toast.LENGTH_SHORT) + toast.setGravity(Gravity.CENTER, 0, 0) + toast.show() + outStream?.write(data) outStream?.flush() } diff --git a/app/src/main/java/com/casic/detector/common/service/NtripConnectService.kt b/app/src/main/java/com/casic/detector/common/service/NtripConnectService.kt index 5916711..3279043 100644 --- a/app/src/main/java/com/casic/detector/common/service/NtripConnectService.kt +++ b/app/src/main/java/com/casic/detector/common/service/NtripConnectService.kt @@ -9,6 +9,8 @@ import android.os.IBinder import android.os.Message import android.util.Log +import android.view.Gravity +import android.widget.Toast import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.LifecycleRegistry @@ -20,9 +22,8 @@ import com.casic.detector.common.utils.tcp.ConnectState import com.casic.detector.common.utils.tcp.OnSocketConnectListener import com.casic.detector.common.utils.tcp.SocketClient -import com.pengxh.kt.lite.extensions.createLogFile +import com.casic.detector.common.view.MainActivity import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.extensions.writeToFile import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler import io.netty.buffer.Unpooled @@ -70,14 +71,17 @@ } RtkLocationTool.getCurrentLocation(this) { + val weakHandler = MainActivity.weakReferenceHandler ?: return@getCurrentLocation + val message = weakHandler.obtainMessage() + message.what = 2024090301 + message.obj = "${it.longitude},${it.latitude}" + weakHandler.sendMessage(message) + if (connectState == ConnectState.SUCCESS) { //连接成功就发送千寻请求报文 val gga = it.convertToGPGGA() Log.d(kTag, gga) socketClient.sendData(gga) - } else { - //TODO 最好改为可以手动重连 - "千寻定位服务已断开，请重新连接".show(this) } } } @@ -116,8 +120,11 @@ outStream = serialPortService?.getOutputStream() } } else { - "收到千寻数据返回，长度：${data.size}".show(this) - data.contentToString().writeToFile(createLogFile()) + //居中显示 + val toast = Toast.makeText(this, "收到千寻数据，长度：${data.size}", Toast.LENGTH_SHORT) + toast.setGravity(Gravity.CENTER, 0, 0) + toast.show() + outStream?.write(data) outStream?.flush() } diff --git a/app/src/main/java/com/casic/detector/common/view/LoginActivity.kt b/app/src/main/java/com/casic/detector/common/view/LoginActivity.kt index 1e84dc8..1d38a3e 100644 --- a/app/src/main/java/com/casic/detector/common/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/detector/common/view/LoginActivity.kt @@ -37,6 +37,7 @@ SaveKeyValues.putValue(LocaleConstant.USER_COMPANY_ID, data.companyId) navigatePageTo() +// navigatePageTo() finish() } } diff --git a/app/src/main/java/com/casic/detector/common/service/NtripConnectService.kt b/app/src/main/java/com/casic/detector/common/service/NtripConnectService.kt index 5916711..3279043 100644 --- a/app/src/main/java/com/casic/detector/common/service/NtripConnectService.kt +++ b/app/src/main/java/com/casic/detector/common/service/NtripConnectService.kt @@ -9,6 +9,8 @@ import android.os.IBinder import android.os.Message import android.util.Log +import android.view.Gravity +import android.widget.Toast import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.LifecycleRegistry @@ -20,9 +22,8 @@ import com.casic.detector.common.utils.tcp.ConnectState import com.casic.detector.common.utils.tcp.OnSocketConnectListener import com.casic.detector.common.utils.tcp.SocketClient -import com.pengxh.kt.lite.extensions.createLogFile +import com.casic.detector.common.view.MainActivity import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.extensions.writeToFile import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler import io.netty.buffer.Unpooled @@ -70,14 +71,17 @@ } RtkLocationTool.getCurrentLocation(this) { + val weakHandler = MainActivity.weakReferenceHandler ?: return@getCurrentLocation + val message = weakHandler.obtainMessage() + message.what = 2024090301 + message.obj = "${it.longitude},${it.latitude}" + weakHandler.sendMessage(message) + if (connectState == ConnectState.SUCCESS) { //连接成功就发送千寻请求报文 val gga = it.convertToGPGGA() Log.d(kTag, gga) socketClient.sendData(gga) - } else { - //TODO 最好改为可以手动重连 - "千寻定位服务已断开，请重新连接".show(this) } } } @@ -116,8 +120,11 @@ outStream = serialPortService?.getOutputStream() } } else { - "收到千寻数据返回，长度：${data.size}".show(this) - data.contentToString().writeToFile(createLogFile()) + //居中显示 + val toast = Toast.makeText(this, "收到千寻数据，长度：${data.size}", Toast.LENGTH_SHORT) + toast.setGravity(Gravity.CENTER, 0, 0) + toast.show() + outStream?.write(data) outStream?.flush() } diff --git a/app/src/main/java/com/casic/detector/common/view/LoginActivity.kt b/app/src/main/java/com/casic/detector/common/view/LoginActivity.kt index 1e84dc8..1d38a3e 100644 --- a/app/src/main/java/com/casic/detector/common/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/detector/common/view/LoginActivity.kt @@ -37,6 +37,7 @@ SaveKeyValues.putValue(LocaleConstant.USER_COMPANY_ID, data.companyId) navigatePageTo() +// navigatePageTo() finish() } } diff --git a/app/src/main/java/com/casic/detector/common/view/ObjectDetailActivity.kt b/app/src/main/java/com/casic/detector/common/view/ObjectDetailActivity.kt index fca9df9..846ec25 100644 --- a/app/src/main/java/com/casic/detector/common/view/ObjectDetailActivity.kt +++ b/app/src/main/java/com/casic/detector/common/view/ObjectDetailActivity.kt @@ -8,10 +8,9 @@ import com.casic.detector.common.bean.MarkerLocalBean import com.casic.detector.common.databinding.ActivityObjectDetailBinding import com.casic.detector.common.extensions.appendDownloadUrl +import com.casic.detector.common.utils.DataBaseManager import com.casic.detector.common.utils.FileType import com.casic.detector.common.utils.LocaleConstant -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.getScreenHeight import com.pengxh.kt.lite.extensions.getScreenWidth @@ -23,8 +22,7 @@ class ObjectDetailActivity : KotlinBaseActivity() { private val kTag = "ObjectDetailActivity" - private val context: Context = this@ObjectDetailActivity - private val gson by lazy { Gson() } + private val context: Context = this private lateinit var marker: MarkerLocalBean override fun initViewBinding(): ActivityObjectDetailBinding { @@ -48,10 +46,9 @@ params.height = ((getScreenHeight() * 0.7).toInt()) window.attributes = params - val objectJson = intent.getStringExtra(Constant.INTENT_PARAM)!! + val id = intent.getStringExtra(Constant.INTENT_PARAM)!! try { - marker = gson.fromJson(objectJson, object : TypeToken() {}.type) - + marker = DataBaseManager.get.queryMarkerById(id).first() binding.objectTypeView.text = LocaleConstant.POINT_TYPE_ARRAY[marker.objectType.toInt() - 1] binding.pipelineTypeView.text = marker.pipelineType @@ -70,7 +67,7 @@ binding.personView.text = marker.installationDept binding.installTimeView.text = marker.updateTime binding.remarkView.text = marker.remark - } catch (e: NumberFormatException) { + } catch (e: NoSuchElementException) { e.printStackTrace() } } diff --git a/app/src/main/java/com/casic/detector/common/service/NtripConnectService.kt b/app/src/main/java/com/casic/detector/common/service/NtripConnectService.kt index 5916711..3279043 100644 --- a/app/src/main/java/com/casic/detector/common/service/NtripConnectService.kt +++ b/app/src/main/java/com/casic/detector/common/service/NtripConnectService.kt @@ -9,6 +9,8 @@ import android.os.IBinder import android.os.Message import android.util.Log +import android.view.Gravity +import android.widget.Toast import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.LifecycleRegistry @@ -20,9 +22,8 @@ import com.casic.detector.common.utils.tcp.ConnectState import com.casic.detector.common.utils.tcp.OnSocketConnectListener import com.casic.detector.common.utils.tcp.SocketClient -import com.pengxh.kt.lite.extensions.createLogFile +import com.casic.detector.common.view.MainActivity import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.extensions.writeToFile import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler import io.netty.buffer.Unpooled @@ -70,14 +71,17 @@ } RtkLocationTool.getCurrentLocation(this) { + val weakHandler = MainActivity.weakReferenceHandler ?: return@getCurrentLocation + val message = weakHandler.obtainMessage() + message.what = 2024090301 + message.obj = "${it.longitude},${it.latitude}" + weakHandler.sendMessage(message) + if (connectState == ConnectState.SUCCESS) { //连接成功就发送千寻请求报文 val gga = it.convertToGPGGA() Log.d(kTag, gga) socketClient.sendData(gga) - } else { - //TODO 最好改为可以手动重连 - "千寻定位服务已断开，请重新连接".show(this) } } } @@ -116,8 +120,11 @@ outStream = serialPortService?.getOutputStream() } } else { - "收到千寻数据返回，长度：${data.size}".show(this) - data.contentToString().writeToFile(createLogFile()) + //居中显示 + val toast = Toast.makeText(this, "收到千寻数据，长度：${data.size}", Toast.LENGTH_SHORT) + toast.setGravity(Gravity.CENTER, 0, 0) + toast.show() + outStream?.write(data) outStream?.flush() } diff --git a/app/src/main/java/com/casic/detector/common/view/LoginActivity.kt b/app/src/main/java/com/casic/detector/common/view/LoginActivity.kt index 1e84dc8..1d38a3e 100644 --- a/app/src/main/java/com/casic/detector/common/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/detector/common/view/LoginActivity.kt @@ -37,6 +37,7 @@ SaveKeyValues.putValue(LocaleConstant.USER_COMPANY_ID, data.companyId) navigatePageTo() +// navigatePageTo() finish() } } diff --git a/app/src/main/java/com/casic/detector/common/view/ObjectDetailActivity.kt b/app/src/main/java/com/casic/detector/common/view/ObjectDetailActivity.kt index fca9df9..846ec25 100644 --- a/app/src/main/java/com/casic/detector/common/view/ObjectDetailActivity.kt +++ b/app/src/main/java/com/casic/detector/common/view/ObjectDetailActivity.kt @@ -8,10 +8,9 @@ import com.casic.detector.common.bean.MarkerLocalBean import com.casic.detector.common.databinding.ActivityObjectDetailBinding import com.casic.detector.common.extensions.appendDownloadUrl +import com.casic.detector.common.utils.DataBaseManager import com.casic.detector.common.utils.FileType import com.casic.detector.common.utils.LocaleConstant -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.getScreenHeight import com.pengxh.kt.lite.extensions.getScreenWidth @@ -23,8 +22,7 @@ class ObjectDetailActivity : KotlinBaseActivity() { private val kTag = "ObjectDetailActivity" - private val context: Context = this@ObjectDetailActivity - private val gson by lazy { Gson() } + private val context: Context = this private lateinit var marker: MarkerLocalBean override fun initViewBinding(): ActivityObjectDetailBinding { @@ -48,10 +46,9 @@ params.height = ((getScreenHeight() * 0.7).toInt()) window.attributes = params - val objectJson = intent.getStringExtra(Constant.INTENT_PARAM)!! + val id = intent.getStringExtra(Constant.INTENT_PARAM)!! try { - marker = gson.fromJson(objectJson, object : TypeToken() {}.type) - + marker = DataBaseManager.get.queryMarkerById(id).first() binding.objectTypeView.text = LocaleConstant.POINT_TYPE_ARRAY[marker.objectType.toInt() - 1] binding.pipelineTypeView.text = marker.pipelineType @@ -70,7 +67,7 @@ binding.personView.text = marker.installationDept binding.installTimeView.text = marker.updateTime binding.remarkView.text = marker.remark - } catch (e: NumberFormatException) { + } catch (e: NoSuchElementException) { e.printStackTrace() } } diff --git a/app/src/main/java/com/casic/detector/common/view/SearchMarkerActivity.kt b/app/src/main/java/com/casic/detector/common/view/SearchMarkerActivity.kt index 8b46830..211fc9f 100644 --- a/app/src/main/java/com/casic/detector/common/view/SearchMarkerActivity.kt +++ b/app/src/main/java/com/casic/detector/common/view/SearchMarkerActivity.kt @@ -41,7 +41,6 @@ import com.pengxh.kt.lite.extensions.getSystemService import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues @@ -235,7 +234,7 @@ //查库 val result = DataBaseManager.get.queryMarkerById(id) if (result.isNotEmpty()) { - navigatePageTo(result.first().toJson()) + navigatePageTo(id) } else { navigatePageTo(id) } diff --git a/app/src/main/java/com/casic/detector/common/service/NtripConnectService.kt b/app/src/main/java/com/casic/detector/common/service/NtripConnectService.kt index 5916711..3279043 100644 --- a/app/src/main/java/com/casic/detector/common/service/NtripConnectService.kt +++ b/app/src/main/java/com/casic/detector/common/service/NtripConnectService.kt @@ -9,6 +9,8 @@ import android.os.IBinder import android.os.Message import android.util.Log +import android.view.Gravity +import android.widget.Toast import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.LifecycleRegistry @@ -20,9 +22,8 @@ import com.casic.detector.common.utils.tcp.ConnectState import com.casic.detector.common.utils.tcp.OnSocketConnectListener import com.casic.detector.common.utils.tcp.SocketClient -import com.pengxh.kt.lite.extensions.createLogFile +import com.casic.detector.common.view.MainActivity import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.extensions.writeToFile import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler import io.netty.buffer.Unpooled @@ -70,14 +71,17 @@ } RtkLocationTool.getCurrentLocation(this) { + val weakHandler = MainActivity.weakReferenceHandler ?: return@getCurrentLocation + val message = weakHandler.obtainMessage() + message.what = 2024090301 + message.obj = "${it.longitude},${it.latitude}" + weakHandler.sendMessage(message) + if (connectState == ConnectState.SUCCESS) { //连接成功就发送千寻请求报文 val gga = it.convertToGPGGA() Log.d(kTag, gga) socketClient.sendData(gga) - } else { - //TODO 最好改为可以手动重连 - "千寻定位服务已断开，请重新连接".show(this) } } } @@ -116,8 +120,11 @@ outStream = serialPortService?.getOutputStream() } } else { - "收到千寻数据返回，长度：${data.size}".show(this) - data.contentToString().writeToFile(createLogFile()) + //居中显示 + val toast = Toast.makeText(this, "收到千寻数据，长度：${data.size}", Toast.LENGTH_SHORT) + toast.setGravity(Gravity.CENTER, 0, 0) + toast.show() + outStream?.write(data) outStream?.flush() } diff --git a/app/src/main/java/com/casic/detector/common/view/LoginActivity.kt b/app/src/main/java/com/casic/detector/common/view/LoginActivity.kt index 1e84dc8..1d38a3e 100644 --- a/app/src/main/java/com/casic/detector/common/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/detector/common/view/LoginActivity.kt @@ -37,6 +37,7 @@ SaveKeyValues.putValue(LocaleConstant.USER_COMPANY_ID, data.companyId) navigatePageTo() +// navigatePageTo() finish() } } diff --git a/app/src/main/java/com/casic/detector/common/view/ObjectDetailActivity.kt b/app/src/main/java/com/casic/detector/common/view/ObjectDetailActivity.kt index fca9df9..846ec25 100644 --- a/app/src/main/java/com/casic/detector/common/view/ObjectDetailActivity.kt +++ b/app/src/main/java/com/casic/detector/common/view/ObjectDetailActivity.kt @@ -8,10 +8,9 @@ import com.casic.detector.common.bean.MarkerLocalBean import com.casic.detector.common.databinding.ActivityObjectDetailBinding import com.casic.detector.common.extensions.appendDownloadUrl +import com.casic.detector.common.utils.DataBaseManager import com.casic.detector.common.utils.FileType import com.casic.detector.common.utils.LocaleConstant -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.getScreenHeight import com.pengxh.kt.lite.extensions.getScreenWidth @@ -23,8 +22,7 @@ class ObjectDetailActivity : KotlinBaseActivity() { private val kTag = "ObjectDetailActivity" - private val context: Context = this@ObjectDetailActivity - private val gson by lazy { Gson() } + private val context: Context = this private lateinit var marker: MarkerLocalBean override fun initViewBinding(): ActivityObjectDetailBinding { @@ -48,10 +46,9 @@ params.height = ((getScreenHeight() * 0.7).toInt()) window.attributes = params - val objectJson = intent.getStringExtra(Constant.INTENT_PARAM)!! + val id = intent.getStringExtra(Constant.INTENT_PARAM)!! try { - marker = gson.fromJson(objectJson, object : TypeToken() {}.type) - + marker = DataBaseManager.get.queryMarkerById(id).first() binding.objectTypeView.text = LocaleConstant.POINT_TYPE_ARRAY[marker.objectType.toInt() - 1] binding.pipelineTypeView.text = marker.pipelineType @@ -70,7 +67,7 @@ binding.personView.text = marker.installationDept binding.installTimeView.text = marker.updateTime binding.remarkView.text = marker.remark - } catch (e: NumberFormatException) { + } catch (e: NoSuchElementException) { e.printStackTrace() } } diff --git a/app/src/main/java/com/casic/detector/common/view/SearchMarkerActivity.kt b/app/src/main/java/com/casic/detector/common/view/SearchMarkerActivity.kt index 8b46830..211fc9f 100644 --- a/app/src/main/java/com/casic/detector/common/view/SearchMarkerActivity.kt +++ b/app/src/main/java/com/casic/detector/common/view/SearchMarkerActivity.kt @@ -41,7 +41,6 @@ import com.pengxh.kt.lite.extensions.getSystemService import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues @@ -235,7 +234,7 @@ //查库 val result = DataBaseManager.get.queryMarkerById(id) if (result.isNotEmpty()) { - navigatePageTo(result.first().toJson()) + navigatePageTo(id) } else { navigatePageTo(id) } diff --git a/app/src/main/java/com/casic/detector/common/view/SearchMarkerAuditActivity.kt b/app/src/main/java/com/casic/detector/common/view/SearchMarkerAuditActivity.kt index 5131efa..44f4520 100644 --- a/app/src/main/java/com/casic/detector/common/view/SearchMarkerAuditActivity.kt +++ b/app/src/main/java/com/casic/detector/common/view/SearchMarkerAuditActivity.kt @@ -21,7 +21,6 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.getSystemService import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.extensions.toJson import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext @@ -70,7 +69,7 @@ //查库 val result = DataBaseManager.get.queryMarkerById(nearestMarkerId) if (result.isNotEmpty()) { - navigatePageTo(result.first().toJson()) + navigatePageTo(nearestMarkerId) } else { navigatePageTo(nearestMarkerId) } diff --git a/app/src/main/java/com/casic/detector/common/service/NtripConnectService.kt b/app/src/main/java/com/casic/detector/common/service/NtripConnectService.kt index 5916711..3279043 100644 --- a/app/src/main/java/com/casic/detector/common/service/NtripConnectService.kt +++ b/app/src/main/java/com/casic/detector/common/service/NtripConnectService.kt @@ -9,6 +9,8 @@ import android.os.IBinder import android.os.Message import android.util.Log +import android.view.Gravity +import android.widget.Toast import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.LifecycleRegistry @@ -20,9 +22,8 @@ import com.casic.detector.common.utils.tcp.ConnectState import com.casic.detector.common.utils.tcp.OnSocketConnectListener import com.casic.detector.common.utils.tcp.SocketClient -import com.pengxh.kt.lite.extensions.createLogFile +import com.casic.detector.common.view.MainActivity import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.extensions.writeToFile import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler import io.netty.buffer.Unpooled @@ -70,14 +71,17 @@ } RtkLocationTool.getCurrentLocation(this) { + val weakHandler = MainActivity.weakReferenceHandler ?: return@getCurrentLocation + val message = weakHandler.obtainMessage() + message.what = 2024090301 + message.obj = "${it.longitude},${it.latitude}" + weakHandler.sendMessage(message) + if (connectState == ConnectState.SUCCESS) { //连接成功就发送千寻请求报文 val gga = it.convertToGPGGA() Log.d(kTag, gga) socketClient.sendData(gga) - } else { - //TODO 最好改为可以手动重连 - "千寻定位服务已断开，请重新连接".show(this) } } } @@ -116,8 +120,11 @@ outStream = serialPortService?.getOutputStream() } } else { - "收到千寻数据返回，长度：${data.size}".show(this) - data.contentToString().writeToFile(createLogFile()) + //居中显示 + val toast = Toast.makeText(this, "收到千寻数据，长度：${data.size}", Toast.LENGTH_SHORT) + toast.setGravity(Gravity.CENTER, 0, 0) + toast.show() + outStream?.write(data) outStream?.flush() } diff --git a/app/src/main/java/com/casic/detector/common/view/LoginActivity.kt b/app/src/main/java/com/casic/detector/common/view/LoginActivity.kt index 1e84dc8..1d38a3e 100644 --- a/app/src/main/java/com/casic/detector/common/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/detector/common/view/LoginActivity.kt @@ -37,6 +37,7 @@ SaveKeyValues.putValue(LocaleConstant.USER_COMPANY_ID, data.companyId) navigatePageTo() +// navigatePageTo() finish() } } diff --git a/app/src/main/java/com/casic/detector/common/view/ObjectDetailActivity.kt b/app/src/main/java/com/casic/detector/common/view/ObjectDetailActivity.kt index fca9df9..846ec25 100644 --- a/app/src/main/java/com/casic/detector/common/view/ObjectDetailActivity.kt +++ b/app/src/main/java/com/casic/detector/common/view/ObjectDetailActivity.kt @@ -8,10 +8,9 @@ import com.casic.detector.common.bean.MarkerLocalBean import com.casic.detector.common.databinding.ActivityObjectDetailBinding import com.casic.detector.common.extensions.appendDownloadUrl +import com.casic.detector.common.utils.DataBaseManager import com.casic.detector.common.utils.FileType import com.casic.detector.common.utils.LocaleConstant -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.getScreenHeight import com.pengxh.kt.lite.extensions.getScreenWidth @@ -23,8 +22,7 @@ class ObjectDetailActivity : KotlinBaseActivity() { private val kTag = "ObjectDetailActivity" - private val context: Context = this@ObjectDetailActivity - private val gson by lazy { Gson() } + private val context: Context = this private lateinit var marker: MarkerLocalBean override fun initViewBinding(): ActivityObjectDetailBinding { @@ -48,10 +46,9 @@ params.height = ((getScreenHeight() * 0.7).toInt()) window.attributes = params - val objectJson = intent.getStringExtra(Constant.INTENT_PARAM)!! + val id = intent.getStringExtra(Constant.INTENT_PARAM)!! try { - marker = gson.fromJson(objectJson, object : TypeToken() {}.type) - + marker = DataBaseManager.get.queryMarkerById(id).first() binding.objectTypeView.text = LocaleConstant.POINT_TYPE_ARRAY[marker.objectType.toInt() - 1] binding.pipelineTypeView.text = marker.pipelineType @@ -70,7 +67,7 @@ binding.personView.text = marker.installationDept binding.installTimeView.text = marker.updateTime binding.remarkView.text = marker.remark - } catch (e: NumberFormatException) { + } catch (e: NoSuchElementException) { e.printStackTrace() } } diff --git a/app/src/main/java/com/casic/detector/common/view/SearchMarkerActivity.kt b/app/src/main/java/com/casic/detector/common/view/SearchMarkerActivity.kt index 8b46830..211fc9f 100644 --- a/app/src/main/java/com/casic/detector/common/view/SearchMarkerActivity.kt +++ b/app/src/main/java/com/casic/detector/common/view/SearchMarkerActivity.kt @@ -41,7 +41,6 @@ import com.pengxh.kt.lite.extensions.getSystemService import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues @@ -235,7 +234,7 @@ //查库 val result = DataBaseManager.get.queryMarkerById(id) if (result.isNotEmpty()) { - navigatePageTo(result.first().toJson()) + navigatePageTo(id) } else { navigatePageTo(id) } diff --git a/app/src/main/java/com/casic/detector/common/view/SearchMarkerAuditActivity.kt b/app/src/main/java/com/casic/detector/common/view/SearchMarkerAuditActivity.kt index 5131efa..44f4520 100644 --- a/app/src/main/java/com/casic/detector/common/view/SearchMarkerAuditActivity.kt +++ b/app/src/main/java/com/casic/detector/common/view/SearchMarkerAuditActivity.kt @@ -21,7 +21,6 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.getSystemService import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.extensions.toJson import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext @@ -70,7 +69,7 @@ //查库 val result = DataBaseManager.get.queryMarkerById(nearestMarkerId) if (result.isNotEmpty()) { - navigatePageTo(result.first().toJson()) + navigatePageTo(nearestMarkerId) } else { navigatePageTo(nearestMarkerId) } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 2450221..419cc49 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -99,7 +99,6 @@ app:iconPadding="0dp" app:iconTint="@color/white" /> - + + + android:layout_height="wrap_content"> @@ -159,12 +160,13 @@ android:id="@+id/currentLocationView" android:layout_width="0dp" android:layout_height="match_parent" + android:layout_marginHorizontal="@dimen/dp_3" android:layout_weight="1" android:background="@color/themeOpacityColor" - android:padding="@dimen/dp_3" + android:gravity="center_vertical" android:singleLine="true" android:text="@string/app_name" - android:textColor="@color/black" /> + android:textColor="@color/white" />