修改客户端底部表情列表显示方式。

lilongweidev · Aug 29, 2022 · 4d0ae41 · 4d0ae41
1 parent b1c37fe
commit 4d0ae41
Show file tree

Hide file tree

Showing 16 changed files with 179 additions and 177 deletions.
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -18,15 +18,7 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.SocketDemo"
         tools:targetApi="31">
-        <activity
-            android:name=".ui.TestActivity"
-            android:exported="true">
-<!--            <intent-filter>-->
-<!--                <action android:name="android.intent.action.MAIN" />-->
 
-<!--                <category android:name="android.intent.category.LAUNCHER" />-->
-<!--            </intent-filter>-->
-        </activity>
         <activity
             android:name=".ui.ClientActivity"
             android:exported="false"

diff --git a/app/src/main/java/com/llw/socket/SocketApp.kt b/app/src/main/java/com/llw/socket/SocketApp.kt
@@ -5,11 +5,9 @@ import android.app.Application
 import android.util.Log
 import androidx.annotation.Nullable
 import androidx.emoji2.bundled.BundledEmojiCompatConfig
-import androidx.emoji2.text.DefaultEmojiCompatConfig
 import androidx.emoji2.text.EmojiCompat
 import androidx.emoji2.text.EmojiCompat.InitCallback
 import java.io.BufferedReader
-import java.io.File
 import java.io.InputStreamReader
 import kotlin.properties.Delegates
 

diff --git a/app/src/main/java/com/llw/socket/adapter/MsgAdapter.kt b/app/src/main/java/com/llw/socket/adapter/MsgAdapter.kt
@@ -7,6 +7,9 @@ import androidx.recyclerview.widget.RecyclerView
 import com.llw.socket.bean.Message
 import com.llw.socket.databinding.ItemRvMsgBinding
 
+/**
+ * 消息适配器
+ */
 class MsgAdapter(private val messages: ArrayList<Message>) :
     RecyclerView.Adapter<MsgAdapter.ViewHolder>() {
 

diff --git a/app/src/main/java/com/llw/socket/ui/BaseActivity.kt b/app/src/main/java/com/llw/socket/ui/BaseActivity.kt
@@ -3,6 +3,7 @@ package com.llw.socket.ui
 import android.content.Context
 import android.content.Intent
 import android.net.wifi.WifiManager
+import android.os.Looper
 import android.view.LayoutInflater
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
@@ -29,7 +30,8 @@ open class BaseActivity: AppCompatActivity() {
     /**
      * 显示Toast
      */
-    protected fun showMsg(msg: CharSequence?) = Toast.makeText(this, msg, Toast.LENGTH_SHORT).show()
+    protected fun showMsg(msg: CharSequence?) =
+        Toast.makeText(this, msg, Toast.LENGTH_SHORT).show()
 
     /**
      * 跳转页面

diff --git a/app/src/main/java/com/llw/socket/ui/ClientActivity.kt b/app/src/main/java/com/llw/socket/ui/ClientActivity.kt
@@ -1,11 +1,18 @@
 package com.llw.socket.ui
 
 import android.os.Bundle
+import android.os.Looper
 import android.util.Log
 import android.view.LayoutInflater
+import android.widget.LinearLayout
 import androidx.appcompat.app.AlertDialog
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
+import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.llw.socket.R
+import com.llw.socket.SocketApp
+import com.llw.socket.adapter.EmojiAdapter
 import com.llw.socket.adapter.MsgAdapter
 import com.llw.socket.bean.Message
 import com.llw.socket.client.ClientCallback
@@ -31,6 +38,11 @@ class ClientActivity : BaseActivity(), ClientCallback, EmojiCallback {
     //消息适配器
     private lateinit var msgAdapter: MsgAdapter
 
+    //是否显示表情
+    private var isShowEmoji = false
+
+    private var bottomSheetBehavior: BottomSheetBehavior<LinearLayout>? = null
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityClientBinding.inflate(layoutInflater)
@@ -42,11 +54,8 @@ class ClientActivity : BaseActivity(), ClientCallback, EmojiCallback {
     private fun initView() {
         binding.toolbar.setNavigationOnClickListener { onBackPressed() }
 
-        //显示emoji
-        binding.ivEmoji.setOnClickListener {
-            //显示底部弹窗
-            showEmojiDialog(this, this)
-        }
+        //初始化BottomSheet
+        initBottomSheet()
 
         //连接服务/断开连接 客户端处理
         binding.tvConnectService.setOnClickListener {
@@ -60,8 +69,8 @@ class ClientActivity : BaseActivity(), ClientCallback, EmojiCallback {
             binding.tvConnectService.text = if (connectSocket) "关闭连接" else "连接服务"
         }
         //发送消息给服务端
-        binding.btnSendMsg.setOnClickListener {
-            val msg = binding.etMsg.text.toString().trim()
+        binding.layBottomSheetEdit.btnSendMsg.setOnClickListener {
+            val msg = binding.layBottomSheetEdit.etMsg.text.toString().trim()
             if (msg.isEmpty()) {
                 showMsg("请输入要发送的信息");return@setOnClickListener
             }
@@ -71,7 +80,7 @@ class ClientActivity : BaseActivity(), ClientCallback, EmojiCallback {
                 showMsg("当前未开启服务或连接服务");return@setOnClickListener
             }
             SocketClient.sendToServer(msg)
-            binding.etMsg.setText("")
+            binding.layBottomSheetEdit.etMsg.setText("")
             updateList(2, msg)
         }
         //初始化列表
@@ -82,6 +91,39 @@ class ClientActivity : BaseActivity(), ClientCallback, EmojiCallback {
         }
     }
 
+    private fun initBottomSheet() {
+        //Emoji布局
+        bottomSheetBehavior =
+            BottomSheetBehavior.from(binding.layBottomSheetEdit.bottomSheet).apply {
+                state = BottomSheetBehavior.STATE_HIDDEN
+                isHideable = false
+                isDraggable = false
+            }
+        binding.layBottomSheetEdit.rvEmoji.apply {
+            layoutManager = GridLayoutManager(context, 6)
+            adapter = EmojiAdapter(SocketApp.instance().emojiList).apply {
+                setOnItemClickListener(object : EmojiAdapter.OnClickListener {
+                    override fun onItemClick(position: Int) {
+                        val charSequence = SocketApp.instance().emojiList[position]
+                        checkedEmoji(charSequence)
+                    }
+                })
+            }
+        }
+        //显示emoji
+        binding.layBottomSheetEdit.ivEmoji.setOnClickListener {
+            if (isShowEmoji) {
+                isShowEmoji = false
+                bottomSheetBehavior!!.state = BottomSheetBehavior.STATE_COLLAPSED
+                binding.layBottomSheetEdit.ivEmoji.setImageDrawable(ContextCompat.getDrawable(this,R.drawable.ic_emoji))
+            } else {
+                isShowEmoji = true
+                bottomSheetBehavior!!.state = BottomSheetBehavior.STATE_EXPANDED
+                binding.layBottomSheetEdit.ivEmoji.setImageDrawable(ContextCompat.getDrawable(this,R.drawable.ic_emoji_checked))
+            }
+        }
+    }
+
     private fun showEditDialog() {
         val dialogBinding =
             DialogEditIpBinding.inflate(LayoutInflater.from(this@ClientActivity), null, false)
@@ -109,7 +151,9 @@ class ClientActivity : BaseActivity(), ClientCallback, EmojiCallback {
      */
     override fun receiveServerMsg(msg: String) = updateList(1, msg)
 
-    override fun otherMsg(msg: String) = showMsg(msg)
+    override fun otherMsg(msg: String) {
+        Log.d(TAG, "otherMsg: $msg")
+    }
 
     /**
      * 更新列表
@@ -125,7 +169,7 @@ class ClientActivity : BaseActivity(), ClientCallback, EmojiCallback {
     }
 
     override fun checkedEmoji(charSequence: CharSequence) {
-        binding.etMsg.apply {
+        binding.layBottomSheetEdit.etMsg.apply {
             setText(text.toString() + charSequence)
             setSelection(text.toString().length)//光标置于最后
         }

diff --git a/app/src/main/java/com/llw/socket/ui/SelectTypeActivity.kt b/app/src/main/java/com/llw/socket/ui/SelectTypeActivity.kt
@@ -1,7 +1,6 @@
 package com.llw.socket.ui
 
 import android.os.Bundle
-import android.util.Log
 import android.widget.Button
 import com.llw.socket.R
 

diff --git a/app/src/main/java/com/llw/socket/ui/ServerActivity.kt b/app/src/main/java/com/llw/socket/ui/ServerActivity.kt
@@ -1,8 +1,10 @@
 package com.llw.socket.ui
 
 import android.os.Bundle
+import android.os.Looper
 import android.util.Log
 import android.view.MenuItem
+import android.view.View
 import android.widget.LinearLayout
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.GridLayoutManager
@@ -38,7 +40,6 @@ class ServerActivity : BaseActivity(), ServerCallback, EmojiCallback {
     //是否显示表情
     private var isShowEmoji = false
 
-    //
     private var bottomSheetBehavior: BottomSheetBehavior<LinearLayout>? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -56,18 +57,6 @@ class ServerActivity : BaseActivity(), ServerCallback, EmojiCallback {
         }
         //初始化BottomSheet
         initBottomSheet()
-        //显示emoji
-        binding.layBottomSheetEdit.ivEmoji.setOnClickListener {
-            if (isShowEmoji) {
-                isShowEmoji = false
-                bottomSheetBehavior!!.state = BottomSheetBehavior.STATE_COLLAPSED
-                binding.layBottomSheetEdit.ivEmoji.setImageDrawable(ContextCompat.getDrawable(this,R.drawable.ic_emoji))
-            } else {
-                isShowEmoji = true
-                bottomSheetBehavior!!.state = BottomSheetBehavior.STATE_EXPANDED
-                binding.layBottomSheetEdit.ivEmoji.setImageDrawable(ContextCompat.getDrawable(this,R.drawable.ic_emoji_checked))
-            }
-        }
 
         //开启服务/关闭服务 服务端处理
         binding.tvStartService.setOnClickListener {
@@ -111,6 +100,7 @@ class ServerActivity : BaseActivity(), ServerCallback, EmojiCallback {
                 isHideable = false
                 isDraggable = false
             }
+        //表情列表适配器
         binding.layBottomSheetEdit.rvEmoji.apply {
             layoutManager = GridLayoutManager(context, 6)
             adapter = EmojiAdapter(SocketApp.instance().emojiList).apply {
@@ -122,6 +112,43 @@ class ServerActivity : BaseActivity(), ServerCallback, EmojiCallback {
                 })
             }
         }
+        //显示emoji
+        binding.layBottomSheetEdit.ivEmoji.setOnClickListener {
+            bottomSheetBehavior!!.state =
+                if (isShowEmoji) BottomSheetBehavior.STATE_COLLAPSED else BottomSheetBehavior.STATE_EXPANDED
+        }
+        //BottomSheet显示隐藏的相关处理
+        bottomSheetBehavior!!.addBottomSheetCallback(object : BottomSheetBehavior.BottomSheetCallback() {
+            override fun onStateChanged(bottomSheet: View, newState: Int) {
+                when (newState) {
+                    BottomSheetBehavior.STATE_EXPANDED -> {//显示
+                        isShowEmoji = true
+                        binding.layBottomSheetEdit.ivEmoji.setImageDrawable(
+                            ContextCompat.getDrawable(
+                                this@ServerActivity,
+                                R.drawable.ic_emoji_checked
+                            )
+                        )
+                    }
+                    BottomSheetBehavior.STATE_COLLAPSED -> {//隐藏
+                        isShowEmoji = false
+                        binding.layBottomSheetEdit.ivEmoji.setImageDrawable(
+                            ContextCompat.getDrawable(
+                                this@ServerActivity,
+                                R.drawable.ic_emoji
+                            )
+                        )
+                    }
+                    else -> isShowEmoji = false
+                }
+                Log.e(TAG, "onStateChanged: $newState")
+            }
+
+            override fun onSlide(bottomSheet: View, slideOffset: Float) {
+
+            }
+
+        })
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -136,7 +163,9 @@ class ServerActivity : BaseActivity(), ServerCallback, EmojiCallback {
      */
     override fun receiveClientMsg(success: Boolean, msg: String) = updateList(2, msg)
 
-    override fun otherMsg(msg: String) = showMsg(msg)
+    override fun otherMsg(msg: String) {
+        Log.d(TAG, "otherMsg: $msg")
+    }
 
     /**
      * 更新列表

diff --git a/app/src/main/java/com/llw/socket/ui/TestActivity.kt b/app/src/main/java/com/llw/socket/ui/TestActivity.kt
diff --git a/app/src/main/res/drawable/ic_delete_emoji.xml b/app/src/main/res/drawable/ic_delete_emoji.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="128dp"
+    android:height="128dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="#EEE"
+        android:pathData="M921.5,170.7L288,170.7a53.2,53.2 0,0 0,-44.4 23.7l-192,288a53.2,53.2 0,0 0,0 59.2l192,288A53.2,53.2 0,0 0,288 853.3h633.5a53.4,53.4 0,0 0,53.3 -53.3L974.9,224a53.4,53.4 0,0 0,-53.3 -53.3zM719.1,603.6a21.3,21.3 0,0 1,-30.2 30.2L597.3,542.2 505.8,633.8a21.3,21.3 0,0 1,-30.2 -30.2L567.2,512 475.6,420.4a21.3,21.3 0,0 1,30.2 -30.2L597.3,481.8l91.6,-91.6a21.3,21.3 0,1 1,30.2 30.2L627.5,512z" />
+</vector>