diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomMentorShipFragment.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomMentorShipFragment.kt index b1830a82..e7375899 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomMentorShipFragment.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomMentorShipFragment.kt @@ -14,6 +14,7 @@ import com.xscm.modulemain.activity.room.contacts.MentorShipContacts import com.xscm.modulemain.activity.room.presenter.MentorShipPresenter import com.xscm.modulemain.databinding.FragmentMentorShipBinding import com.xscm.modulemain.dialog.DialogMentorShip +import com.xscm.modulemain.dialog.DialogSignType import com.xscm.modulemain.dialog.RoomOnlineDialogFragment import com.xscm.modulemain.dialog.RoomTalentDialog import com.xscm.modulemain.dialog.RoomUserInfoFragment @@ -71,6 +72,8 @@ class RoomMentorShipFragment(var mRoomInfo: RoomInfoResp?) : private var isStart = false + private var signTypeDialog: DialogSignType? = null + private val ivForMai = arrayOf( com.xscm.moduleutil.R.mipmap.icon_apply_for_mai, com.xscm.moduleutil.R.mipmap.icon_show_alent, @@ -87,6 +90,7 @@ class RoomMentorShipFragment(var mRoomInfo: RoomInfoResp?) : } override fun initData() { + signTypeDialog = DialogSignType(ActivityUtils.getTopActivity()) } override fun initView() { @@ -183,7 +187,7 @@ class RoomMentorShipFragment(var mRoomInfo: RoomInfoResp?) : } else { setIvForMai(0) } - }else{ + } else { setIvForMai(0) } mBinding.tvSignDay.visibility = View.VISIBLE @@ -230,7 +234,7 @@ class RoomMentorShipFragment(var mRoomInfo: RoomInfoResp?) : } } - private fun showBtn(isSignUser:Boolean = false) { + private fun showBtn(isSignUser: Boolean = false) { if (isStart) { mBinding.tvTimeLeft.text = startOrDelay[1] mBinding.tvTime.visibility = View.VISIBLE @@ -242,10 +246,10 @@ class RoomMentorShipFragment(var mRoomInfo: RoomInfoResp?) : mBinding.tvTimeLeft.visibility = View.INVISIBLE mBinding.tvTime.visibility = View.INVISIBLE mBinding.tvTimeRight.visibility = View.INVISIBLE - if (!isSignUser){ - mBinding.tvLeftPrice.text = "0" - mBinding.tvSignDay.visibility = View.GONE - } + if (!isSignUser) { + mBinding.tvLeftPrice.text = "0" + mBinding.tvSignDay.visibility = View.GONE + } mBinding.tvTime.text = "倒计时 00:00" setIvForMai(0) @@ -308,6 +312,10 @@ class RoomMentorShipFragment(var mRoomInfo: RoomInfoResp?) : val currBodyValue = messageEvent?.text?.current_body_value if (!mSignId.equals("-1")) { startTimer(endTime?.toLong()!!) + + signTypeDialog?.show(0) + + mBinding.tvTimeLeft.text = startOrDelay[1] mBinding.tvLeftPrice.text = currBodyValue mBinding.tvSignDay.visibility = View.VISIBLE @@ -363,8 +371,11 @@ class RoomMentorShipFragment(var mRoomInfo: RoomInfoResp?) : val fromUserInfo = messageEvent?.text?.fromUserInfo val toUserInfo = messageEvent?.text?.toUserInfo val signValue = messageEvent?.text?.sign_value - if (fromUserInfo != null && toUserInfo != null && signValue != null) { + if (fromUserInfo != null && toUserInfo != null && signValue != null) { + signTypeDialog?.show(1) + }else{ + signTypeDialog?.show(2) } } @@ -386,7 +397,7 @@ class RoomMentorShipFragment(var mRoomInfo: RoomInfoResp?) : if (dialogMentorShip == null) { dialogMentorShip = DialogMentorShip(ActivityUtils.getTopActivity()) } - dialogMentorShip?.show(list, mSignPitBean,walletBean, + dialogMentorShip?.show(list, mSignPitBean, walletBean, object : DialogMentorShip.OnItemClickListener { override fun onItemClick(coin: String) { MvpPre!!.signCoin(mSignId!!, coin) @@ -443,7 +454,7 @@ class RoomMentorShipFragment(var mRoomInfo: RoomInfoResp?) : } - // TODO: 清除个人魅力 + // TODO: 清除个人魅力 fun event1059(messageEvent: RoomMessageEvent) { val userId: String? = messageEvent.text.user_id if (mBinding.rmsw1.getUserId() != null && mBinding.rmsw1.getUserId().equals(userId)) { @@ -562,7 +573,6 @@ class RoomMentorShipFragment(var mRoomInfo: RoomInfoResp?) : viewList.clear() } - // 在Fragment销毁时记得清理资源 override fun onDestroy() { super.onDestroy() diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/DialogSignType.kt b/MainModule/src/main/java/com/xscm/modulemain/dialog/DialogSignType.kt new file mode 100644 index 00000000..ad1efde4 --- /dev/null +++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/DialogSignType.kt @@ -0,0 +1,60 @@ +package com.xscm.modulemain.dialog + +import android.content.Context +import android.view.View +import com.xscm.modulemain.R +import com.xscm.modulemain.databinding.DialogSignTypeBinding +import com.xscm.moduleutil.widget.dialog.BaseDialog + +class DialogSignType(context:Context) : BaseDialog(context){ + override fun getLayoutId(): Int { + return R.layout.dialog_sign_type + } + + override fun initView() { + mBinding.ivFailBtn.setOnClickListener { + dismiss() + } + + mBinding.ivStart.setOnClickListener { + dismiss() + } + + mBinding.ivSuccess.setOnClickListener { + dismiss() + } + mBinding.ivFailBg.setOnClickListener { + dismiss() + } + } + + override fun initData() { + + } + fun show(type:Int){ + super.show() + //0:开始 1：成功 2:失败 + when(type){ + 0 ->{ + mBinding.groupFail.visibility = View.GONE + mBinding.ivStart.visibility = View.VISIBLE + mBinding.ivSuccess.visibility = View.GONE + } + 1 ->{ + mBinding.groupFail.visibility = View.GONE + mBinding.ivStart.visibility = View.GONE + mBinding.ivSuccess.visibility = View.VISIBLE + } + 2 ->{ + mBinding.groupFail.visibility = View.VISIBLE + mBinding.ivStart.visibility = View.GONE + mBinding.ivSuccess.visibility = View.GONE + } + } + + window?.decorView?.postDelayed({ + dismiss() + }, 1000) + + } +} \ No newline at end of file diff --git a/MainModule/src/main/res/layout/dialog_sign_type.xml b/MainModule/src/main/res/layout/dialog_sign_type.xml new file mode 100644 index 00000000..45df4848 --- /dev/null +++ b/MainModule/src/main/res/layout/dialog_sign_type.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MainModule/src/main/res/mipmap-hdpi/icon_sign_fail_bg.png b/MainModule/src/main/res/mipmap-hdpi/icon_sign_fail_bg.png new file mode 100644 index 00000000..9f5cbcdb Binary files /dev/null and b/MainModule/src/main/res/mipmap-hdpi/icon_sign_fail_bg.png differ diff --git a/MainModule/src/main/res/mipmap-hdpi/icon_sign_fail_btn.png b/MainModule/src/main/res/mipmap-hdpi/icon_sign_fail_btn.png new file mode 100644 index 00000000..dd1af70e Binary files /dev/null and b/MainModule/src/main/res/mipmap-hdpi/icon_sign_fail_btn.png differ diff --git a/MainModule/src/main/res/mipmap-hdpi/icon_sign_start.png b/MainModule/src/main/res/mipmap-hdpi/icon_sign_start.png new file mode 100644 index 00000000..05a5c61b Binary files /dev/null and b/MainModule/src/main/res/mipmap-hdpi/icon_sign_start.png differ diff --git a/MainModule/src/main/res/mipmap-hdpi/icon_sign_success.png b/MainModule/src/main/res/mipmap-hdpi/icon_sign_success.png new file mode 100644 index 00000000..b87e233a Binary files /dev/null and b/MainModule/src/main/res/mipmap-hdpi/icon_sign_success.png differ diff --git a/MainModule/src/main/res/mipmap-xhdpi/icon_sign_fail_bg.png b/MainModule/src/main/res/mipmap-xhdpi/icon_sign_fail_bg.png new file mode 100644 index 00000000..9d53d8c3 Binary files /dev/null and b/MainModule/src/main/res/mipmap-xhdpi/icon_sign_fail_bg.png differ diff --git a/MainModule/src/main/res/mipmap-xhdpi/icon_sign_fail_btn.png b/MainModule/src/main/res/mipmap-xhdpi/icon_sign_fail_btn.png new file mode 100644 index 00000000..9058e77f Binary files /dev/null and b/MainModule/src/main/res/mipmap-xhdpi/icon_sign_fail_btn.png differ diff --git a/MainModule/src/main/res/mipmap-xhdpi/icon_sign_start.png b/MainModule/src/main/res/mipmap-xhdpi/icon_sign_start.png new file mode 100644 index 00000000..a9335807 Binary files /dev/null and b/MainModule/src/main/res/mipmap-xhdpi/icon_sign_start.png differ diff --git a/MainModule/src/main/res/mipmap-xhdpi/icon_sign_success.png b/MainModule/src/main/res/mipmap-xhdpi/icon_sign_success.png new file mode 100644 index 00000000..9a73031d Binary files /dev/null and b/MainModule/src/main/res/mipmap-xhdpi/icon_sign_success.png differ diff --git a/MainModule/src/main/res/mipmap-xxhdpi/icon_sign_fail_bg.png b/MainModule/src/main/res/mipmap-xxhdpi/icon_sign_fail_bg.png new file mode 100644 index 00000000..c6b40b43 Binary files /dev/null and b/MainModule/src/main/res/mipmap-xxhdpi/icon_sign_fail_bg.png differ diff --git a/MainModule/src/main/res/mipmap-xxhdpi/icon_sign_fail_btn.png b/MainModule/src/main/res/mipmap-xxhdpi/icon_sign_fail_btn.png new file mode 100644 index 00000000..cb6e2625 Binary files /dev/null and b/MainModule/src/main/res/mipmap-xxhdpi/icon_sign_fail_btn.png differ diff --git a/MainModule/src/main/res/mipmap-xxhdpi/icon_sign_start.png b/MainModule/src/main/res/mipmap-xxhdpi/icon_sign_start.png new file mode 100644 index 00000000..08796088 Binary files /dev/null and b/MainModule/src/main/res/mipmap-xxhdpi/icon_sign_start.png differ diff --git a/MainModule/src/main/res/mipmap-xxhdpi/icon_sign_success.png b/MainModule/src/main/res/mipmap-xxhdpi/icon_sign_success.png new file mode 100644 index 00000000..34ca3f14 Binary files /dev/null and b/MainModule/src/main/res/mipmap-xxhdpi/icon_sign_success.png differ