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" />
-
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ app:layout_constraintTop_toBottomOf="@+id/view_choose_country" />
-
-
-
-
-
-
-
-
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_register_more.xml b/app/src/main/res/layout/activity_register_more.xml
index 779a604..2b38bcd 100644
--- a/app/src/main/res/layout/activity_register_more.xml
+++ b/app/src/main/res/layout/activity_register_more.xml
@@ -100,6 +100,7 @@
android:id="@+id/rv_tags"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
android:layout_marginHorizontal="15dp"
android:maxHeight="260dp"
android:overScrollMode="never"
diff --git a/app/src/main/res/layout/item_tag.xml b/app/src/main/res/layout/item_tag.xml
index a6e155b..37f892b 100644
--- a/app/src/main/res/layout/item_tag.xml
+++ b/app/src/main/res/layout/item_tag.xml
@@ -7,8 +7,9 @@
android:gravity="center"
android:orientation="horizontal"
android:layout_marginEnd="10dp"
+ android:layout_marginBottom="5dp"
android:paddingStart="10dp"
- android:paddingVertical="10dp"
+ android:paddingVertical="5dp"
android:paddingEnd="20dp">