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 d8cacdb..9526dbd 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 @@ -6,6 +6,8 @@ import android.widget.ImageView import android.widget.LinearLayout import android.widget.TextView import androidx.activity.viewModels +import com.gyf.immersionbar.BarHide +import com.gyf.immersionbar.ImmersionBar import com.luck.picture.lib.basic.PictureSelector import com.luck.picture.lib.config.SelectMimeType import com.luck.picture.lib.config.SelectModeConfig @@ -13,7 +15,6 @@ import com.luck.picture.lib.entity.LocalMedia import com.luck.picture.lib.interfaces.OnResultCallbackListener import com.oikawaii.library.outline.CircleProvider import com.oikawaii.library.outline.FilletProvider -import com.xuqinmin.android.app.MyApplication import com.xuqinmin.android.app.R import com.xuqinmin.android.app.common.CountryHelper import com.xuqinmin.android.app.common.GenderHelper @@ -57,7 +58,7 @@ import java.io.File class ChatActivity : BaseActivity() { - override fun getLayoutId(): Int = R.layout.activity_chat + override fun getLayoutId(): Int = 0 override fun fullscreen(): Boolean = true private var toUser: ToUser? = null @@ -66,6 +67,13 @@ class ChatActivity : BaseActivity() { private val listMsg = mutableListOf() + override fun setContentView() { + super.setContentView() + bindUi(R.layout.activity_chat) + ImmersionBar.with(this).statusBarDarkFont(true) + .hideBar(BarHide.FLAG_HIDE_NAVIGATION_BAR).init() + } + override fun initView(savedInstanceState: Bundle?) { super.initView(savedInstanceState) @@ -196,7 +204,7 @@ class ChatActivity : BaseActivity() { } putInt(MSG_COUNT + "_" + toUser?.userId, 0)//消息全部已读 if (intent?.getBooleanExtra("isSys", false) == true){ - binding.startVideo.gone() + binding.empty.gone() binding.startVideo2.gone() binding.msgStartVideo.gone() binding.more.gone() diff --git a/app/src/main/java/com/xuqinmin/android/app/ui/MainActivity.kt b/app/src/main/java/com/xuqinmin/android/app/ui/MainActivity.kt index aaab4d1..07b2cd7 100644 --- a/app/src/main/java/com/xuqinmin/android/app/ui/MainActivity.kt +++ b/app/src/main/java/com/xuqinmin/android/app/ui/MainActivity.kt @@ -1,6 +1,9 @@ package com.xuqinmin.android.app.ui +import android.os.Build import android.os.Bundle +import android.view.WindowInsets +import android.view.WindowManager import androidx.activity.viewModels import com.xuqinmin.android.app.MyApplication import com.xuqinmin.android.app.R @@ -23,6 +26,15 @@ class MainActivity : BaseActivity() { override fun initView(savedInstanceState: Bundle?) { super.initView(savedInstanceState) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { + window?.insetsController?.hide(WindowInsets.Type.statusBars()) + window?.insetsController?.show(WindowInsets.Type.navigationBars()) + } + + window.setFlags( + WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS, + WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS + ) setupBottomNavigationBar() MyApplication.startConnection() MyApplication.modelInit.let { @@ -42,8 +54,8 @@ class MainActivity : BaseActivity() { LoadingDialog.dismissDialog() DialogBalanceNew.show( it.coins.toString(), - it.money?:"", - it.price?:"", + it.money ?: "", + it.price ?: "", it.payCode, it.content ?: "" ) { ite -> diff --git a/app/src/main/res/layout/activity_chat.xml b/app/src/main/res/layout/activity_chat.xml index c62a8d5..8db6f2f 100644 --- a/app/src/main/res/layout/activity_chat.xml +++ b/app/src/main/res/layout/activity_chat.xml @@ -1,7 +1,6 @@ + xmlns:app="http://schemas.android.com/apk/res-auto"> - + + + + + + + app:layout_constraintBottom_toBottomOf="parent"> @@ -308,6 +306,7 @@ android:id="@+id/can_send" android:layout_width="32dp" android:layout_height="32dp" + android:layout_marginVertical="10dp" android:src="@mipmap/can_send" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/view_send" @@ -320,7 +319,7 @@ android:id="@+id/baseRefreshLayout" android:layout_width="match_parent" android:layout_height="0dp" - android:layout_marginTop="3dp" + android:paddingTop="3dp" android:visibility="gone" app:layout_constraintBottom_toTopOf="@+id/toolbar" app:layout_constraintEnd_toEndOf="parent"