优化弹窗

MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomMentorShipFragment.kt

@@ -1,6 +1,7 @@
 package com.xscm.modulemain.activity.room.fragment
 
 import android.annotation.SuppressLint
+import android.os.Bundle
 import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
@@ -8,19 +9,20 @@ import android.widget.PopupWindow
 import android.widget.Switch
 import android.widget.TextView
 import com.blankj.utilcode.util.ActivityUtils
-import com.blankj.utilcode.util.LogUtils
 import com.xscm.modulemain.R
 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.RoomAuctionWebViewDialog
 import com.xscm.modulemain.dialog.RoomOnlineDialogFragment
 import com.xscm.modulemain.dialog.RoomTalentDialog
 import com.xscm.modulemain.dialog.RoomUserInfoFragment
 import com.xscm.modulemain.utils.CountdownTimer
 import com.xscm.modulemain.widget.RoomMentorShipWheatView
 import com.xscm.moduleutil.base.BaseMvpFragment
+import com.xscm.moduleutil.base.CommonAppContext
 import com.xscm.moduleutil.bean.RoomMessageEvent
 import com.xscm.moduleutil.bean.UserInfo
 import com.xscm.moduleutil.bean.WalletBean
@@ -175,6 +177,7 @@ class RoomMentorShipFragment(var mRoomInfo: RoomInfoResp?) :
         mBinding.ivApplyForMai.setOnClickListener(this)
         mBinding.tvTimeLeft.setOnClickListener(this)
         mBinding.tvTimeRight.setOnClickListener(this)
+        mBinding.ivHelp.setOnClickListener(this)
 
         if (mRoomInfo?.sign_info?.sign_id != "-1") {
             mSignId = mRoomInfo?.sign_info?.sign_id
@@ -194,12 +197,10 @@ class RoomMentorShipFragment(var mRoomInfo: RoomInfoResp?) :
             mBinding.tvLeftPrice.text = mRoomInfo?.sign_info?.current_body_value.toString()
 
             mBinding.tvSignDay.text = "签约${mRoomInfo?.sign_info?.sign_day}天"
-
-
         } else {
-            showBtn()
             setIvForMai(0)
         }
+        showBtn()
     }
 
     override fun onClick(v: View?) {
@@ -231,6 +232,17 @@ class RoomMentorShipFragment(var mRoomInfo: RoomInfoResp?) :
             R.id.tv_time_right -> {
                 MvpPre.signEnd(mSignId!!)
             }
+            R.id.iv_help -> {
+                //签约规则
+                val bundle = Bundle()
+                bundle.putString(
+                    "url",
+                    CommonAppContext.getInstance()
+                        .getCurrentEnvironment().serverUrl + "api/Page/page_show?id=29"
+                )
+                val dialog = RoomAuctionWebViewDialog(ActivityUtils.getTopActivity(), bundle)
+                dialog.show()
+            }
         }
     }
 
@@ -238,6 +250,7 @@ class RoomMentorShipFragment(var mRoomInfo: RoomInfoResp?) :
         if (isStart) {
             mBinding.tvTimeLeft.text = startOrDelay[1]
             mBinding.tvTime.visibility = View.VISIBLE
+            mBinding.groupLeftPrice.visibility = View.VISIBLE
             if (getHostUser() < 4) {
                 mBinding.tvTimeRight.visibility = View.VISIBLE
             }
@@ -246,6 +259,7 @@ class RoomMentorShipFragment(var mRoomInfo: RoomInfoResp?) :
             mBinding.tvTimeLeft.visibility = View.INVISIBLE
             mBinding.tvTime.visibility = View.INVISIBLE
             mBinding.tvTimeRight.visibility = View.INVISIBLE
+            mBinding.groupLeftPrice.visibility = View.INVISIBLE
             if (!isSignUser) {
                 mBinding.tvLeftPrice.text = "0"
                 mBinding.tvSignDay.visibility = View.GONE

MainModule/src/main/java/com/xscm/modulemain/dialog/DialogSignType.kt

@@ -1,12 +1,26 @@
 package com.xscm.modulemain.dialog
 
 import android.content.Context
+import android.view.Gravity
 import android.view.View
+import android.view.ViewGroup
 import com.xscm.modulemain.R
 import com.xscm.modulemain.databinding.DialogSignTypeBinding
 import com.xscm.moduleutil.widget.dialog.BaseDialog
 
 class DialogSignType(context:Context) : BaseDialog<DialogSignTypeBinding>(context){
+    init {
+        window?.apply {
+            setGravity(Gravity.TOP)
+            attributes = attributes.apply {
+                y = 400
+            }
+        }
+
+
+    }
+
+
     override fun getLayoutId(): Int {
         return R.layout.dialog_sign_type
     }
@@ -54,7 +68,9 @@ class DialogSignType(context:Context) : BaseDialog<DialogSignTypeBinding>(contex
 
         window?.decorView?.postDelayed({
             dismiss()
-        }, 1000)
+        }, 1500)
 
     }
+
+
 }

MainModule/src/main/res/layout/dialog_sign_type.xml

@@ -55,7 +55,7 @@
             android:id="@+id/iv_start"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@mipmap/icon_sign_start"
+            android:src="@mipmap/iv_start"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"

MainModule/src/main/res/layout/fragment_mentor_ship.xml

@@ -37,18 +37,27 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/gl_top" />
 
+        <ImageView
+            android:id="@+id/iv_help"
+            android:paddingEnd="@dimen/dp_10"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@mipmap/icon_heart_help"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@id/gl_top" />
+
 
         <TextView
             android:id="@+id/tv_time"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:text="倒计时 00:00"
             android:textColor="@color/white"
             android:textSize="@dimen/sp_12"
             android:visibility="invisible"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_title"
+            app:layout_constraintTop_toBottomOf="@id/tv_title" />
-            android:text="倒计时 00:00" />
 
         <TextView
             android:id="@+id/tv_time_left"
@@ -133,6 +142,12 @@
             android:orientation="horizontal"
             app:layout_constraintGuide_percent="0.25" />
 
+        <androidx.constraintlayout.widget.Group
+            android:id="@+id/group_left_price"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:constraint_referenced_ids="view_left_price,iv_left_price_gold_bg,tv_left_price_top,tv_left_price" />
+
 
         <View
             android:id="@+id/view_left_price"