diff --git a/app/src/main/java/com/casic/br/ktd/netty/tcp/SocketManager.kt b/app/src/main/java/com/casic/br/ktd/netty/tcp/SocketManager.kt index faf8599..0ff1480 100644 --- a/app/src/main/java/com/casic/br/ktd/netty/tcp/SocketManager.kt +++ b/app/src/main/java/com/casic/br/ktd/netty/tcp/SocketManager.kt @@ -88,12 +88,6 @@ message.obj = dataModel InspectionActivity.weakReferenceHandler.sendMessage(message) } - -// val dataModel = SensorDataModel((0..1500).random(), "激光未打开", 0, 0.0, 0.0) -// val message = InspectionActivity.weakReferenceHandler.obtainMessage() -// message.what = LocaleConstant.UPDATE_DATA_MESSAGE_CODE -// message.obj = dataModel -// InspectionActivity.weakReferenceHandler.sendMessage(message) } override fun onServiceStatusConnectChanged(statusCode: Byte) { diff --git a/app/src/main/java/com/casic/br/ktd/netty/tcp/SocketManager.kt b/app/src/main/java/com/casic/br/ktd/netty/tcp/SocketManager.kt index faf8599..0ff1480 100644 --- a/app/src/main/java/com/casic/br/ktd/netty/tcp/SocketManager.kt +++ b/app/src/main/java/com/casic/br/ktd/netty/tcp/SocketManager.kt @@ -88,12 +88,6 @@ message.obj = dataModel InspectionActivity.weakReferenceHandler.sendMessage(message) } - -// val dataModel = SensorDataModel((0..1500).random(), "激光未打开", 0, 0.0, 0.0) -// val message = InspectionActivity.weakReferenceHandler.obtainMessage() -// message.what = LocaleConstant.UPDATE_DATA_MESSAGE_CODE -// message.obj = dataModel -// InspectionActivity.weakReferenceHandler.sendMessage(message) } override fun onServiceStatusConnectChanged(statusCode: Byte) { diff --git a/app/src/main/java/com/casic/br/ktd/utils/RSAUtils.kt b/app/src/main/java/com/casic/br/ktd/utils/RSAUtils.kt index 0576f31..ef9821b 100644 --- a/app/src/main/java/com/casic/br/ktd/utils/RSAUtils.kt +++ b/app/src/main/java/com/casic/br/ktd/utils/RSAUtils.kt @@ -1,7 +1,11 @@ package com.casic.br.ktd.utils import android.util.Base64 -import java.security.* +import java.security.InvalidKeyException +import java.security.Key +import java.security.KeyFactory +import java.security.NoSuchAlgorithmException +import java.security.PublicKey import java.security.spec.InvalidKeySpecException import java.security.spec.X509EncodedKeySpec import javax.crypto.BadPaddingException @@ -34,17 +38,14 @@ } fun encryptDataByPublicKey(srcData: ByteArray, publicKey: PublicKey): String { - val resultBytes = - processData(srcData, publicKey) + val resultBytes = processData(srcData, publicKey) return Base64.encodeToString(resultBytes, Base64.DEFAULT) } fun keyStrToPublicKey(publicKeyStr: String?): PublicKey? { var publicKey: PublicKey? = null - val keyBytes = - Base64.decode(publicKeyStr, Base64.DEFAULT) - val keySpec = - X509EncodedKeySpec(keyBytes) + val keyBytes = Base64.decode(publicKeyStr, Base64.DEFAULT) + val keySpec = X509EncodedKeySpec(keyBytes) try { val keyFactory = KeyFactory.getInstance("RSA") publicKey = keyFactory.generatePublic(keySpec)