6.5.4礼物栏优化

common/build.gradle

@@ -194,5 +194,6 @@ dependencies {
     //选择器
     api 'com.github.gzu-liyujiang.AndroidPicker:Common:4.1.11'
     api 'com.github.gzu-liyujiang.AndroidPicker:WheelView:4.1.11'
-
+    //自定义圆角图片
+    api 'com.makeramen:roundedimageview:2.3.0'
 }

common/src/main/java/com/yunbao/common/adapter/GiftNumberAdapter.java

@@ -0,0 +1,40 @@
+package com.yunbao.common.adapter;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.yunbao.common.R;
+import com.yunbao.common.bean.GiftQuantityModel;
+import com.yunbao.common.views.GiftNumber;
+
+import java.util.List;
+
+public class GiftNumberAdapter extends RecyclerView.Adapter {
+    private List<GiftQuantityModel> giftQuantityModels;
+
+    public GiftNumberAdapter(List<GiftQuantityModel> giftQuantityModels) {
+        this.giftQuantityModels = giftQuantityModels;
+    }
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View robotSayHelloView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_gift_number, parent, false);
+        return new GiftNumber(robotSayHelloView);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+        GiftNumber giftNumber = (GiftNumber) holder;
+        giftNumber.showData(giftQuantityModels.get(position));
+    }
+
+    @Override
+    public int getItemCount() {
+        return giftQuantityModels.size();
+    }
+}

common/src/main/java/com/yunbao/common/bean/GiftQuantityModel.java

@@ -0,0 +1,43 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * 礼物选择数量
+ */
+public class GiftQuantityModel extends BaseModel {
+
+    @SerializedName("id")
+    private String id;
+    @SerializedName("gift_quantity")
+    private String giftQuantity;
+    @SerializedName("font_colour")
+    private String fontColour;
+
+    public String getId() {
+        return id;
+    }
+
+    public GiftQuantityModel setId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getGiftQuantity() {
+        return giftQuantity;
+    }
+
+    public GiftQuantityModel setGiftQuantity(String giftQuantity) {
+        this.giftQuantity = giftQuantity;
+        return this;
+    }
+
+    public String getFontColour() {
+        return fontColour;
+    }
+
+    public GiftQuantityModel setFontColour(String fontColour) {
+        this.fontColour = fontColour;
+        return this;
+    }
+}

common/src/main/java/com/yunbao/common/bean/LiveGiftBean.java

@@ -23,7 +23,7 @@ public class LiveGiftBean {
     private String name;
     private String price;
     private String icon;
-    private boolean checked;
+    private boolean checked = false;
     private int page;
     private View mView;
     private String sendType;//支付是金币还是钻石
@@ -36,6 +36,30 @@ public class LiveGiftBean {
     private String tag;
     @JSONField(name = "blind_box_type")
     private int blind_box_type = 0;
+    //礼物角标
+
+    @JSONField(name = "corner_mark")
+    private String cornerMark;
+    @JSONField(name = "gift_description")
+    private String giftDescription;
+
+    public String getGiftDescription() {
+        return giftDescription;
+    }
+
+    public LiveGiftBean setGiftDescription(String giftDescription) {
+        this.giftDescription = giftDescription;
+        return this;
+    }
+
+    public String getCornerMark() {
+        return cornerMark;
+    }
+
+    public LiveGiftBean setCornerMark(String cornerMark) {
+        this.cornerMark = cornerMark;
+        return this;
+    }
 
     public int getBlind_box_type() {
         return blind_box_type;

common/src/main/java/com/yunbao/common/event/GiftNumberEvent.java

@@ -0,0 +1,16 @@
+package com.yunbao.common.event;
+
+import com.yunbao.common.bean.BaseModel;
+
+public class GiftNumberEvent extends BaseModel {
+    private String mCount;
+
+    public String getmCount() {
+        return mCount;
+    }
+
+    public GiftNumberEvent setmCount(String mCount) {
+        this.mCount = mCount;
+        return this;
+    }
+}

common/src/main/java/com/yunbao/common/glide/ImgLoader.java

@@ -336,6 +336,18 @@ public class ImgLoader {
         builder.into(imageView);
     }
 
+    public static void displayBlurLive(Context context, int url, ImageView imageView) {
+        if (!contextIsExist(context)) {
+            return;
+        }
+        RequestBuilder<Drawable> builder = Glide.with(context)
+                .load(url)
+                .thumbnail(thumbnail)
+                .apply(RequestOptions.bitmapTransform(new BlurTransformation(20)))
+                .placeholder(R.mipmap.live_bg);
+        builder.into(imageView);
+    }
+
     private static boolean contextIsExist(Context context) {
         if (context == null) {
             return false;

common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java

@@ -19,13 +19,13 @@ import com.yunbao.common.bean.ConfigBean;
 import com.yunbao.common.event.FollowEvent;
 import com.yunbao.common.interfaces.CommonCallback;
 import com.yunbao.common.manager.APKManager;
+import com.yunbao.common.manager.GiftQuantityManager;
 import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.manager.LiveClassManager;
 import com.yunbao.common.manager.NewLevelManager;
 import com.yunbao.common.utils.AppManager;
 import com.yunbao.common.utils.DialogUitl;
 import com.yunbao.common.utils.L;
-import com.yunbao.common.utils.MD5Util;
 import com.yunbao.common.utils.SpUtil;
 import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.utils.VersionUtil;
@@ -231,6 +231,10 @@ public class CommonHttpUtil {
                                 if (obj.containsKey("defaultBubbleUrl")) {
                                     IMLoginManager.get(context).setDefaultBubbleUrl(obj.getString("defaultBubbleUrl"));
                                 }
+                                if (obj.containsKey("gift_quantity")) {
+                                    JSONArray giftQuantity = obj.getJSONArray("gift_quantity");
+                                    new GiftQuantityManager(context).UpGiftQuantity(giftQuantity.toJSONString());
+                                }
                             } catch (Exception e) {
                                 e.printStackTrace();
                                 String error = "info[0]:" + info[0] + "\n\n\n" + "Exception:" + e.getClass() + "---message--->" + e.getMessage();

common/src/main/java/com/yunbao/common/http/PDLiveApi.java

@@ -829,4 +829,5 @@ public interface PDLiveApi {
             @Query("stream") String stream,
             @Query("red_packet_id") String redPacketId
     );
+
 }

common/src/main/java/com/yunbao/common/manager/GiftQuantityManager.java

@@ -0,0 +1,53 @@
+package com.yunbao.common.manager;
+
+import android.content.Context;
+
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import com.yunbao.common.bean.GiftQuantityModel;
+import com.yunbao.common.bean.LiveClassBean;
+import com.yunbao.common.manager.base.BaseCacheManager;
+
+import java.util.List;
+
+public class GiftQuantityManager extends BaseCacheManager {
+    private final static String KEY_GIFT_QUANTITY = "GiftQuantity";
+    private static GiftQuantityManager manager;
+    private Context context;
+    private List<GiftQuantityModel> giftQuantityModels;
+
+    public GiftQuantityManager(Context context) {
+        super(context);
+    }
+
+    /**
+     * 获取指导员备注信息
+     *
+     * @return
+     */
+    public List<GiftQuantityModel> getGiftQuantity() {
+        List<GiftQuantityModel> giftQuantityModels = getList(KEY_GIFT_QUANTITY, new TypeToken<List<GiftQuantityModel>>() {
+        }.getType());
+        if (giftQuantityModels == null || giftQuantityModels.size() == 0) {
+            giftQuantityModels.add(new GiftQuantityModel().setGiftQuantity("1").setFontColour("#ffffff"));
+            giftQuantityModels.add(new GiftQuantityModel().setGiftQuantity("10").setFontColour("#ffffff"));
+            giftQuantityModels.add(new GiftQuantityModel().setGiftQuantity("66").setFontColour("#ffffff"));
+            giftQuantityModels.add(new GiftQuantityModel().setGiftQuantity("88").setFontColour("#FA62A1"));
+            giftQuantityModels.add(new GiftQuantityModel().setGiftQuantity("100").setFontColour("#9B62FF"));
+            giftQuantityModels.add(new GiftQuantityModel().setGiftQuantity("520").setFontColour("#65BFFB"));
+            giftQuantityModels.add(new GiftQuantityModel().setGiftQuantity("1314").setFontColour("#05F3EC"));
+        }
+        return giftQuantityModels;
+    }
+
+    /**
+     * 缓存等级图标
+     *
+     * @param json
+     */
+    public void UpGiftQuantity(String json) {
+        giftQuantityModels = new Gson().fromJson(json, new TypeToken<List<GiftQuantityModel>>() {
+        }.getType());
+        put(KEY_GIFT_QUANTITY, giftQuantityModels);
+    }
+}

common/src/main/java/com/yunbao/common/utils/BlurBitmapUtil.java

@@ -0,0 +1,56 @@
+package com.yunbao.common.utils;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.renderscript.Allocation;
+import android.renderscript.Element;
+import android.renderscript.RenderScript;
+import android.renderscript.ScriptIntrinsicBlur;
+
+/**
+ * Created by L on 2017/10/12.
+ */
+
+public class BlurBitmapUtil {
+    /**
+     * 图片缩放比例
+     */
+    private static final float BITMAP_SCALE = 0.4f;
+    /**
+     * 最大模糊度(在0.0到25.0之间)
+     */
+    private static final float BLUR_RADIUS = 25f;
+    /**
+     * 模糊图片的具体方法
+     *
+     * @param context   上下文对象
+     * @param image     需要模糊的图片
+     * @return          模糊处理后的图片
+     */
+    public static Bitmap blur(Context context, Bitmap image) {
+        // 计算图片缩小后的长宽
+        int width = Math.round(image.getWidth() * BITMAP_SCALE);
+        int height = Math.round(image.getHeight() * BITMAP_SCALE);
+        // 将缩小后的图片做为预渲染的图片。
+        Bitmap inputBitmap = Bitmap.createScaledBitmap(image, width, height, false);
+        // 创建一张渲染后的输出图片。
+        Bitmap outputBitmap = Bitmap.createBitmap(inputBitmap);
+        // 创建RenderScript内核对象
+        RenderScript rs = RenderScript.create(context);
+        // 创建一个模糊效果的RenderScript的工具对象
+        ScriptIntrinsicBlur blurScript = ScriptIntrinsicBlur.create(rs, Element.U8_4(rs));
+        // 由于RenderScript并没有使用VM来分配内存,所以需要使用Allocation类来创建和分配内存空间。
+        // 创建Allocation对象的时候其实内存是空的,需要使用copyTo()将数据填充进去。
+        Allocation tmpIn = Allocation.createFromBitmap(rs, inputBitmap);
+        Allocation tmpOut = Allocation.createFromBitmap(rs, outputBitmap);
+        // 设置渲染的模糊程度, 25f是最大模糊度
+        blurScript.setRadius(BLUR_RADIUS);
+        // 设置blurScript对象的输入内存
+        blurScript.setInput(tmpIn);
+        // 将输出数据保存到输出内存中
+        blurScript.forEach(tmpOut);
+        // 将数据填充到Allocation中
+        tmpOut.copyTo(outputBitmap);
+        return outputBitmap;
+    }
+}

common/src/main/java/com/yunbao/common/views/CustomDrawerPopupView.java

@@ -139,7 +139,7 @@ public class CustomDrawerPopupView extends DrawerPopupView {
         ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.online), new ViewClicksAntiShake.ViewClicksCallBack() {
             @Override
             public void onViewClicks() {
-                XPopup.Builder builder = new XPopup.Builder(getContext()).atView(findViewById(R.id.more_menu));
+                XPopup.Builder builder = new XPopup.Builder(getContext()).atView(findViewById(R.id.diamond_linear));
                 builder.hasShadowBg(false)
                         .isDestroyOnDismiss(true)
                         .isLightStatusBar(false)

common/src/main/java/com/yunbao/common/views/GiftNumber.java

@@ -0,0 +1,34 @@
+package com.yunbao.common.views;
+
+import android.graphics.Color;
+import android.view.View;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.yunbao.common.R;
+import com.yunbao.common.bean.GiftQuantityModel;
+import com.yunbao.common.event.GiftNumberEvent;
+import com.yunbao.common.utils.Bus;
+import com.yunbao.common.views.weight.ViewClicksAntiShake;
+
+public class GiftNumber extends RecyclerView.ViewHolder {
+    private TextView customQuantity;
+
+    public GiftNumber(@NonNull View itemView) {
+        super(itemView);
+        customQuantity = itemView.findViewById(R.id.custom_quantity);
+    }
+
+    public void showData(GiftQuantityModel quantityModel) {
+        customQuantity.setText(quantityModel.getGiftQuantity());
+        customQuantity.setTextColor(Color.parseColor(quantityModel.getFontColour()));
+        ViewClicksAntiShake.clicksAntiShake(customQuantity, new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                Bus.get().post(new GiftNumberEvent().setmCount(quantityModel.getGiftQuantity()));
+            }
+        });
+    }
+}

common/src/main/java/com/yunbao/common/views/GiftNumberPopup.java

@@ -0,0 +1,59 @@
+package com.yunbao.common.views;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.lxj.xpopup.core.BottomPopupView;
+import com.yunbao.common.R;
+import com.yunbao.common.adapter.GiftNumberAdapter;
+import com.yunbao.common.event.GiftNumberEvent;
+import com.yunbao.common.manager.GiftQuantityManager;
+import com.yunbao.common.utils.Bus;
+import com.yunbao.common.views.weight.ViewClicksAntiShake;
+
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
+public class GiftNumberPopup extends BottomPopupView {
+    public GiftNumberPopup(@NonNull Context context) {
+        super(context);
+    }
+
+    // 返回自定义弹窗的布局
+    @Override
+    protected int getImplLayoutId() {
+        return R.layout.view_live_gift_number;
+    }
+
+    // 执行初始化操作，比如：findView，设置点击，或者任何你弹窗内的业务逻辑
+    @Override
+    protected void onCreate() {
+        Bus.getOn(this);
+        super.onCreate();
+        RecyclerView giftList = findViewById(R.id.gift_list);
+        giftList.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.VERTICAL, false));
+        GiftNumberAdapter giftNumberAdapter = new GiftNumberAdapter(new GiftQuantityManager(getContext()).getGiftQuantity());
+        giftList.setAdapter(giftNumberAdapter);
+        ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.to_can), new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                dismiss();
+            }
+        });
+    }
+
+    @Override
+    protected void onDismiss() {
+        super.onDismiss();
+        Bus.getOff(this);
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onGiftNumberEvent(GiftNumberEvent event) {
+        dismiss();
+    }
+
+}

common/src/main/res/drawable/backgroud_custom_gift.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners
+        android:topLeftRadius="8dp"
+        android:topRightRadius="8dp" />
+    <gradient
+        android:angle="90"
+        android:endColor="#000000"
+        android:startColor="#9000" />
+</shape>

common/src/main/res/drawable/background_gift_description.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="4dp" />
+    <solid android:color="#5C607D" />
+    <stroke
+        android:width="0.2dp"
+        android:color="#EAEAEA" />
+</shape>

common/src/main/res/drawable/background_gift_money.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="17dp" />
+    <solid android:color="#2A2C3B" />
+</shape>

common/src/main/res/drawable/background_gift_money2.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners
+        android:bottomLeftRadius="16dp"
+        android:topLeftRadius="16dp" />
+    <solid android:color="#2A2C3B" />
+</shape>

common/src/main/res/drawable/background_gift_select2.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:radius="8dp" />
+            <solid android:color="#130F25" />
+            <stroke android:width="0.6dp" android:color="#AEAEB2" />
+        </shape>
+    </item>
+
+</selector>

common/src/main/res/drawable/bg_live_gift_send_new.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="true">
+        <shape>
+            <corners android:radius="18dp" />
+            <gradient android:angle="180" android:endColor="#FF7C25" android:startColor="#FFB323" />
+        </shape>
+    </item>
+    <item android:state_enabled="false">
+        <shape>
+            <corners android:radius="18dp" />
+            <solid android:color="#282518" />
+        </shape>
+    </item>
+</selector>

common/src/main/res/drawable/bg_parcel_point.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="5dp"/>
+    <solid android:color="#3B3D52"/>
+</shape>

common/src/main/res/drawable/progress_bg_user.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!--设置ProgressBar背景色-->
+    <item android:id="@android:id/background">
+        <shape>
+            <!--设置ProgressBar进度条圆角半径-->
+            <corners android:radius="5dp" />
+            <solid android:color="#E6E6E6" />
+        </shape>
+    </item>
+
+    <!--设置ProgressBar进度条颜色-->
+    <item android:id="@android:id/progress">
+        <clip android:clipOrientation="horizontal">
+            <shape>
+                <corners android:radius="5dp" />
+                <solid android:color="#FFC722" />
+            </shape>
+        </clip>
+    </item>
+</layer-list>

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

@@ -0,0 +1,357 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="bottom"
+    android:orientation="vertical">
+
+    <FrameLayout
+        android:id="@+id/blind_box"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end"
+        android:visibility="invisible">
+
+        <include
+
+            layout="@layout/view_blind_box" />
+    </FrameLayout>
+
+    <RelativeLayout
+        android:id="@+id/gift_list"
+        android:layout_width="match_parent"
+        android:layout_height="351dp"
+        android:animateLayoutChanges="true"
+        android:orientation="vertical">
+
+        <com.makeramen.roundedimageview.RoundedImageView
+            android:id="@+id/git_background2"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="fitXY"
+            android:src="@drawable/backgroud_custom_gift2"
+            app:riv_corner_radius_bottom_left="0dp"
+            app:riv_corner_radius_bottom_right="0dp"
+            app:riv_corner_radius_top_left="10dp"
+            app:riv_corner_radius_top_right="10dp" />
+
+
+        <LinearLayout
+            android:id="@+id/git_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:animateLayoutChanges="true">
+
+            <LinearLayout
+                android:id="@+id/leveling_layout"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:visibility="gone">
+
+                <FrameLayout
+                    android:layout_width="40dp"
+                    android:layout_height="22dp"
+                    android:layout_marginStart="17dp"
+                    android:layout_marginTop="9dp"
+                    android:background="@mipmap/icon_grade_angle_mark">
+
+                    <TextView
+                        android:id="@+id/lv_str"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:text="Lv.8"
+                        android:textColor="@color/white"
+                        android:textSize="12sp" />
+                </FrameLayout>
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="6dp"
+                    android:layout_marginTop="12dp"
+                    android:layout_marginEnd="18dp"
+                    android:layout_weight="1"
+                    android:orientation="vertical">
+
+                    <ProgressBar
+                        android:id="@+id/progressBar"
+                        style="?android:attr/progressBarStyleHorizontal"
+                        android:layout_width="match_parent"
+                        android:layout_height="4dp"
+                        android:max="100"
+                        android:progress="0"
+                        android:progressDrawable="@drawable/progress_bg_user" />
+
+                    <TextView
+                        android:id="@+id/leave_hint"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="2dp"
+                        android:text="@string/leveling_points"
+                        android:textColor="#BBBBBB"
+                        android:textSize="9sp" />
+                </LinearLayout>
+
+                <ImageView
+                    android:layout_width="16dp"
+                    android:layout_height="16dp"
+                    android:layout_marginTop="14dp"
+                    android:layout_marginEnd="14dp"
+                    android:background="@mipmap/icon_right" />
+            </LinearLayout>
+
+            <com.yunbao.common.views.weight.MarqueeTextView
+                android:id="@+id/gift_description"
+                android:layout_width="0dp"
+                android:background="@drawable/background_gift_description"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginStart="15dp"
+                android:layout_marginEnd="16dp"
+                android:layout_weight="1"
+                android:ellipsize="marquee"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:gravity="center"
+                android:marqueeRepeatLimit="marquee_forever"
+                android:scrollHorizontally="true"
+                android:singleLine="true"
+                android:textColor="#FFFFFFFF"
+                android:textSize="12sp" />
+
+            <FrameLayout
+                android:id="@+id/btn_luck_gift_tip"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp">
+
+                <include layout="@layout/view_nobility" />
+
+            </FrameLayout>
+        </LinearLayout>
+
+        <RelativeLayout
+            android:id="@+id/gift_bottom"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_marginBottom="17dp"
+            android:paddingStart="16dp">
+
+            <LinearLayout
+                android:id="@+id/diamond_linear"
+                android:layout_width="wrap_content"
+                android:layout_height="32dp"
+                android:background="@drawable/background_gift_money"
+                android:gravity="center_vertical"
+                android:paddingStart="4dp"
+                android:paddingTop="7dp"
+                android:paddingBottom="7dp">
+
+                <ImageView
+                    android:layout_width="18dp"
+                    android:layout_height="18dp"
+                    android:clickable="false"
+                    android:focusable="false"
+                    android:src="@mipmap/diamond" />
+
+                <TextView
+                    android:id="@+id/diamond_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="4dp"
+                    android:layout_marginEnd="4dp"
+                    android:clickable="false"
+                    android:focusable="false"
+                    android:text="0"
+                    android:textColor="@color/white"
+                    android:textSize="12sp" />
+
+                <ImageView
+                    android:layout_width="8dp"
+                    android:layout_height="8dp"
+                    android:layout_marginEnd="4dp"
+                    android:background="@mipmap/icon_right" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/gold_layout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginStart="8dp"
+                android:layout_toRightOf="@id/diamond_linear"
+                android:gravity="center_vertical">
+
+                <ImageView
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:clickable="false"
+                    android:focusable="false"
+                    android:src="@mipmap/gold_coin" />
+
+                <TextView
+                    android:id="@+id/gold_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="4dp"
+                    android:layout_marginEnd="4dp"
+                    android:clickable="false"
+                    android:focusable="false"
+                    android:text="10000000"
+                    android:textColor="@color/white"
+                    android:textSize="12sp" />
+            </LinearLayout>
+
+            <FrameLayout
+                android:id="@+id/gift_send_layout"
+                android:layout_width="130dp"
+                android:layout_height="32dp"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:layout_marginEnd="14dp">
+
+                <FrameLayout
+                    android:id="@+id/gift_number_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginEnd="42dp"
+                    android:background="@drawable/background_gift_money2">
+
+                    <TextView
+                        android:id="@+id/gift_number"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginStart="15dp"
+                        android:text="1"
+                        android:textColor="#F5C05A"
+                        android:textSize="14sp" />
+
+                    <ImageView
+                        android:id="@+id/icon_arrow"
+                        android:layout_width="10dp"
+                        android:layout_height="10dp"
+                        android:layout_gravity="center_vertical|end"
+                        android:layout_marginEnd="30dp"
+                        android:src="@mipmap/icon_arrow_right" />
+                </FrameLayout>
+
+                <TextView
+                    android:id="@+id/live_gift_send"
+                    android:layout_width="62dp"
+                    android:layout_height="32dp"
+                    android:layout_gravity="end"
+                    android:background="@drawable/bg_live_gift_send_new"
+                    android:gravity="center"
+                    android:text="@string/live_gift_send"
+                    android:textColor="@color/white"
+                    android:textSize="14sp" />
+            </FrameLayout>
+        </RelativeLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_above="@id/gift_bottom"
+            android:layout_below="@id/git_title"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="18dp">
+
+                <FrameLayout
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1">
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/gift_title"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginStart="8dp" />
+
+                    <ImageView
+                        android:layout_width="27dp"
+                        android:layout_height="match_parent"
+                        android:layout_gravity="end"
+                        android:background="@drawable/icon_covering_layer"
+                        android:scaleType="centerCrop" />
+                </FrameLayout>
+
+                <View
+                    android:layout_width="1dp"
+                    android:layout_height="11dp"
+                    android:layout_gravity="center_vertical"
+                    android:background="@color/white" />
+
+                <FrameLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="6dp"
+                    android:layout_marginEnd="10dp">
+
+                    <TextView
+                        android:id="@+id/live_wrap"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:paddingEnd="8dp"
+                        android:text="@string/live_wrap"
+                        android:textColor="#CCCDCE"
+                        android:textSize="16sp" />
+                </FrameLayout>
+
+
+            </LinearLayout>
+
+            <FrameLayout
+                android:id="@+id/context_layout_gift"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginTop="12dp" />
+
+
+        </LinearLayout>
+
+        <RelativeLayout
+            android:id="@+id/btn_send_lian"
+            android:layout_width="70dp"
+            android:layout_height="70dp"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentBottom="true"
+            android:layout_marginRight="10dp"
+            android:layout_marginBottom="5dp"
+            android:background="@mipmap/icon_live_gift_lian"
+            android:visibility="gone">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="20dp"
+                android:text="@string/live_gift_send_lian"
+                android:textColor="@color/white"
+                android:textSize="12sp" />
+
+            <TextView
+                android:id="@+id/lian_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="35dp"
+                android:textColor="#fff"
+                android:textSize="14sp" />
+
+        </RelativeLayout>
+
+
+    </RelativeLayout>
+
+
+</LinearLayout>

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

@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="170dp"
+    android:layout_height="110dp">
+
+
+    <LinearLayout
+        android:layout_width="159dp"
+        android:layout_height="match_parent"
+        android:layout_gravity="end"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
+        <!--凤凰，龙，麒麟-->
+        <FrameLayout
+            android:id="@+id/frame_blind_top"
+            android:layout_width="match_parent"
+            android:layout_height="86.5dp"
+            android:background="@mipmap/bg_kirin">
+
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="51dp"
+                android:layout_marginTop="59dp"
+                android:orientation="vertical">
+
+                <FrameLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content">
+
+                    <ProgressBar
+                        android:id="@+id/progress_blind3"
+                        style="@android:style/Widget.ProgressBar.Horizontal"
+                        android:layout_width="80dp"
+                        android:layout_height="8dp"
+                        android:layout_gravity="center"
+                        android:max="100"
+                        android:progress="30"
+                        android:progressDrawable="@drawable/bg_blind_progres"
+                        android:visibility="gone" />
+
+                    <ProgressBar
+                        android:id="@+id/progress_blind1"
+                        style="@android:style/Widget.ProgressBar.Horizontal"
+                        android:layout_width="80dp"
+                        android:layout_height="8dp"
+                        android:layout_gravity="center"
+                        android:max="100"
+                        android:progress="50"
+                        android:progressDrawable="@drawable/bg_blind_progress"
+                        android:visibility="visible" />
+
+                    <ProgressBar
+                        android:id="@+id/progress_blind2"
+                        style="@android:style/Widget.ProgressBar.Horizontal"
+                        android:layout_width="80dp"
+                        android:layout_height="8dp"
+                        android:layout_gravity="center"
+                        android:max="100"
+                        android:progress="50"
+                        android:progressDrawable="@drawable/bg_blind_progress1"
+                        android:visibility="gone" />
+
+                    <TextView
+                        android:id="@+id/text_blind_progress"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:textSize="6sp" />
+                </FrameLayout>
+
+
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/blind_number"
+                android:layout_width="90dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="47dp"
+                android:layout_marginTop="71dp"
+                android:textColor="@color/white"
+                android:textSize="8sp" />
+
+            <ImageView
+                android:id="@+id/description"
+                android:layout_width="13dp"
+                android:layout_height="13dp"
+                android:layout_gravity="end"
+                android:layout_marginTop="40dp"
+                android:layout_marginEnd="15dp"
+                android:src="@mipmap/icon_what" />
+
+
+        </FrameLayout>
+
+        <FrameLayout
+            android:layout_width="149dp"
+            android:layout_height="match_parent"
+            android:background="@mipmap/bg_blind_bottom">
+
+            <com.yunbao.common.views.weight.MarqueeTextView
+                android:id="@+id/text_blind_gift_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_margin="5dp"
+                android:ellipsize="marquee"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:gravity="center"
+                android:marqueeRepeatLimit="marquee_forever"
+                android:scrollHorizontally="true"
+                android:singleLine="true"
+                android:textColor="@color/white"
+                android:textSize="10sp" />
+        </FrameLayout>
+    </LinearLayout>
+
+    <com.opensource.svgaplayer.SVGAImageView
+        android:id="@+id/blind_svga"
+        android:layout_width="71dp"
+        android:layout_marginStart="5dp"
+        android:layout_height="71dp"
+        android:layout_marginTop="29dp" />
+
+    <RelativeLayout
+        android:layout_width="42dp"
+        android:layout_height="42dp"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="43dp">
+
+
+        <ImageView
+            android:id="@+id/icon_masking"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            />
+    </RelativeLayout>
+
+    <com.opensource.svgaplayer.SVGAImageView
+        android:id="@+id/blind_box_open"
+        android:layout_width="61dp"
+        android:layout_height="110dp"
+        android:layout_marginStart="10dp"
+        android:layout_marginTop="2dp" />
+</FrameLayout>

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

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="26dp">
+
+    <TextView
+        android:id="@+id/custom_quantity"
+        android:layout_width="match_parent"
+        android:layout_height="26dp"
+        android:clickable="true"
+        android:focusable="true"
+        android:gravity="center"
+        android:text="@string/custom_quantity"
+        android:textColor="#FFFFFF"
+        android:textSize="14sp" />
+
+</LinearLayout>

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

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="351dp"
+    android:background="@color/transparent"
+    android:orientation="vertical"
+    tools:ignore="MissingDefaultResource">
+
+    <View
+        android:id="@+id/to_can"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <LinearLayout
+
+        android:layout_width="80dp"
+        android:layout_height="212dp"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginEnd="48dp"
+        android:layout_marginBottom="50dp"
+        android:background="@drawable/bg_selection_quantity"
+        android:orientation="vertical">
+
+        <TextView
+            android:clickable="true"
+            android:id="@+id/custom_quantity"
+            android:layout_width="match_parent"
+            android:layout_height="28dp"
+            android:gravity="center"
+            android:layout_marginTop="2dp"
+            android:text="@string/custom_quantity"
+            android:textColor="#FFFFFF"
+            android:textSize="14sp"
+            android:focusable="true" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/gift_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+    </LinearLayout>
+
+
+</RelativeLayout>

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

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    tools:ignore="MissingDefaultResource">
+
+    <FrameLayout
+        android:id="@+id/no_nobility"
+        android:layout_width="67dp"
+        android:layout_height="24dp"
+        android:layout_marginTop="5dp"
+        android:background="@mipmap/icon_aristocrat_tip"
+        android:visibility="gone">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end|center_vertical"
+            android:layout_marginEnd="2dp"
+            android:text="@string/live_ktgz"
+            android:textColor="#FFC008"
+            android:textSize="10sp" />
+
+    </FrameLayout>
+
+    <LinearLayout
+        android:id="@+id/established_nobility"
+        android:layout_width="78dp"
+        android:layout_height="26dp"
+        android:background="@mipmap/icon_established_nobility"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:id="@+id/nobility_icon"
+            android:layout_width="24dp"
+            android:layout_height="24dp" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginStart="1dp"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/vipGoldTitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="贵族"
+                android:textColor="#FFC722"
+                android:textSize="10sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/vipGoldDesc"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="贵族"
+                android:textColor="#CCFFFFFF"
+                android:textSize="8sp"
+                android:textStyle="bold" />
+        </LinearLayout>
+
+    </LinearLayout>
+</FrameLayout>

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

@@ -1250,4 +1250,8 @@ Limited ride And limited avatar frame</string>
     <string name="lucky_red_envelope">%s drew %s in the lucky red envelope</string>
     <string name="lucky_red_envelope_amount">number</string>
     <string name="red_envelope_released_successfully">>Red  successfully</string>
+    <string name="leveling_points">升級還需%s經驗值，升至%s即可領取獎勵</string>
+    <string name="nothing_in_the_package_yet">包裹中暫無物品哦</string>
+    <string name="reach_the_top">恭喜，你已達到最高等級</string>
+    <string name="custom_quantity">自定義數量</string>
 </resources>