diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/RSAUtils.kt b/app/src/main/java/com/casic/birmm/inspect/utils/RSAUtils.kt index b93983b..f1cef07 100644 --- a/app/src/main/java/com/casic/birmm/inspect/utils/RSAUtils.kt +++ b/app/src/main/java/com/casic/birmm/inspect/utils/RSAUtils.kt @@ -14,12 +14,12 @@ */ object RSAUtils { //构建Cipher实例时所传入的的字符串,默认为"RSA/NONE/PKCS1Padding" - private fun processData(srcData: ByteArray, key: Key, mode: Int): ByteArray? { //用来保存处理结果 + private fun processData(srcData: ByteArray, key: Key): ByteArray? { //用来保存处理结果 var resultBytes: ByteArray? = null try { //获取Cipher实例 val cipher = Cipher.getInstance("RSA/None/PKCS1Padding") //初始化Cipher,mode指定是加密还是解密,key为公钥或私钥 - cipher.init(mode, key) + cipher.init(Cipher.ENCRYPT_MODE, key) //处理数据 resultBytes = cipher.doFinal(srcData) } catch (e: NoSuchAlgorithmException) { @@ -38,7 +38,7 @@ fun encryptDataByPublicKey(srcData: ByteArray, publicKey: PublicKey): String { val resultBytes = - processData(srcData, publicKey, Cipher.ENCRYPT_MODE) + processData(srcData, publicKey) return Base64.encodeToString(resultBytes, Base64.DEFAULT) } diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/RSAUtils.kt b/app/src/main/java/com/casic/birmm/inspect/utils/RSAUtils.kt index b93983b..f1cef07 100644 --- a/app/src/main/java/com/casic/birmm/inspect/utils/RSAUtils.kt +++ b/app/src/main/java/com/casic/birmm/inspect/utils/RSAUtils.kt @@ -14,12 +14,12 @@ */ object RSAUtils { //构建Cipher实例时所传入的的字符串,默认为"RSA/NONE/PKCS1Padding" - private fun processData(srcData: ByteArray, key: Key, mode: Int): ByteArray? { //用来保存处理结果 + private fun processData(srcData: ByteArray, key: Key): ByteArray? { //用来保存处理结果 var resultBytes: ByteArray? = null try { //获取Cipher实例 val cipher = Cipher.getInstance("RSA/None/PKCS1Padding") //初始化Cipher,mode指定是加密还是解密,key为公钥或私钥 - cipher.init(mode, key) + cipher.init(Cipher.ENCRYPT_MODE, key) //处理数据 resultBytes = cipher.doFinal(srcData) } catch (e: NoSuchAlgorithmException) { @@ -38,7 +38,7 @@ fun encryptDataByPublicKey(srcData: ByteArray, publicKey: PublicKey): String { val resultBytes = - processData(srcData, publicKey, Cipher.ENCRYPT_MODE) + processData(srcData, publicKey) return Base64.encodeToString(resultBytes, Base64.DEFAULT) } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/GuideActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/GuideActivity.kt index a5578c3..1587c84 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/GuideActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/GuideActivity.kt @@ -43,6 +43,7 @@ override fun initEvent() { countDownTimer.start() + skipButton.setChangeAlphaWhenPress(true) skipButton.setOnClickListener { countDownTimer.cancel() startLoginActivity() diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/RSAUtils.kt b/app/src/main/java/com/casic/birmm/inspect/utils/RSAUtils.kt index b93983b..f1cef07 100644 --- a/app/src/main/java/com/casic/birmm/inspect/utils/RSAUtils.kt +++ b/app/src/main/java/com/casic/birmm/inspect/utils/RSAUtils.kt @@ -14,12 +14,12 @@ */ object RSAUtils { //构建Cipher实例时所传入的的字符串,默认为"RSA/NONE/PKCS1Padding" - private fun processData(srcData: ByteArray, key: Key, mode: Int): ByteArray? { //用来保存处理结果 + private fun processData(srcData: ByteArray, key: Key): ByteArray? { //用来保存处理结果 var resultBytes: ByteArray? = null try { //获取Cipher实例 val cipher = Cipher.getInstance("RSA/None/PKCS1Padding") //初始化Cipher,mode指定是加密还是解密,key为公钥或私钥 - cipher.init(mode, key) + cipher.init(Cipher.ENCRYPT_MODE, key) //处理数据 resultBytes = cipher.doFinal(srcData) } catch (e: NoSuchAlgorithmException) { @@ -38,7 +38,7 @@ fun encryptDataByPublicKey(srcData: ByteArray, publicKey: PublicKey): String { val resultBytes = - processData(srcData, publicKey, Cipher.ENCRYPT_MODE) + processData(srcData, publicKey) return Base64.encodeToString(resultBytes, Base64.DEFAULT) } diff --git a/app/src/main/java/com/casic/birmm/inspect/view/GuideActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/GuideActivity.kt index a5578c3..1587c84 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/GuideActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/GuideActivity.kt @@ -43,6 +43,7 @@ override fun initEvent() { countDownTimer.start() + skipButton.setChangeAlphaWhenPress(true) skipButton.setOnClickListener { countDownTimer.cancel() startLoginActivity() diff --git a/app/src/main/java/com/casic/birmm/inspect/widgets/InputDialog.kt b/app/src/main/java/com/casic/birmm/inspect/widgets/InputDialog.kt index 04db86b..278e72b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/widgets/InputDialog.kt +++ b/app/src/main/java/com/casic/birmm/inspect/widgets/InputDialog.kt @@ -65,7 +65,7 @@ window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) window?.decorView?.setBackgroundColor(Color.TRANSPARENT) val params: WindowManager.LayoutParams? = window?.attributes - params?.width = QMUIDisplayHelper.dp2px(ctx, 300) + params?.width = QMUIDisplayHelper.dp2px(ctx, 280) params?.height = WindowManager.LayoutParams.WRAP_CONTENT window?.attributes = params }