礼物的弹窗UI进行修改

common/src/main/java/com/yunbao/common/dialog/AbsDialogFragment.java

@@ -67,7 +67,7 @@ public abstract class AbsDialogFragment extends DialogFragment {
 
     protected abstract void setWindowAttributes(Window window);
 
-    protected View findViewById(int id) {
+    protected  <T extends View> T findViewById(int id) {
         if (mRootView != null) {
             return mRootView.findViewById(id);
         }

common/src/main/res/layout/dialog_live_gift_popup2.xml

@@ -13,11 +13,11 @@
         android:id="@+id/giftBg"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_marginTop="-20dp"
+        android:layout_marginTop="-14dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/lvTipsTv"
+        app:layout_constraintTop_toTopOf="@+id/openVipBg"
         tools:background="@drawable/bg_gift_bottom_bg" />
     <!--底部送礼选择数量备份 -->
     <View
@@ -51,12 +51,13 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
-        android:src="@mipmap/ic_gift_righit_arrow"
+        android:src="@mipmap/ic_gift_right_arrow"
         app:layout_constraintBottom_toBottomOf="@+id/giftSendBgV"
         app:layout_constraintEnd_toStartOf="@+id/liveGiftSend"
         app:layout_constraintTop_toTopOf="@+id/giftSendBgV" />
 
     <TextView
+        android:id="@+id/liveGiftSendTv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textColor="@color/white"
@@ -67,6 +68,15 @@
         app:layout_constraintStart_toStartOf="@+id/giftSendBgV"
         app:layout_constraintTop_toTopOf="@+id/giftSendBgV"
         tools:text="999" />
+
+    <androidx.constraintlayout.widget.Group
+        android:id="@+id/giftSendGroup"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        app:constraint_referenced_ids="giftSendBgV,liveGiftSend,liveGiftImg,liveGiftSendTv"
+        tools:visibility="visible" />
+
     <!--底部钻石数量 -->
     <ImageView
         android:id="@+id/diamondImg"
@@ -95,7 +105,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="2dp"
-        android:src="@mipmap/ic_gift_righit_arrow"
+        android:src="@mipmap/ic_gift_right_arrow"
         app:layout_constraintBottom_toBottomOf="@+id/diamondImg"
         app:layout_constraintStart_toEndOf="@+id/diamondNumberTv"
         app:layout_constraintTop_toTopOf="@+id/diamondImg" />
@@ -104,12 +114,12 @@
         android:id="@+id/diamondClickView"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_marginTop="4dp"
-        android:layout_marginBottom="4dp"
-        app:layout_constraintBottom_toBottomOf="@+id/giftSendBgV"
+        android:layout_marginTop="-4dp"
+        android:layout_marginBottom="-4dp"
+        app:layout_constraintBottom_toBottomOf="@+id/diamondImg"
         app:layout_constraintEnd_toEndOf="@+id/diamondGoImg"
         app:layout_constraintStart_toStartOf="@+id/diamondImg"
-        app:layout_constraintTop_toTopOf="@+id/giftSendBgV"
+        app:layout_constraintTop_toTopOf="@+id/diamondImg"
         tools:visibility="gone" />
 
     <!--底部金豆数量 -->
@@ -136,17 +146,19 @@
         tools:text="28000000" />
 
     <!--礼物列表 -->
+
+    <!--礼物栏的Title -->
+    <!--顶部Warp -->
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/giftRecyclerView"
         android:layout_width="0dp"
         android:layout_height="234dp"
-        android:layout_marginBottom="8dp"
+        android:layout_marginBottom="16dp"
         app:layout_constraintBottom_toTopOf="@+id/giftSendBgV"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="1.0"
         app:layout_constraintStart_toStartOf="parent" />
 
-    <!--礼物栏的Title -->
-    <!--顶部Warp -->
     <TextView
         android:id="@+id/giftWrapTv"
         android:layout_width="wrap_content"
@@ -207,12 +219,20 @@
         app:layout_constraintStart_toStartOf="parent"
         tools:text="LV.8" />
 
-    <TextView
+    <com.yunbao.common.views.weight.MarqueeTextView
         android:id="@+id/lvTipsTv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="7dp"
         android:layout_marginTop="-1dp"
+        android:ellipsize="marquee"
+        android:focusable="true"
+        android:maxWidth="220dp"
+        android:focusableInTouchMode="true"
+        android:gravity="center"
+        android:marqueeRepeatLimit="marquee_forever"
+        android:scrollHorizontally="true"
+        android:singleLine="true"
         android:textColor="@color/white"
         android:textSize="10sp"
         app:layout_constraintStart_toEndOf="@+id/lvTitleTv"
@@ -220,10 +240,11 @@
         tools:text="升至LV.9还需13000,00经验值" />
 
     <ImageView
+        android:id="@+id/lvTipsImg"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="2dp"
-        android:src="@mipmap/ic_gift_righit_arrow"
+        android:src="@mipmap/ic_gift_right_arrow"
         app:layout_constraintBottom_toBottomOf="@+id/lvTipsTv"
         app:layout_constraintStart_toEndOf="@+id/lvTipsTv"
         app:layout_constraintTop_toTopOf="@+id/lvTipsTv" />
@@ -242,45 +263,103 @@
         app:layout_constraintWidth_percent="0.54"
         tools:progress="10" />
 
+    <View
+        android:id="@+id/giftLevelClickV"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="@+id/week_progressbar"
+        app:layout_constraintEnd_toEndOf="@+id/week_progressbar"
+        app:layout_constraintStart_toStartOf="@+id/lvTitleTv"
+        app:layout_constraintTop_toTopOf="@+id/lvTipsTv"
+        tools:visibility="gone" />
+
+    <androidx.constraintlayout.widget.Group
+        android:id="@+id/giftLevelGroup"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="visible"
+        app:constraint_referenced_ids="lvTitleTv,lvTipsTv,lvTipsImg,week_progressbar,giftLevelClickV"
+        tools:visibility="visible" />
+
+
     <!--开通贵族 -->
     <TextView
         android:id="@+id/openVipTv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="开通贵族"
+        android:layout_marginBottom="16dp"
+        android:text="@string/open_vip_live"
         android:textColor="@color/white"
         android:textSize="11sp"
-        app:layout_constraintBottom_toBottomOf="@+id/lvTitleTv"
+        app:layout_constraintBottom_toTopOf="@+id/giftWrapTv"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.68"
-        app:layout_constraintStart_toEndOf="@+id/week_progressbar"
-        app:layout_constraintTop_toTopOf="@+id/lvTitleTv" />
+        app:layout_constraintHorizontal_bias="0.935"
+        app:layout_constraintStart_toStartOf="parent" />
 
     <ImageView
         android:id="@+id/openVipImg"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="2dp"
+        android:maxWidth="29dp"
         android:src="@mipmap/ic_open_noble_3"
         app:layout_constraintBottom_toBottomOf="@+id/openVipTv"
         app:layout_constraintEnd_toStartOf="@+id/openVipTv"
         app:layout_constraintTop_toTopOf="@+id/openVipTv" />
 
+    <ImageView
+        android:id="@+id/openVipArrowImg"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="2dp"
+        android:src="@mipmap/ic_gift_right_arrow"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@+id/openVipTv"
+        app:layout_constraintStart_toEndOf="@+id/openVipTv"
+        app:layout_constraintTop_toTopOf="@+id/openVipTv" />
+
     <View
         android:id="@+id/openVipBg"
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_marginStart="-6dp"
         android:layout_marginTop="-4dp"
-        android:layout_marginEnd="-6dp"
-        android:layout_marginBottom="-4dp"
+        android:layout_marginEnd="-7dp"
+        android:layout_marginBottom="-7dp"
         android:background="@drawable/bg_gift_openvip"
-        app:layout_constraintBottom_toBottomOf="@+id/openVipTv"
-        app:layout_constraintEnd_toEndOf="@+id/openVipTv"
+        app:layout_constraintBottom_toBottomOf="@+id/openVipImg"
+        app:layout_constraintEnd_toEndOf="@+id/openVipArrowImg"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="@+id/openVipImg"
-        app:layout_constraintTop_toTopOf="@+id/openVipTv" />
+        app:layout_constraintTop_toTopOf="@+id/openVipTv"
+        app:layout_constraintVertical_bias="1.0" />
 
-    <!-- 连击 -->
+    <!--礼物描述 -->
+    <com.yunbao.common.views.weight.MarqueeTextView
+        android:id="@+id/gift_description"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginStart="15dp"
+        android:layout_marginEnd="16dp"
+        android:ellipsize="marquee"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:gravity="center"
+        android:marqueeRepeatLimit="marquee_forever"
+        android:scrollHorizontally="true"
+        android:singleLine="true"
+        android:textColor="#80FFFFFF"
+        android:textSize="12sp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@+id/openVipBg"
+        app:layout_constraintEnd_tostartOf="@+id/openVipBg"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintWidth_percent="0.7"
+        tools:text="描述信信息描述信信息描述信信息描述信信息描述信信息描述信信息描述信信息描述信信息描述信信息描述信信息描述信信息" />
+
+
+    <!--  礼物连击 -->
     <ImageView
         android:id="@+id/continuousClicksBg"
         android:layout_width="0dp"
@@ -361,26 +440,26 @@
     <!--赞助信息 -->
     <ImageView
         android:id="@+id/giftSponsorBgImg"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
         android:layout_width="0dp"
         android:layout_height="28dp"
-        android:layout_marginBottom="5dp"
         android:layout_marginStart="25dp"
         android:layout_marginEnd="25dp"
+        android:layout_marginBottom="5dp"
         android:scaleType="fitXY"
+        android:src="@mipmap/background_live_gift_gift_itle"
         app:layout_constraintBottom_toTopOf="@+id/giftBg"
-        android:src="@mipmap/background_live_gift_gift_itle" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
 
     <ImageView
         android:id="@+id/gift_itle"
         android:layout_width="54dp"
         android:layout_height="13dp"
         android:layout_marginStart="13dp"
-        app:layout_constraintTop_toTopOf="@+id/giftSponsorBgImg"
+        android:src="@mipmap/icon_live_gift_gift_itle"
         app:layout_constraintBottom_toBottomOf="@+id/giftSponsorBgImg"
         app:layout_constraintStart_toStartOf="@+id/giftSponsorBgImg"
-        android:src="@mipmap/icon_live_gift_gift_itle" />
+        app:layout_constraintTop_toTopOf="@+id/giftSponsorBgImg" />
 
     <com.makeramen.roundedimageview.RoundedImageView
         android:id="@+id/naming_avatar"
@@ -390,9 +469,9 @@
         android:layout_marginStart="6dp"
         android:scaleType="centerCrop"
         android:src="@drawable/m_chu_xia"
-        app:layout_constraintTop_toTopOf="@+id/giftSponsorBgImg"
         app:layout_constraintBottom_toBottomOf="@+id/giftSponsorBgImg"
         app:layout_constraintStart_toEndOf="@+id/gift_itle"
+        app:layout_constraintTop_toTopOf="@+id/giftSponsorBgImg"
         app:riv_oval="true" />
 
     <com.yunbao.common.views.weight.MarqueeTextView
@@ -411,13 +490,14 @@
         android:scrollHorizontally="true"
         android:singleLine="true"
         android:textColor="#FFFFFFFF"
-        app:layout_constraintTop_toTopOf="@+id/giftSponsorBgImg"
+        android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="@+id/giftSponsorBgImg"
-        app:layout_constraintStart_toEndOf="@+id/naming_avatar"
         app:layout_constraintEnd_toEndOf="@+id/giftSponsorBgImg"
-        android:textSize="12sp" />
+        app:layout_constraintStart_toEndOf="@+id/naming_avatar"
+        app:layout_constraintTop_toTopOf="@+id/giftSponsorBgImg" />
 
     <androidx.constraintlayout.widget.Group
+        android:id="@+id/giftSponsorGroup"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:visibility="gone"
@@ -425,5 +505,4 @@
         tools:visibility="visible" />
 
 
-
 </androidx.constraintlayout.widget.ConstraintLayout>

common/src/main/res/values/strings.xml

@@ -1447,4 +1447,5 @@ Limited ride And limited avatar frame</string>
     <string name="live_interaction_game">Game</string>
     <string name="live_interaction_god_say">Notice</string>
     <string name="live_interaction_ask_question">Start Q&amp;A</string>
+    <string name="open_vip_live">开通贵族</string>
 </resources>

live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java

@@ -495,7 +495,6 @@ public class LiveGiftPopup extends AbsDialogFragment {
                 }
             }
         } else {
-
             JSONObject obj2 = liveGiftList.getJSONObject(0);
             String giftJson = obj2.getString("giftlist");
             transaction = getTransaction();
@@ -505,8 +504,6 @@ public class LiveGiftPopup extends AbsDialogFragment {
             transaction.replace(R.id.context_layout_gift, contentFragment);
             transaction.commitAllowingStateLoss();
         }
-
-
     }
 
     /**
@@ -1181,7 +1178,6 @@ public class LiveGiftPopup extends AbsDialogFragment {
         }
     };
     public List<BlindBoxInfoModel> blindBoxInfoModels = new ArrayList<>();
-
     private void getBlindBoxInfo() {
         LiveNetManager.get(mContext)
                 .getBlindBoxInfo(new com.yunbao.common.http.base.HttpCallback<List<BlindBoxInfoModel>>() {
@@ -1204,7 +1200,6 @@ public class LiveGiftPopup extends AbsDialogFragment {
      */
     private StringBuffer blindGiftNamesBuffer = null;
     private int blindBoxType;
-
     private void showBlindProgress(int blindBoxType) {
         this.blindBoxType = blindBoxType;
         blindGiftNamesBuffer = new StringBuffer();

live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java

@@ -1286,7 +1286,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
 
     public void showH5Dialog() {
         Bundle bundle = new Bundle();
-        bundle.putString("url", CommonAppConfig.HOST + "/h5/activity/pdlNewUes/index.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken());
+        bundle.putString("url", CommonAppConfig.HOST + "/h5/activity/pdlNewUes/index.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()+"&app_from=PDL");
         LiveHDDialogFragment fragment = new LiveHDDialogFragment();
         fragment.setArguments(bundle);
         fragment.show(((LiveActivity) mContext).getSupportFragmentManager(), "LiveHDDialogFragment");