From ab1641eb150fcefaf4ba1db69aeea690269d4082 Mon Sep 17 00:00:00 2001
From: itgaojian163 <itgaojian@163.com>
Date: Wed, 6 Nov 2024 14:20:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=AB=E9=80=9F=E5=9B=9E=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/kotlinc.xml                             |   2 +-
 app/src/main/AndroidManifest.xml              |   5 +-
 .../aimz_k/adapter/ReplyAdapter.kt            |  43 +++++++
 .../tenlionsoft/aimz_k/model/AppDatabase.kt   |   7 +-
 .../com/tenlionsoft/aimz_k/model/MsgDao.kt    |  22 ++--
 .../com/tenlionsoft/aimz_k/model/ReplyBean.kt |  15 +++
 .../com/tenlionsoft/aimz_k/model/ReplyDao.kt  |  52 +++++++++
 .../page/activity/ManageReplyActivity.kt      |  33 ++++++
 .../aimz_k/page/fragments/MineFragment.kt     |  67 +++++++++--
 .../aimz_k/viewmodel/ChatPageViewModel.kt     |  16 ++-
 .../aimz_k/viewmodel/ManageReplyViewModel.kt  |  97 +++++++++++++++
 .../tenlionsoft/aimz_k/widget/BindingUtils.kt |   2 +-
 .../main/res/drawable-xhdpi/ic_add_circle.png | Bin 0 -> 3153 bytes
 .../main/res/layout/activity_manage_reply.xml | 110 ++++++++++++++++++
 app/src/main/res/layout/fragment_mine.xml     |  19 ++-
 app/src/main/res/layout/item_reply.xml        |  35 ++++++
 .../tenlionsoft/baselib/base/BaseActivity.kt  |  10 +-
 .../tenlionsoft/baselib/base/BaseViewModel.kt |   2 +-
 baselib/src/main/res/values/colors.xml        |   1 +
 19 files changed, 501 insertions(+), 37 deletions(-)
 create mode 100644 app/src/main/java/com/tenlionsoft/aimz_k/adapter/ReplyAdapter.kt
 create mode 100644 app/src/main/java/com/tenlionsoft/aimz_k/model/ReplyBean.kt
 create mode 100644 app/src/main/java/com/tenlionsoft/aimz_k/model/ReplyDao.kt
 create mode 100644 app/src/main/java/com/tenlionsoft/aimz_k/page/activity/ManageReplyActivity.kt
 create mode 100644 app/src/main/java/com/tenlionsoft/aimz_k/viewmodel/ManageReplyViewModel.kt
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_add_circle.png
 create mode 100644 app/src/main/res/layout/activity_manage_reply.xml
 create mode 100644 app/src/main/res/layout/item_reply.xml

diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index cac0f15..93b5d15 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -8,6 +8,6 @@
     <option name="languageVersion" value="2.0" />
   </component>
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="2.0.20" />
+    <option name="version" value="2.0.21" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 54c10b6..aa9687b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -35,7 +35,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
         <activity
             android:name=".page.activity.LoginActivity"
             android:exported="false" />
@@ -46,6 +45,10 @@
             android:name=".page.activity.MainActivity"
             android:exported="false"
             android:launchMode="singleInstance" />
+        <activity
+            android:name=".page.activity.ManageReplyActivity"
+            android:exported="false"
+            android:windowSoftInputMode="adjustPan|stateHidden" />
 
         <service
             android:name=".services.SocketService"
diff --git a/app/src/main/java/com/tenlionsoft/aimz_k/adapter/ReplyAdapter.kt b/app/src/main/java/com/tenlionsoft/aimz_k/adapter/ReplyAdapter.kt
new file mode 100644
index 0000000..bf46d6b
--- /dev/null
+++ b/app/src/main/java/com/tenlionsoft/aimz_k/adapter/ReplyAdapter.kt
@@ -0,0 +1,43 @@
+package com.tenlionsoft.aimz_k.adapter
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.lxj.xpopup.XPopup
+import com.tenlionsoft.aimz_k.databinding.ItemReplyBinding
+import com.tenlionsoft.aimz_k.model.ReplyBean
+import com.tenlionsoft.aimz_k.viewmodel.ManageReplyViewModel
+import com.tenlionsoft.baselib.base.BaseBindingAdapter
+
+class ReplyAdapter(datas: List<ReplyBean>, val viewModel: ManageReplyViewModel) :
+    BaseBindingAdapter<ReplyBean, ItemReplyBinding>(datas) {
+    override fun getItemBinding(parent: ViewGroup, viewType: Int): ItemReplyBinding {
+        return ItemReplyBinding.inflate(
+            LayoutInflater.from(parent.context),
+            parent,
+            false
+        )
+    }
+
+    override fun bindItem(holder: BaseViewHolder<ItemReplyBinding>, position: Int) {
+        holder.binding.pos = position
+        holder.binding.bean = list[position]
+        val xPopup = XPopup.Builder(holder.binding.root.context).watchView(holder.binding.root)
+        holder.binding.root.setOnLongClickListener {
+            xPopup.asAttachList(
+                arrayOf("删除", "编辑"),
+                intArrayOf(
+                    com.tenlionsoft.baselib.R.drawable.ic_del,
+                    com.tenlionsoft.baselib.R.drawable.ic_edit
+                ),
+                { p, _ ->
+                    viewModel.onItemLongClickListener.onItemLongClick(
+                        p, list[position]
+                    )
+                },
+                0,
+                0
+            ).show()
+            true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tenlionsoft/aimz_k/model/AppDatabase.kt b/app/src/main/java/com/tenlionsoft/aimz_k/model/AppDatabase.kt
index f38c53c..0fcca54 100755
--- a/app/src/main/java/com/tenlionsoft/aimz_k/model/AppDatabase.kt
+++ b/app/src/main/java/com/tenlionsoft/aimz_k/model/AppDatabase.kt
@@ -7,9 +7,14 @@ import androidx.room.RoomDatabase
 /**
  * 数据库的版本
  */
-@Database(entities = [MsgBean::class, MsgCategoryBean::class], version = 1, exportSchema = false)
+@Database(
+    entities = [MsgBean::class, MsgCategoryBean::class, ReplyBean::class],
+    version = 1,
+    exportSchema = false
+)
 abstract class AppDatabase : RoomDatabase() {
     abstract fun msgDao(): MsgDao
     abstract fun categoryDao(): MsgCategoryDao
+    abstract fun replayDao(): ReplyDao
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tenlionsoft/aimz_k/model/MsgDao.kt b/app/src/main/java/com/tenlionsoft/aimz_k/model/MsgDao.kt
index c578d2e..c29ade3 100644
--- a/app/src/main/java/com/tenlionsoft/aimz_k/model/MsgDao.kt
+++ b/app/src/main/java/com/tenlionsoft/aimz_k/model/MsgDao.kt
@@ -11,7 +11,7 @@ interface MsgDao {
      * 更新信息状态
      */
     @Query("UPDATE db_msg SET status = :status WHERE messageId = :messageId")
-    fun updateStatus(messageId: String, status: String)
+    suspend fun updateStatus(messageId: String, status: String)
 
     /**
      * 获取全部信息
@@ -19,7 +19,7 @@ interface MsgDao {
      * @return
      */
     @Query("SELECT * FROM db_msg")
-    fun getAllMsg(): List<MsgBean?>?
+    suspend fun getAllMsg(): List<MsgBean?>?
 
     /**
      * 根据ID获取消息
@@ -28,7 +28,7 @@ interface MsgDao {
      * @return
      */
     @Query("SELECT * FROM db_msg WHERE id =(:id) ")
-    fun getMsgById(id: String?): List<MsgBean?>?
+    suspend fun getMsgById(id: String?): List<MsgBean?>?
 
     /**
      *
@@ -41,7 +41,7 @@ interface MsgDao {
      * @return
      */
     @Query("SELECT * FROM db_msg WHERE `senderId`=(:from)")
-    fun getMsgByFrom(from: String?): List<MsgBean?>?
+    suspend fun getMsgByFrom(from: String?): List<MsgBean?>?
 
     /**
      * 根据发送给谁进行查询
@@ -50,7 +50,7 @@ interface MsgDao {
      * @return
      */
     @Query("SELECT * FROM db_msg WHERE `receiverId` =(:to)")
-    fun getMsgByTo(to: String?): List<MsgBean?>?
+    suspend fun getMsgByTo(to: String?): List<MsgBean?>?
 
 
     /**
@@ -62,13 +62,13 @@ interface MsgDao {
      * @return
      */
     @Query("SELECT * FROM db_msg WHERE `senderId`=(:form) ORDER BY timestamp LIMIT (((:page)-1)*(:pageSize)),(:pageSize)")
-    fun getMsgByPage(form: String?, pageSize: Int, page: Int): List<MsgBean?>?
+    suspend fun getMsgByPage(form: String?, pageSize: Int, page: Int): List<MsgBean?>?
 
     /**
      * 查询与单人的聊天记录-分页
      */
     @Query("SELECT * FROM db_msg t1  WHERE t1.id IN (SELECT id FROM db_msg WHERE `senderId`=(:form) AND `receiverId`=(:to) OR `senderId`=(:to) AND `receiverId`=(:form) ORDER BY timestamp DESC LIMIT (((:page)-1)*(:pageSize)),(:pageSize)) ORDER by t1.timestamp ASC")
-    fun getMsgByFromOrToPage(
+    suspend fun getMsgByFromOrToPage(
         form: String?,
         to: String?,
         pageSize: Int,
@@ -79,7 +79,7 @@ interface MsgDao {
      * 查询与单人的聊天记录-全部
      */
     @Query("SELECT * FROM db_msg t1  WHERE t1.id IN (SELECT id FROM db_msg WHERE senderId=:form AND receiverId=:to OR senderId=:to AND receiverId=:form ORDER BY timestamp DESC) ORDER by t1.timestamp ASC")
-    fun getMsgByFromOrToPage(
+    suspend fun getMsgByFromOrToPage(
         form: String,
         to: String,
     ): List<MsgBean>
@@ -96,13 +96,13 @@ interface MsgDao {
      * @param beans
      */
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    fun insertAll(vararg beans: MsgBean)
+    suspend fun insertAll(vararg beans: MsgBean)
 
     /**
      * 批量添加
      */
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    fun insertAll(beans: List<MsgBean>)
+    suspend fun insertAll(beans: List<MsgBean>)
 
 
     /**
@@ -117,5 +117,5 @@ interface MsgDao {
      * 清除全部聊天记录
      */
     @Query("DELETE FROM db_msg")
-    fun delAllMsg()
+    suspend fun delAllMsg()
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tenlionsoft/aimz_k/model/ReplyBean.kt b/app/src/main/java/com/tenlionsoft/aimz_k/model/ReplyBean.kt
new file mode 100644
index 0000000..3074f70
--- /dev/null
+++ b/app/src/main/java/com/tenlionsoft/aimz_k/model/ReplyBean.kt
@@ -0,0 +1,15 @@
+package com.tenlionsoft.aimz_k.model
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(tableName = "db_reply")
+data class ReplyBean(
+    @PrimaryKey(autoGenerate = true)
+    val id: Long = 0,
+    @ColumnInfo(name = "content")
+    val content: String,
+    @ColumnInfo(name = "remark")
+    var remark: String? = ""
+)
diff --git a/app/src/main/java/com/tenlionsoft/aimz_k/model/ReplyDao.kt b/app/src/main/java/com/tenlionsoft/aimz_k/model/ReplyDao.kt
new file mode 100644
index 0000000..5d5d865
--- /dev/null
+++ b/app/src/main/java/com/tenlionsoft/aimz_k/model/ReplyDao.kt
@@ -0,0 +1,52 @@
+package com.tenlionsoft.aimz_k.model
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+
+@Dao
+interface ReplyDao {
+    /**
+     * 更新内容
+     */
+    @Query("UPDATE db_reply SET content = :content WHERE id = :id")
+    suspend fun updateContent(id: Long, content: String)
+
+    /**
+     * 获取全部
+     *
+     * @return
+     */
+    @Query("SELECT * FROM db_reply")
+    suspend fun getAllReply(): List<ReplyBean>?
+
+    /**
+     * 添加多个
+     *
+     * @param beans
+     */
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertAll(vararg beans: ReplyBean)
+
+    /**
+     * 批量添加
+     */
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertAll(beans: List<ReplyBean>)
+
+
+    /**
+     * 添加-单个
+     *
+     * @param bean
+     */
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insert(bean: ReplyBean)
+
+    /**
+     * 删除
+     */
+    @Query("DELETE FROM db_reply WHERE id=:id")
+    suspend fun delReply(id: Long)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tenlionsoft/aimz_k/page/activity/ManageReplyActivity.kt b/app/src/main/java/com/tenlionsoft/aimz_k/page/activity/ManageReplyActivity.kt
new file mode 100644
index 0000000..5273e9a
--- /dev/null
+++ b/app/src/main/java/com/tenlionsoft/aimz_k/page/activity/ManageReplyActivity.kt
@@ -0,0 +1,33 @@
+package com.tenlionsoft.aimz_k.page.activity
+
+import androidx.databinding.DataBindingUtil
+import androidx.lifecycle.ViewModelProvider
+import com.tenlionsoft.aimz_k.R
+import com.tenlionsoft.aimz_k.databinding.ActivityManageReplyBinding
+import com.tenlionsoft.aimz_k.viewmodel.ManageReplyViewModel
+import com.tenlionsoft.baselib.base.BaseActivity
+
+class ManageReplyActivity : BaseActivity() {
+    private lateinit var mBind: ActivityManageReplyBinding
+    private var viewModel: ManageReplyViewModel? = null
+
+    override fun bindView() {
+        mBind =
+            DataBindingUtil.setContentView(this@ManageReplyActivity, R.layout.activity_manage_reply)
+        mBind.ivBack.setOnClickListener { finish() }
+        viewModel = ViewModelProvider(this)[ManageReplyViewModel::class.java]
+        mBind.model = viewModel
+        mBind.lifecycleOwner = this
+        viewModel!!.showSoftKeyboard.observe(this) {
+            if (it) {
+                showSoftKeyBoard(mBind.etReplyContent)
+                mBind.etReplyContent.requestFocus()
+            } else {
+                hideSoftKeyboard()
+                mBind.etReplyContent.clearFocus()
+            }
+        }
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tenlionsoft/aimz_k/page/fragments/MineFragment.kt b/app/src/main/java/com/tenlionsoft/aimz_k/page/fragments/MineFragment.kt
index afb3b08..e771a4c 100644
--- a/app/src/main/java/com/tenlionsoft/aimz_k/page/fragments/MineFragment.kt
+++ b/app/src/main/java/com/tenlionsoft/aimz_k/page/fragments/MineFragment.kt
@@ -1,31 +1,82 @@
 package com.tenlionsoft.aimz_k.page.fragments
 
-import androidx.fragment.app.viewModels
+import android.content.Context
+import android.content.Intent
 import android.os.Bundle
-import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.databinding.DataBindingUtil
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import com.bumptech.glide.Glide
+import com.bumptech.glide.load.engine.DiskCacheStrategy
+import com.bumptech.glide.request.RequestOptions
 import com.tenlionsoft.aimz_k.R
+import com.tenlionsoft.aimz_k.databinding.FragmentMineBinding
+import com.tenlionsoft.aimz_k.page.activity.MainActivity
+import com.tenlionsoft.aimz_k.page.activity.ManageReplyActivity
 import com.tenlionsoft.aimz_k.viewmodel.MineViewModel
+import com.tenlionsoft.baselib.utils.SpUtils
 
 class MineFragment : Fragment() {
+    private lateinit var mBind: FragmentMineBinding
+    private lateinit var mActivity: MainActivity
 
     companion object {
         fun newInstance() = MineFragment()
     }
 
-    private val viewModel: MineViewModel by viewModels()
+    private lateinit var viewModel: MineViewModel
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-    }
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-        return inflater.inflate(R.layout.fragment_mine, container, false)
+        mBind = DataBindingUtil.inflate(
+            layoutInflater,
+            R.layout.fragment_mine,
+            container,
+            false
+        )
+        viewModel = ViewModelProvider(this, object : ViewModelProvider.Factory {
+            override fun <T : ViewModel> create(modelClass: Class<T>): T {
+                return MineViewModel() as T
+            }
+        })[MineViewModel::class.java]
+        mBind.model = viewModel
+        mBind.lifecycleOwner = this
+
+        initView()
+        return mBind.root
+    }
+
+    private fun initView() {
+        mBind.tvName.text = SpUtils.getNickName()
+        mBind.tvAccount.text = SpUtils.getUserName()
+        val requestOptions = RequestOptions()
+            .error(R.drawable.ic_user_default)
+            .placeholder(R.drawable.ic_user_default)
+            .skipMemoryCache(false)
+            .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
+            .centerInside()
+        Glide.with(mActivity)
+            .load(SpUtils.getAvatar())
+            .apply(requestOptions)
+            .into(mBind.ivUserIcon)
+        mBind.llSetting.setOnClickListener {
+            startActivity(Intent(mActivity, ManageReplyActivity::class.java))
+        }
+
+    }
+
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        if (context is MainActivity) {
+            mActivity = context
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tenlionsoft/aimz_k/viewmodel/ChatPageViewModel.kt b/app/src/main/java/com/tenlionsoft/aimz_k/viewmodel/ChatPageViewModel.kt
index c300ef4..f68c855 100644
--- a/app/src/main/java/com/tenlionsoft/aimz_k/viewmodel/ChatPageViewModel.kt
+++ b/app/src/main/java/com/tenlionsoft/aimz_k/viewmodel/ChatPageViewModel.kt
@@ -23,6 +23,7 @@ import com.tenlionsoft.aimz_k.model.MsgBean
 import com.tenlionsoft.aimz_k.model.MsgConvertBean
 import com.tenlionsoft.aimz_k.model.PickerType
 import com.tenlionsoft.aimz_k.model.Receiver
+import com.tenlionsoft.aimz_k.model.ReplyBean
 import com.tenlionsoft.aimz_k.model.Sender
 import com.tenlionsoft.aimz_k.net.UserApi
 import com.tenlionsoft.baselib.base.BaseViewModel
@@ -59,7 +60,7 @@ class ChatPageViewModel(
     var onItemClickListener: AdapterItemClickListener<MsgBean>? = null
     private val mGson: Gson = Gson()
     private var msgHandlerList: ArrayList<MsgConvertBean> = arrayListOf()
-
+    private val _replyList = MutableLiveData<List<ReplyBean>?>()
     private val handler = object : Handler(Looper.getMainLooper()) {
         override fun handleMessage(msg: Message) {
             super.handleMessage(msg)
@@ -89,13 +90,26 @@ class ChatPageViewModel(
         Log.e("ChatPageViewModel", "Init: ${showSendBtn.value}")
         viewModelScope.launch {
             val list = getList()
+            val rList = getReplyList()
             Log.e("ChatPageViewModel", "Init:${list} ")
+            if (rList != null) {
+                _replyList.value = rList
+            } else {
+                _replyList.value = emptyList()
+            }
             _msgList.value = list
             adapter.setData(list)
             scrollListToBottom.value = true
         }
     }
 
+    private suspend fun getReplyList(): List<ReplyBean>? {
+        return withContext(Dispatchers.IO) {
+            val rDao = DbManager.db.replayDao()
+            return@withContext rDao.getAllReply()
+        }
+    }
+
     //获取列表
     private suspend fun getList(): List<MsgBean> {
         return withContext(Dispatchers.IO) {
diff --git a/app/src/main/java/com/tenlionsoft/aimz_k/viewmodel/ManageReplyViewModel.kt b/app/src/main/java/com/tenlionsoft/aimz_k/viewmodel/ManageReplyViewModel.kt
new file mode 100644
index 0000000..bf22b8c
--- /dev/null
+++ b/app/src/main/java/com/tenlionsoft/aimz_k/viewmodel/ManageReplyViewModel.kt
@@ -0,0 +1,97 @@
+package com.tenlionsoft.aimz_k.viewmodel
+
+import android.util.Log
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.viewModelScope
+import com.tenlionsoft.aimz_k.adapter.ReplyAdapter
+import com.tenlionsoft.aimz_k.model.DbManager
+import com.tenlionsoft.aimz_k.model.ReplyBean
+import com.tenlionsoft.baselib.base.BaseViewModel
+import com.tenlionsoft.baselib.utils.ToastUtils
+import com.tenlionsoft.baselib.widget.AdapterItemLongClickListener
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+class ManageReplyViewModel : BaseViewModel(), AdapterItemLongClickListener<ReplyBean> {
+
+    val txtMsg = MutableLiveData("")
+    val _replyList = MutableLiveData<List<ReplyBean>?>()
+    var adapter: ReplyAdapter = ReplyAdapter(_replyList.value ?: emptyList(), this)
+    var onItemLongClickListener: AdapterItemLongClickListener<ReplyBean> = this
+    val curBean = MutableLiveData<ReplyBean?>()
+
+    init {
+        getList()
+    }
+
+    private fun getList() {
+        viewModelScope.launch {
+            val list: List<ReplyBean>? = withContext(Dispatchers.IO) {
+                val rDao = DbManager.db.replayDao()
+                val list = rDao.getAllReply()
+                list
+            }
+            if (!list.isNullOrEmpty()) {
+                _replyList.value = list
+            } else {
+                _replyList.value = emptyList()
+            }
+            Log.e("ManageReplyViewModel", "init:${adapter} ${Thread.currentThread().name}");
+            adapter.setData(_replyList.value!!)
+        }
+    }
+
+    fun onTxtChange(s: CharSequence, start: Int, before: Int, count: Int) {
+        txtMsg.value = s.toString()
+    }
+
+    //添加短语
+    fun toAddReply() {
+        if (txtMsg.value != null && txtMsg.value!!.isNotEmpty()) {
+            viewModelScope.launch {
+                withContext(Dispatchers.IO) {
+                    val rDao = DbManager.db.replayDao()
+                    if (curBean.value != null) {
+                        //更新
+                        rDao.updateContent(curBean.value!!.id, txtMsg.value!!)
+                    } else {
+                        //新增
+                        val b = ReplyBean(content = txtMsg.value!!)
+                        rDao.insert(b)
+                    }
+                }
+                txtMsg.value = ""
+                curBean.value = null
+                ToastUtils.success("保存成功")
+                getList()
+                showSoftKeyboard.value = false
+            }
+        } else {
+            ToastUtils.error("请输入短语")
+        }
+
+    }
+
+    override fun onItemLongClick(type: Int, d: ReplyBean) {
+        when (type) {
+            //删除
+            0 -> {
+                viewModelScope.launch {
+                    withContext(Dispatchers.IO) {
+                        val rDao = DbManager.db.replayDao()
+                        rDao.delReply(d.id)
+                    }
+                    ToastUtils.success("删除成功")
+                    getList()
+                }
+            }
+            //修改
+            1 -> {
+                curBean.value = d
+                txtMsg.value = d.content
+                showSoftKeyboard.value = true
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tenlionsoft/aimz_k/widget/BindingUtils.kt b/app/src/main/java/com/tenlionsoft/aimz_k/widget/BindingUtils.kt
index 5403e1a..4d46868 100644
--- a/app/src/main/java/com/tenlionsoft/aimz_k/widget/BindingUtils.kt
+++ b/app/src/main/java/com/tenlionsoft/aimz_k/widget/BindingUtils.kt
@@ -54,9 +54,9 @@ object BindingUtils {
                 .apply(requestOptions)
                 .into(imageView)
         }
-
     }
 
+
     @BindingAdapter("imgResource")
     @JvmStatic
     fun bindImgUrl(imageView: ImageView, url: Int) {
diff --git a/app/src/main/res/drawable-xhdpi/ic_add_circle.png b/app/src/main/res/drawable-xhdpi/ic_add_circle.png
new file mode 100644
index 0000000000000000000000000000000000000000..346ac83ce22190441963a90a805741c754635b26
GIT binary patch
literal 3153
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/activity_manage_reply.xml b/app/src/main/res/layout/activity_manage_reply.xml
new file mode 100644
index 0000000..64d187f
--- /dev/null
+++ b/app/src/main/res/layout/activity_manage_reply.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="model"
+            type="com.tenlionsoft.aimz_k.viewmodel.ManageReplyViewModel" />
+    </data>
+
+    <RelativeLayout
+        android:id="@+id/main"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        tools:context=".page.activity.ManageReplyActivity">
+
+
+        <LinearLayout
+            android:id="@+id/ll_title"
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:orientation="vertical">
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:gravity="center_vertical"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp">
+
+                <ImageView
+                    android:id="@+id/iv_back"
+                    android:layout_width="28dp"
+                    android:layout_height="28dp"
+                    android:layout_centerVertical="true"
+                    android:src="@drawable/ic_back_left" />
+
+                <TextView
+                    android:id="@+id/tv_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
+                    android:ellipsize="end"
+                    android:gravity="center"
+                    android:maxLines="1"
+                    android:text="回复短语"
+                    android:textColor="#1D1D1D"
+                    android:textSize="20sp" />
+            </RelativeLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="#CBCBCB" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@id/ll_title"
+            android:layout_marginTop="5dp"
+            android:orientation="vertical">
+
+            <androidx.recyclerview.widget.RecyclerView
+                setLinearLayoutAdapter="@{model.adapter}"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                android:layout_marginBottom="8dp"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <EditText
+                    android:id="@+id/et_reply_content"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginRight="5dp"
+                    android:layout_weight="1"
+                    android:background="@drawable/shp_white_5_radius"
+                    android:hint="请输入内容"
+                    android:maxLines="5"
+                    android:minLines="1"
+                    android:onTextChanged="@{model::onTxtChange}"
+                    android:padding="10dp"
+                    android:text="@{model.txtMsg}"
+                    android:textSize="14sp" />
+
+                <Button
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/sel_login_btn"
+                    android:elevation="0dp"
+                    android:onClick="@{()->model.toAddReply()}"
+                    android:stateListAnimator="@null"
+                    android:text="保存"
+                    android:textColor="@color/col_login_btn" />
+            </LinearLayout>
+        </LinearLayout>
+
+    </RelativeLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index cac56dc..8ba93ac 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -4,6 +4,9 @@
 
     <data>
 
+        <variable
+            name="model"
+            type="com.tenlionsoft.aimz_k.viewmodel.MineViewModel" />
     </data>
 
     <LinearLayout
@@ -22,6 +25,7 @@
             android:padding="20dp">
 
             <ImageView
+                android:id="@+id/iv_user_icon"
                 android:layout_width="64dp"
                 android:layout_height="64dp"
                 android:src="@drawable/ic_load_error" />
@@ -33,6 +37,7 @@
                 android:orientation="vertical">
 
                 <TextView
+                    android:id="@+id/tv_name"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="名称"
@@ -40,6 +45,7 @@
                     android:textSize="20sp" />
 
                 <TextView
+                    android:id="@+id/tv_account"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="5dp"
@@ -58,6 +64,7 @@
             android:orientation="vertical">
 
             <LinearLayout
+                android:id="@+id/ll_setting"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
@@ -65,8 +72,8 @@
                 android:padding="15dp">
 
                 <ImageView
-                    android:layout_width="32dp"
-                    android:layout_height="32dp"
+                    android:layout_width="28dp"
+                    android:layout_height="28dp"
                     android:scaleType="fitXY"
                     android:src="@drawable/ic_setting_gear" />
 
@@ -76,7 +83,7 @@
                     android:layout_marginLeft="10dp"
                     android:text="设置"
                     android:textColor="@color/txt_black"
-                    android:textSize="20sp" />
+                    android:textSize="14sp" />
             </LinearLayout>
 
             <View
@@ -94,8 +101,8 @@
                 android:padding="15dp">
 
                 <ImageView
-                    android:layout_width="32dp"
-                    android:layout_height="32dp"
+                    android:layout_width="28dp"
+                    android:layout_height="28dp"
                     android:scaleType="fitXY"
                     android:src="@drawable/ic_exit_blue" />
 
@@ -105,7 +112,7 @@
                     android:layout_marginLeft="10dp"
                     android:text="退出登录"
                     android:textColor="@color/txt_black"
-                    android:textSize="20sp" />
+                    android:textSize="14sp" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout/item_reply.xml b/app/src/main/res/layout/item_reply.xml
new file mode 100644
index 0000000..e529c85
--- /dev/null
+++ b/app/src/main/res/layout/item_reply.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="bean"
+            type="com.tenlionsoft.aimz_k.model.ReplyBean" />
+
+        <variable
+            name="pos"
+            type="Integer" />
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="8dp">
+
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:text="@{bean.content}"
+            android:textColor="@color/black"
+            android:textSize="16sp"
+            tools:text="测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容" />
+
+
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/base/BaseActivity.kt b/baselib/src/main/java/com/tenlionsoft/baselib/base/BaseActivity.kt
index 1b54c25..f3579b6 100644
--- a/baselib/src/main/java/com/tenlionsoft/baselib/base/BaseActivity.kt
+++ b/baselib/src/main/java/com/tenlionsoft/baselib/base/BaseActivity.kt
@@ -37,16 +37,14 @@ abstract class BaseActivity : DataBindingActivity() {
 
     private fun hideSoftKeyboard(et: View?) {
         val imm = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
-        if (et != null) {
-            imm.hideSoftInputFromWindow(et.windowToken, 0)
-        }
+        et?.postDelayed({ imm.hideSoftInputFromWindow(et.windowToken, 0) }, 100)
     }
 
     fun showSoftKeyBoard(view: View?) {
         val imm = getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager
-        if (view != null) {
-            imm.showSoftInput(view, 0)
-        }
+        view?.postDelayed({
+            imm.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT)
+        }, 100)
     }
 
     fun setStatusBarColor(dark: Boolean) {
diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/base/BaseViewModel.kt b/baselib/src/main/java/com/tenlionsoft/baselib/base/BaseViewModel.kt
index bf5c58b..61375f8 100644
--- a/baselib/src/main/java/com/tenlionsoft/baselib/base/BaseViewModel.kt
+++ b/baselib/src/main/java/com/tenlionsoft/baselib/base/BaseViewModel.kt
@@ -7,5 +7,5 @@ import com.tenlionsoft.baselib.model.ViewState
 open class BaseViewModel : ViewModel() {
     val showLoadDialog = MutableLiveData<Boolean>()
     val pageState = MutableLiveData<ViewState>()
-    val showSoftKeyboard = MutableLiveData(false)
+    val showSoftKeyboard = MutableLiveData<Boolean>(false)
 }
\ No newline at end of file
diff --git a/baselib/src/main/res/values/colors.xml b/baselib/src/main/res/values/colors.xml
index 43d6243..50a70c9 100644
--- a/baselib/src/main/res/values/colors.xml
+++ b/baselib/src/main/res/values/colors.xml
@@ -9,5 +9,6 @@
     <color name="red">#E75D58</color>
     <color name="green">#45F68B</color>
     <color name="gray_6f">#6F6E6E</color>
+    <color name="gray_e6">#E6E6E6</color>
     <color name="black">#000000</color>
 </resources>
\ No newline at end of file