心愿单添加部分功能实现

live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java

@@ -42,6 +42,7 @@ import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.CommonAppContext;
 import com.yunbao.common.Constants;
 import com.yunbao.common.bean.AiAutomaticSpeechModel;
+import com.yunbao.common.bean.HttpCallbackModel;
 import com.yunbao.common.bean.IMLoginModel;
 import com.yunbao.common.bean.LinkMicUserBean;
 import com.yunbao.common.bean.LiveAiRobotBean;
@@ -50,6 +51,7 @@ import com.yunbao.common.bean.LiveUserGiftBean;
 import com.yunbao.common.bean.MicUserBean;
 import com.yunbao.common.bean.UserBean;
 import com.yunbao.common.dialog.NotCancelableDialog;
+import com.yunbao.common.event.LiveRobotMessageEvent;
 import com.yunbao.common.event.LoginInvalidEvent;
 import com.yunbao.common.http.CommonHttpConsts;
 import com.yunbao.common.http.CommonHttpUtil;
@@ -69,6 +71,8 @@ import com.yunbao.common.utils.MicStatusManager;
 import com.yunbao.common.utils.StringUtil;
 import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.utils.WordUtil;
+import com.yunbao.common.views.InputCustomPopup;
+import com.yunbao.common.views.LiveNewWishListPopup;
 import com.yunbao.common.views.LiveRobotSettingCustomPopup;
 import com.yunbao.faceunity.FaceManager;
 import com.yunbao.live.R;
@@ -568,10 +572,15 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
      * 打开心愿单窗口
      */
     public void openWishListWindow() {
-        LiveNewWishListDialogFragment fragment = new LiveNewWishListDialogFragment();
-        if (mContext instanceof LiveRyAnchorActivity) {
-            fragment.show(((LiveRyAnchorActivity) mContext).getSupportFragmentManager(), "LiveWishListDialogFragment");
-        }
+//        LiveNewWishListDialogFragment fragment = new LiveNewWishListDialogFragment();
+//        if (mContext instanceof LiveRyAnchorActivity) {
+//            fragment.show(((LiveRyAnchorActivity) mContext).getSupportFragmentManager(), "LiveWishListDialogFragment");
+//        }
+        new XPopup.Builder(mContext)
+                .enableDrag(false)
+                .asCustom(new LiveNewWishListPopup(LiveRyAnchorActivity.this))
+
+                .show();
     }
 
     //打开相机前执行

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

@@ -49,6 +49,7 @@ import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.utils.WordUtil;
 import com.yunbao.common.views.AbsViewHolder;
 import com.yunbao.common.views.LiveClarityCustomPopup;
+import com.yunbao.common.views.LiveNewWishListPopup;
 import com.yunbao.common.views.LiveOpenCustomPopup;
 import com.yunbao.common.views.LiveRobotSettingCustomPopup;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
@@ -612,12 +613,16 @@ public class LiveNewReadyRyViewHolder extends AbsViewHolder implements View.OnCl
      * 打开心愿单窗口
      */
     public void openWishListWindow() {
-        LiveNewWishListDialogFragment fragment = new LiveNewWishListDialogFragment();
-
-        if (mContext instanceof LiveRyAnchorActivity) {
-            fragment.show(((LiveRyAnchorActivity) mContext).getSupportFragmentManager(), "RY");
-
-        }
+//        LiveNewWishListDialogFragment fragment = new LiveNewWishListDialogFragment();
+//
+//        if (mContext instanceof LiveRyAnchorActivity) {
+//            fragment.show(((LiveRyAnchorActivity) mContext).getSupportFragmentManager(), "RY");
+//
+//        }
+        new XPopup.Builder(mContext)
+                .enableDrag(false)
+                .asCustom(new LiveNewWishListPopup((LiveRyAnchorActivity) mContext))
+                .show();
     }
 
     public void openAnchorSayDialog() {

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

@@ -44,6 +44,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.blankj.utilcode.util.SizeUtils;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.DataSource;
 import com.bumptech.glide.load.engine.GlideException;
@@ -1791,7 +1792,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                         mHotText.setGravity(Gravity.CENTER);
                         mHourRank.setGravity(Gravity.CENTER);
                         setHourRankData(info.get(0).getRank());
-                        hotPic.setImageResource(WordUtil.isZh() ? R.drawable.live_tags_hot : R.drawable.live_tags_hot_en);
+                        hotPic.setImageResource(R.drawable.icon_time_new);
                         hourPic.setImageResource(R.drawable.icon_heat_new);
                         hotPic.setLayoutParams(params);
                         hourPic.setLayoutParams(params);
@@ -4344,7 +4345,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
         });
         enterRoomLeave.post(() -> {
             enterRoomLeave.setVisibility(View.VISIBLE);
-            TranslateAnimation animationTranslate = new TranslateAnimation(enterRoomLeave.getMeasuredWidth(), 0, 0, 0);
+            TranslateAnimation animationTranslate = new TranslateAnimation(DeviceUtils.getScreenWidth((Activity) mContext), 0, 0, 0);
             AnimationSet animationSet1 = new AnimationSet(true);
             animationSet1.addAnimation(animationTranslate);
             animationSet1.setFillAfter(true);

live/src/main/res/layout/dialog_live_gift_wishlist.xml

@@ -172,8 +172,7 @@
             android:layout_marginTop="20dp"
             android:text="@string/live_gift_send_lian"
             android:textColor="@color/white"
-            android:textSize="12sp"
-            />
+            android:textSize="12sp" />
 
         <TextView
             android:id="@+id/lian_text"

live/src/main/res/layout/view_enter_room_leave.xml

@@ -17,7 +17,7 @@
         android:layout_marginTop="2dp"
         android:layout_marginBottom="2dp"
         android:layout_gravity="center_vertical"
-        android:layout_marginStart="6dp"
+        android:layout_marginStart="3dp"
         android:gravity="center_vertical">
 
         <ImageView