From 0093af48581721f859493196714b7edcb799101b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E5=8B=A4=E6=B0=91?= Date: Sat, 27 Jul 2024 17:00:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 3 +- .../xuqinmin/android/app/ui/ChatActivity.kt | 6 + .../app/ui/fragment/MessageFragment.kt | 2 +- .../android/app/ui/fragment/RandomFragment.kt | 4 + app/src/main/res/layout/activity_chat.xml | 17 +- app/src/main/res/layout/activity_main.xml | 2 +- app/src/main/res/layout/activity_register.xml | 417 +++++++++--------- .../res/layout/activity_register_more.xml | 1 + app/src/main/res/layout/item_tag.xml | 3 +- 9 files changed, 233 insertions(+), 222 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3f555f7..e931b82 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -43,7 +43,8 @@ + android:windowSoftInputMode="adjustResize" + /> diff --git a/app/src/main/java/com/xuqinmin/android/app/ui/ChatActivity.kt b/app/src/main/java/com/xuqinmin/android/app/ui/ChatActivity.kt index 6201741..d8cacdb 100644 --- a/app/src/main/java/com/xuqinmin/android/app/ui/ChatActivity.kt +++ b/app/src/main/java/com/xuqinmin/android/app/ui/ChatActivity.kt @@ -195,6 +195,12 @@ class ChatActivity : BaseActivity() { binding.empty.gone() } putInt(MSG_COUNT + "_" + toUser?.userId, 0)//消息全部已读 + if (intent?.getBooleanExtra("isSys", false) == true){ + binding.startVideo.gone() + binding.startVideo2.gone() + binding.msgStartVideo.gone() + binding.more.gone() + } } override fun initData() { diff --git a/app/src/main/java/com/xuqinmin/android/app/ui/fragment/MessageFragment.kt b/app/src/main/java/com/xuqinmin/android/app/ui/fragment/MessageFragment.kt index 23dce15..72ef454 100644 --- a/app/src/main/java/com/xuqinmin/android/app/ui/fragment/MessageFragment.kt +++ b/app/src/main/java/com/xuqinmin/android/app/ui/fragment/MessageFragment.kt @@ -65,7 +65,6 @@ class MessageFragment : BaseFragment() { MessageManager.getConversation() } adapter.setItemClickListener { _, item, _ -> - if (item.isSys == 1)return@setItemClickListener startActivity(Intent(mContext, ChatActivity::class.java).apply { putExtra( "model", GsonImplHelp.get().toJson( @@ -85,6 +84,7 @@ class MessageFragment : BaseFragment() { ) ) putExtra("conversationId", item.conversationId) + putExtra("isSys", item.isSys == 1) }) } adapter1.setItemClickListener { _, item, _ -> diff --git a/app/src/main/java/com/xuqinmin/android/app/ui/fragment/RandomFragment.kt b/app/src/main/java/com/xuqinmin/android/app/ui/fragment/RandomFragment.kt index c42ab61..a95f0aa 100644 --- a/app/src/main/java/com/xuqinmin/android/app/ui/fragment/RandomFragment.kt +++ b/app/src/main/java/com/xuqinmin/android/app/ui/fragment/RandomFragment.kt @@ -13,6 +13,7 @@ import com.xuqinmin.android.app.MyApplication import com.xuqinmin.android.app.R import com.xuqinmin.android.app.databinding.FragmentRandomBinding import com.xuqinmin.android.app.model.Balance +import com.xuqinmin.android.app.ui.CoinStoreActivity import com.xuqinmin.android.app.ui.SearchingActivity import com.xuqinmin.android.app.ui.dialog.DialogBalance import com.xuqinmin.android.app.ui.dialog.DialogBalanceNew @@ -66,6 +67,9 @@ class RandomFragment : BaseFragment() { // vm.refreshRtc() }) } + binding.species.setOnClickListener { + mContext.startActivity(Intent(mContext, CoinStoreActivity::class.java)) + } binding.matchPrice.text = "${MyApplication.modelInit.matchPrice} / Match" diff --git a/app/src/main/res/layout/activity_chat.xml b/app/src/main/res/layout/activity_chat.xml index bb5eeef..c62a8d5 100644 --- a/app/src/main/res/layout/activity_chat.xml +++ b/app/src/main/res/layout/activity_chat.xml @@ -5,8 +5,7 @@ + android:layout_height="match_parent"> - - - + xmlns:app="http://schemas.android.com/apk/res-auto"> - - - - - - - - - - - - - - - - + android:tag="top_status"> + android:orientation="vertical"> - + - + - - - - - - - - + android:textSize="18sp" + app:layout_constraintBottom_toBottomOf="@+id/top_bar" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/top_bar" /> - - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +