From 459e96427cfd70880aee397860b9934f634ec773 Mon Sep 17 00:00:00 2001
From: llw <1317057860@qq.com>
Date: Wed, 24 Aug 2022 11:33:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BE=93=E5=85=A5=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E5=BC=B9=E7=AA=97=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E6=A1=86=E5=85=89=E6=A0=87=E4=BD=8D=E7=BD=AE=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/deploymentTargetDropDown.xml            | 17 +++++++
 .idea/misc.xml                                |  5 +--
 .../java/com/llw/socket/ui/ClientActivity.kt  | 44 +++++++++++--------
 .../java/com/llw/socket/ui/ServerActivity.kt  |  5 ++-
 app/src/main/res/drawable/ic_connect.xml      | 13 ++++++
 app/src/main/res/layout/dialog_edit_ip.xml    | 44 ++-----------------
 6 files changed, 64 insertions(+), 64 deletions(-)
 create mode 100644 .idea/deploymentTargetDropDown.xml
 create mode 100644 app/src/main/res/drawable/ic_connect.xml

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 0000000..8366e0a
--- /dev/null
+++ b/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <runningDeviceTargetSelectedWithDropDown>
+      <Target>
+        <type value="RUNNING_DEVICE_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="SERIAL_NUMBER" />
+            <value value="A5YFVB1414011212" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </runningDeviceTargetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2022-08-24T03:24:50.230324900Z" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 49b1f9a..88c6e29 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,11 +3,8 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
-        <entry key="..\:/Android/AndroidProjects/SocketDemo/app/src/main/res/drawable/ic_emoji.xml" value="0.147" />
-        <entry key="..\:/Android/AndroidProjects/SocketDemo/app/src/main/res/layout/activity_server.xml" value="0.20416666666666666" />
-        <entry key="..\:/Android/AndroidProjects/SocketDemo/app/src/main/res/layout/dialog_emoji.xml" value="0.1" />
-        <entry key="..\:/Android/AndroidProjects/SocketDemo/app/src/main/res/layout/item_emoji.xml" value="0.1" />
         <entry key="..\:/Android/AndroidStudioProjects/SocketDemo/app/src/main/res/drawable/ic_back_black.xml" value="0.1045" />
+        <entry key="..\:/Android/AndroidStudioProjects/SocketDemo/app/src/main/res/drawable/ic_connect.xml" value="0.1245" />
         <entry key="..\:/Android/AndroidStudioProjects/SocketDemo/app/src/main/res/drawable/ic_emoji.xml" value="0.131" />
         <entry key="..\:/Android/AndroidStudioProjects/SocketDemo/app/src/main/res/drawable/ic_launcher_background.xml" value="0.128" />
         <entry key="..\:/Android/AndroidStudioProjects/SocketDemo/app/src/main/res/drawable/shape_dialog_bg.xml" value="0.1" />
diff --git a/app/src/main/java/com/llw/socket/ui/ClientActivity.kt b/app/src/main/java/com/llw/socket/ui/ClientActivity.kt
index 7b6f0fb..33faa5b 100644
--- a/app/src/main/java/com/llw/socket/ui/ClientActivity.kt
+++ b/app/src/main/java/com/llw/socket/ui/ClientActivity.kt
@@ -5,6 +5,7 @@ import android.util.Log
 import android.view.LayoutInflater
 import androidx.appcompat.app.AlertDialog
 import androidx.recyclerview.widget.LinearLayoutManager
+import com.llw.socket.R
 import com.llw.socket.adapter.MsgAdapter
 import com.llw.socket.bean.Message
 import com.llw.socket.client.ClientCallback
@@ -26,6 +27,7 @@ class ClientActivity : BaseActivity(), ClientCallback, EmojiCallback {
 
     //消息列表
     private val messages = ArrayList<Message>()
+
     //消息适配器
     private lateinit var msgAdapter: MsgAdapter
 
@@ -43,7 +45,7 @@ class ClientActivity : BaseActivity(), ClientCallback, EmojiCallback {
         //显示emoji
         binding.ivEmoji.setOnClickListener {
             //显示底部弹窗
-            showEmojiDialog(this,this)
+            showEmojiDialog(this, this)
         }
 
         //连接服务/断开连接 客户端处理
@@ -64,7 +66,7 @@ class ClientActivity : BaseActivity(), ClientCallback, EmojiCallback {
                 showMsg("请输入要发送的信息");return@setOnClickListener
             }
             //检查是否能发送消息
-            val isSend = if (connectSocket) connectSocket  else false
+            val isSend = if (connectSocket) connectSocket else false
             if (!isSend) {
                 showMsg("当前未开启服务或连接服务");return@setOnClickListener
             }
@@ -81,22 +83,25 @@ class ClientActivity : BaseActivity(), ClientCallback, EmojiCallback {
     }
 
     private fun showEditDialog() {
-        val dialogBinding = DialogEditIpBinding.inflate(LayoutInflater.from(this@ClientActivity),null,false)
-        val dialog = AlertDialog.Builder(this@ClientActivity).create()
-        dialog.show()
-        dialog.window!!.setContentView(dialogBinding.root)
-        dialogBinding.tvCancel.setOnClickListener { dialog.dismiss() }
-        dialogBinding.tvSure.setOnClickListener {
-            val ip = dialogBinding.etIpAddress.text.toString()
-            if (ip.isEmpty()) {
-                showMsg("请输入Ip地址");return@setOnClickListener
+        val dialogBinding =
+            DialogEditIpBinding.inflate(LayoutInflater.from(this@ClientActivity), null, false)
+        AlertDialog.Builder(this@ClientActivity).apply {
+            setIcon(R.drawable.ic_connect)
+            setTitle("连接Ip地址")
+            setView(dialogBinding.root)
+            setPositiveButton("确定") { dialog, _ ->
+                val ip = dialogBinding.etIpAddress.text.toString()
+                if (ip.isEmpty()) {
+                    showMsg("请输入Ip地址");return@setPositiveButton
+                }
+                connectSocket = true
+                SocketClient.connectServer(ip, this@ClientActivity)
+                showMsg("连接服务")
+                binding.tvConnectService.text = "关闭连接"
+                dialog.dismiss()
             }
-            connectSocket = true
-            SocketClient.connectServer(ip, this@ClientActivity)
-            showMsg("连接服务")
-            binding.tvConnectService.text = "关闭连接"
-            dialog.dismiss()
-        }
+            setNegativeButton("取消") { dialog, _ -> dialog.dismiss() }
+        }.show()
     }
 
     /**
@@ -122,6 +127,9 @@ class ClientActivity : BaseActivity(), ClientCallback, EmojiCallback {
     }
 
     override fun checkedEmoji(charSequence: CharSequence) {
-        binding.etMsg.setText(charSequence)
+        binding.etMsg.apply {
+            setText(text.toString() + charSequence)
+            setSelection(text.toString().length)//光标置于最后
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/llw/socket/ui/ServerActivity.kt b/app/src/main/java/com/llw/socket/ui/ServerActivity.kt
index 42be8af..a6f0384 100644
--- a/app/src/main/java/com/llw/socket/ui/ServerActivity.kt
+++ b/app/src/main/java/com/llw/socket/ui/ServerActivity.kt
@@ -112,6 +112,9 @@ class ServerActivity : BaseActivity(), ServerCallback, EmojiCallback {
     }
 
     override fun checkedEmoji(charSequence: CharSequence) {
-        binding.etMsg.setText(charSequence)
+        binding.etMsg.apply {
+            setText(text.toString() + charSequence)
+            setSelection(text.toString().length)//光标置于最后
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_connect.xml b/app/src/main/res/drawable/ic_connect.xml
new file mode 100644
index 0000000..417baf2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_connect.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#000000"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M7,4c0,-1.11 -0.89,-2 -2,-2S3,2.89 3,4s0.89,2 2,2S7,5.11 7,4zM10.19,4.5L10.19,4.5c-0.41,0 -0.76,0.25 -0.92,0.63C8.83,6.23 7.76,7 6.5,7h-3C2.67,7 2,7.67 2,8.5V11h6V8.74c1.43,-0.45 2.58,-1.53 3.12,-2.91C11.38,5.19 10.88,4.5 10.19,4.5zM19,17c1.11,0 2,-0.89 2,-2s-0.89,-2 -2,-2s-2,0.89 -2,2S17.89,17 19,17zM20.5,18h-3c-1.26,0 -2.33,-0.77 -2.77,-1.87c-0.15,-0.38 -0.51,-0.63 -0.92,-0.63h0c-0.69,0 -1.19,0.69 -0.94,1.33c0.55,1.38 1.69,2.46 3.12,2.91V22h6v-2.5C22,18.67 21.33,18 20.5,18zM17.25,11.09c0,0 0,-0.01 0.01,0c-1.06,0.27 -1.9,1.11 -2.17,2.17c0,0 0,-0.01 0,-0.01C14.98,13.68 14.58,14 14.11,14c-0.55,0 -1,-0.45 -1,-1c0,-0.05 0.02,-0.14 0.02,-0.14c0.43,-1.85 1.89,-3.31 3.75,-3.73c0.04,0 0.08,-0.01 0.12,-0.01c0.55,0 1,0.45 1,1C18,10.58 17.68,10.98 17.25,11.09zM18,6.06c0,0.51 -0.37,0.92 -0.86,0.99c0,0 0,0 0,0c-3.19,0.39 -5.7,2.91 -6.09,6.1c0,0 0,0 0,0C10.98,13.63 10.56,14 10.06,14c-0.55,0 -1,-0.45 -1,-1c0,-0.02 0,-0.04 0,-0.06c0,-0.01 0,-0.02 0,-0.03c0.5,-4.12 3.79,-7.38 7.92,-7.85c0,0 0.01,0 0.01,0C17.55,5.06 18,5.51 18,6.06z" />
+
+</vector>
diff --git a/app/src/main/res/layout/dialog_edit_ip.xml b/app/src/main/res/layout/dialog_edit_ip.xml
index 2b06f99..7579438 100644
--- a/app/src/main/res/layout/dialog_edit_ip.xml
+++ b/app/src/main/res/layout/dialog_edit_ip.xml
@@ -1,22 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="300dp"
-    android:background="@drawable/shape_dialog_bg"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <TextView
-        android:id="@+id/textView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:text="连接Ip地址"
-        android:textColor="@color/black"
-        android:textSize="16sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/textInputLayout"
         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
@@ -27,42 +14,17 @@
         android:layout_marginEnd="16dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView">
+        app:layout_constraintTop_toTopOf="parent">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/et_ip_address"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:digits="0123456789."
-            android:hint="连接Ip地址"
+            android:hint="Ip地址"
             android:inputType="number"
             android:lines="1"
             android:singleLine="true"
             android:text="192.168.0.120" />
     </com.google.android.material.textfield.TextInputLayout>
-
-    <TextView
-        android:id="@+id/tv_cancel"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="16dp"
-        android:text="取消"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/tv_sure"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textInputLayout" />
-
-    <TextView
-        android:id="@+id/tv_sure"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="确定"
-        android:padding="16dp"
-        android:textColor="@color/black"
-        app:layout_constraintBottom_toBottomOf="@+id/tv_cancel"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/tv_cancel"
-        app:layout_constraintTop_toTopOf="@+id/tv_cancel" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file