|
@@ -1,13 +1,14 @@
|
|
|
package com.shanp.youqi.im.dialog
|
|
|
|
|
|
import android.os.Bundle
|
|
|
+import android.text.TextUtils
|
|
|
import android.widget.FrameLayout
|
|
|
-import androidx.fragment.app.DialogFragment
|
|
|
import com.alibaba.android.arouter.facade.annotation.Autowired
|
|
|
import com.alibaba.android.arouter.facade.annotation.Route
|
|
|
import com.alibaba.android.arouter.launcher.ARouter
|
|
|
import com.blankj.utilcode.util.FragmentUtils
|
|
|
import com.blankj.utilcode.util.KeyboardUtils
|
|
|
+import com.blankj.utilcode.util.ToastUtils
|
|
|
import com.shanp.youqi.common.app.Route.RouterUrl
|
|
|
import com.shanp.youqi.common.base.BaseDialogFragment
|
|
|
import com.shanp.youqi.common.base.BaseViewHolder
|
|
@@ -29,15 +30,15 @@ class ConversationDialog : BaseDialogFragment() {
|
|
|
|
|
|
@JvmField
|
|
|
@Autowired(name = "targetId")
|
|
|
- var targetId: String = ""
|
|
|
+ var targetId: String? = ""
|
|
|
|
|
|
@JvmField
|
|
|
@Autowired(name = "targetUserName")
|
|
|
- var targetUserName: String = ""
|
|
|
+ var targetUserName: String? = ""
|
|
|
|
|
|
@JvmField
|
|
|
@Autowired(name = "targetHeadImg")
|
|
|
- var targetHeadImg: String = ""
|
|
|
+ var targetHeadImg: String? = ""
|
|
|
|
|
|
private lateinit var flContainer: FrameLayout
|
|
|
|
|
@@ -51,20 +52,25 @@ class ConversationDialog : BaseDialogFragment() {
|
|
|
setGravity(DialogGravity.BOTTOM)
|
|
|
setDimAmount(0.0f)
|
|
|
setWidthFull(true)
|
|
|
- setOutCancel(false)
|
|
|
+ setOutCancel(true)
|
|
|
}
|
|
|
|
|
|
- override fun onCreate(savedInstanceState: Bundle?) {
|
|
|
- super.onCreate(savedInstanceState)
|
|
|
- ARouter.getInstance().inject(this)
|
|
|
- }
|
|
|
|
|
|
override fun convert(holder: BaseViewHolder, dialog: BaseDialogFragment?) {
|
|
|
+ ARouter.getInstance().inject(this)
|
|
|
+ if (TextUtils.isEmpty(targetId)) {
|
|
|
+ ToastUtils.showShort("数据异常,请稍后再试")
|
|
|
+ this.dismiss()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ holder.setOnClickListener(R.id.rl_layout) {
|
|
|
+ this.dismiss()
|
|
|
+ }
|
|
|
upHeight = AutoSizeUtils.dp2px(mContext, 317.5f)
|
|
|
downHeight = AutoSizeUtils.dp2px(mContext, 402f)
|
|
|
currentHeight = downHeight
|
|
|
flContainer = holder.getView(R.id.fl_container_conversation)
|
|
|
- fragment.setParam(targetId, targetUserName, targetHeadImg)
|
|
|
+ fragment.setParam(targetId!!, targetUserName!!, targetHeadImg!!)
|
|
|
FragmentUtils.add(childFragmentManager, fragment, R.id.fl_container_conversation)
|
|
|
activity?.window?.let {
|
|
|
KeyboardUtils.registerSoftInputChangedListener(it) { height ->
|