diff --git a/app/src/main/java/com/casic/detector/common/extensions/String.kt b/app/src/main/java/com/casic/detector/common/extensions/String.kt index c6d8862..4b058ec 100644 --- a/app/src/main/java/com/casic/detector/common/extensions/String.kt +++ b/app/src/main/java/com/casic/detector/common/extensions/String.kt @@ -142,7 +142,7 @@ fun String.calculateCheckDigit(): String { var checksum = 0 for (i in 1 until this.length - 3) { - checksum = checksum xor this[i].toInt() + checksum = checksum xor this[i].code } val hexChecksum = checksum.toString(16).uppercase(Locale.getDefault()) diff --git a/app/src/main/java/com/casic/detector/common/extensions/String.kt b/app/src/main/java/com/casic/detector/common/extensions/String.kt index c6d8862..4b058ec 100644 --- a/app/src/main/java/com/casic/detector/common/extensions/String.kt +++ b/app/src/main/java/com/casic/detector/common/extensions/String.kt @@ -142,7 +142,7 @@ fun String.calculateCheckDigit(): String { var checksum = 0 for (i in 1 until this.length - 3) { - checksum = checksum xor this[i].toInt() + checksum = checksum xor this[i].code } val hexChecksum = checksum.toString(16).uppercase(Locale.getDefault()) 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 4b09b42..5916711 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 @@ -113,7 +113,7 @@ if (result.contains("ICY 200 OK")) { "高精度定位服务连接成功".show(this) //连接服务即打开串口 - this.outStream = serialPortService?.getOutputStream() + outStream = serialPortService?.getOutputStream() } } else { "收到千寻数据返回,长度:${data.size}".show(this) @@ -135,11 +135,16 @@ val byteArray = "$account:$pwd".toByteArray() val base64 = android.util.Base64.encodeToString(byteArray, android.util.Base64.DEFAULT) - val msg = NtripAuthorizationCreator().append("GET /RTCM32_GGB HTTP/1.1") - .append("Host: ${LocaleConstant.QX_RTK_HOST}").append("Ntrip-Version: Ntrip/2.0") - .append("User-Agent: NTRIP GNSSInternetRadio 2.0.10").append("Accept: */*") - .append("Connection: close").append("Accept:*/*") - .append("Authorization: Basic $base64").toString() + val msg = NtripAuthorizationCreator() + .append("GET /RTCM32_GGB HTTP/1.1") + .append("Host: ${LocaleConstant.QX_RTK_HOST}") + .append("Ntrip-Version: Ntrip/2.0") + .append("User-Agent: NTRIP GNSSInternetRadio 2.0.10") + .append("Accept: */*") + .append("Connection: close") + .append("Accept:*/*") + .append("Authorization: Basic $base64") + .toString() val byteBuf = Unpooled.wrappedBuffer(msg.toByteArray()) socketClient.sendData(byteBuf) @@ -155,8 +160,12 @@ LocaleConstant.RTK_PORT, "8003" ) as String - socketClient = SocketClient.Builder().setHostname(remoteHost).setPort(remotePort.toInt()) - .setTimeout(5000).setOnSocketListener(this).build() + socketClient = SocketClient.Builder() + .setHostname(remoteHost) + .setPort(remotePort.toInt()) + .setTimeout(5000) + .setOnSocketListener(this) + .build() socketClient.connect() }