fix:合并代码

app/src/main/java/com/xinbida/wukongdemo/ConversationActivity.kt

@@ -3,6 +3,7 @@ package com.xinbida.wukongdemo
 import android.content.Intent
 import android.os.Bundle
 import android.util.Log
+import android.widget.Button
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.AppCompatImageView
@@ -41,6 +42,12 @@ class ConversationActivity : AppCompatActivity() {
     }
 
     private fun initListener() {
+        findViewById<Button>(R.id.disConn).setOnClickListener{
+            WKIM.getInstance().connectionManager.disconnect(false)
+        }
+        findViewById<Button>(R.id.conn).setOnClickListener{
+            WKIM.getInstance().connectionManager.connection()
+        }
         // 监听连接状态
         WKIM.getInstance().connectionManager.addOnConnectionStatusListener(
             "conv"

app/src/main/res/layout/act_conv_layout.xml

@@ -35,4 +35,15 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1" />
+    <Button
+        android:id="@+id/disConn"
+        android:text="断开"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <Button
+        android:id="@+id/conn"
+        android:text="连接"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
 </LinearLayout>

wkim/src/main/java/com/xinbida/wukongim/utils/CryptoUtils.java

@@ -102,8 +102,8 @@ public class CryptoUtils {
         } catch (NoSuchAlgorithmException | NoSuchPaddingException | InvalidKeyException |
                  InvalidAlgorithmParameterException | IllegalBlockSizeException |
                  BadPaddingException e) {
-            WKLoggerUtils.getInstance().e(TAG,"aesEncrypt encrypt error");
+           WKLoggerUtils.getInstance().e(TAG,"aesEncrypt encrypt error");
-            return null;
+           return null;
         }
         if (encrypted == null) {
             WKLoggerUtils.getInstance().e(TAG, "aesEncrypt The encrypted data is empty");