Merge remote-tracking branch 'origin/master'

2022-11-23 14:14:34 +08:00 · 2022-11-23 14:14:34 +08:00 · 3d117dbcb4
commit 3d117dbcb4
parent 202aedbcf3 14a4bc4343
23 changed files with 273 additions and 197 deletions
--- a/common/src/main/assets/icon_noble_chaohuang.svga
+++ b/common/src/main/assets/icon_noble_chaohuang.svga
--- a/common/src/main/assets/icon_noble_gongjue.svga
+++ b/common/src/main/assets/icon_noble_gongjue.svga
--- a/common/src/main/assets/icon_noble_guowang.svga
+++ b/common/src/main/assets/icon_noble_guowang.svga
--- a/common/src/main/assets/icon_noble_houjue.svga
+++ b/common/src/main/assets/icon_noble_houjue.svga
--- a/common/src/main/assets/icon_noble_huangdi.svga
+++ b/common/src/main/assets/icon_noble_huangdi.svga
--- a/common/src/main/assets/icon_noble_nanjue.svga
+++ b/common/src/main/assets/icon_noble_nanjue.svga
--- a/common/src/main/assets/icon_noble_zijue.svga
+++ b/common/src/main/assets/icon_noble_zijue.svga
--- a/common/src/main/java/com/yunbao/common/views/weight/NobleNoticeView.java
+++ b/common/src/main/java/com/yunbao/common/views/weight/NobleNoticeView.java
@ -80,7 +80,7 @@ public class NobleNoticeView extends FrameLayout {
        rootView = LayoutInflater.from(mContext).inflate(R.layout.view_noble_notice, this, true);
        svagaBc = rootView.findViewById(R.id.svaga_bc);
        rootLayout = rootView.findViewById(R.id.root_layout);
-        gotoRoomView = rootView.findViewById(R.id.goto_room_view);
+        gotoRoomView = rootView.findViewById(R.id.got_room_view);
        contextLayout = rootView.findViewById(R.id.context_layout);
        scrollLayout = rootView.findViewById(R.id.scroll_layout);
        nobleIcon = rootView.findViewById(R.id.noble_icon);
@ -111,7 +111,6 @@ public class NobleNoticeView extends FrameLayout {
            findViewById(R.id.anchor_nickname).setVisibility(GONE);
            openNoble.setText(mContext.getString(R.string.open_noble2));
        }else {
-            gotoRoomView.setVisibility(VISIBLE);
            findViewById(R.id.in).setVisibility(VISIBLE);
            findViewById(R.id.anchor_nickname).setVisibility(VISIBLE);
            openNoble.setText(mContext.getString(R.string.open_noble));
@ -254,7 +253,7 @@ public class NobleNoticeView extends FrameLayout {
        @Override
        public void onStep(int frame, double v) {
            System.out.println("frame = " + frame);
-            if (frame == 10) {
+            if (frame == 20) {
                setButtonPosition(roleType);
                observable.observeOn(AndroidSchedulers.mainThread())
                        .subscribe(bitmap -> {
@ -270,7 +269,7 @@ public class NobleNoticeView extends FrameLayout {
                        }).isDisposed();

            }
-            if (frame == 150) {
+            if (frame == 135) {
                contextLayout.setVisibility(GONE);
                gotoRoomView.setVisibility(GONE);
                scrollLayout.clearAnimation();
--- a/common/src/main/res/anim/in_from_right.xml
+++ b/common/src/main/res/anim/in_from_right.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="300"
+        android:fromXDelta="100%"
+        android:toXDelta="0%" />
+</set>
--- a/common/src/main/res/anim/in_from_right_abit.xml
+++ b/common/src/main/res/anim/in_from_right_abit.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="300"
+        android:fromXDelta="0"
+        android:toXDelta="-15%" />
+</set>
--- a/common/src/main/res/anim/out_from_right.xml
+++ b/common/src/main/res/anim/out_from_right.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="3000"
+        android:fromXDelta="-15%"
+        android:toXDelta="0%" />
+</set>
--- a/common/src/main/res/anim/out_to_right.xml
+++ b/common/src/main/res/anim/out_to_right.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="300"
+        android:fromXDelta="0%"
+        android:toXDelta="100%" />
+</set>
--- a/common/src/main/res/anim/out_to_right_abit.xml
+++ b/common/src/main/res/anim/out_to_right_abit.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="300"
+        android:fromXDelta="-15%"
+        android:toXDelta="0%" />
+</set>
--- a/common/src/main/res/layout/view_noble_notice.xml
+++ b/common/src/main/res/layout/view_noble_notice.xml
@ -12,7 +12,7 @@


    <TextView
-        android:id="@+id/goto_room_view"
+        android:id="@+id/got_room_view"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_alignParentEnd="true"
@ -33,7 +33,7 @@
        android:layout_height="wrap_content"
        android:layout_marginTop="42dp"
        android:layout_marginEnd="10dp"
-        android:layout_toStartOf="@id/goto_room_view"
+        android:layout_toStartOf="@id/got_room_view"
        android:scrollbars="none">

        <RelativeLayout
--- a/common/src/main/res/values/style.xml
+++ b/common/src/main/res/values/style.xml
@ -6,9 +6,9 @@
        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
        <item name="colorAccent">@color/colorAccent</item>
        <item name="android:colorBackground">@color/background</item>
-        <item name="android:windowAnimationStyle">@style/Animation</item>
+        <item name="android:windowAnimationStyle">@style/AnimationActivity</item>
        <!-- Status bar color. -->
-        <item name="android:statusBarColor" >@color/colorPrimary</item>
+        <item name="android:statusBarColor">@color/colorPrimary</item>
    </style>

    <style name="dialog" parent="AppTheme">
@ -35,6 +35,7 @@
        <!--显示区域以外是否使用黑色半透明背景-->
        <item name="android:backgroundDimEnabled">true</item>
    </style>
+
    <style name="dialog4" parent="AppTheme">
        <item name="android:windowFrame">@null</item>
        <item name="android:windowNoTitle">true</item>
@ -44,6 +45,7 @@
        <!--显示区域以外是否使用黑色半透明背景-->
        <item name="android:backgroundDimEnabled">false</item>
    </style>
+
    <style name="dialog3" parent="AppTheme">
        <item name="android:windowFrame">@null</item>
        <item name="android:windowNoTitle">true</item>
@ -69,10 +71,12 @@
        <item name="android:windowEnterAnimation">@anim/left_anim_enter</item>
        <item name="android:windowExitAnimation">@anim/left_anim_exit</item>
    </style>
+
    <style name="RightLeftToAnim" parent="android:Animation">
        <item name="android:windowEnterAnimation">@anim/right_anim_enter</item>
        <item name="android:windowExitAnimation">@anim/right_anim_exit</item>
    </style>
+
    <style name="groupLast" parent="AppTheme">
        <item name="android:layout_width">match_parent</item>
        <item name="android:layout_height">1dp</item>
@ -93,6 +97,7 @@
        <item name="android:paddingLeft">15dp</item>
        <item name="android:paddingRight">15dp</item>
    </style>
+
    <style name="Theme.PayssionTrans" parent="Theme.AppCompat.Light">
        <item name="android:windowIsTranslucent">true</item>
        <item name="android:windowBackground">@android:color/transparent</item>
@ -107,15 +112,22 @@
    <style name="Animation">
        <item name="android:activityOpenEnterAnimation">@null</item>
        <item name="android:activityOpenExitAnimation">@null</item>
-        <item name="android:activityCloseEnterAnimation">@null</item>
-        <item name="android:activityCloseExitAnimation">@null</item>
+        <item name="android:activityCloseEnterAnimation">@anim/out_from_right</item>
+        <item name="android:activityCloseExitAnimation">@anim/out_from_right</item>
        <item name="android:taskOpenEnterAnimation">@null</item>
        <item name="android:taskOpenExitAnimation">@null</item>
-        <item name="android:taskCloseEnterAnimation">@null</item>
-        <item name="android:taskCloseExitAnimation">@null</item>
+        <item name="android:taskCloseEnterAnimation">@anim/out_from_right</item>
+        <item name="android:taskCloseExitAnimation">@anim/out_from_right</item>
        <item name="android:taskToFrontEnterAnimation">@null</item>
        <item name="android:taskToFrontExitAnimation">@null</item>
-        <item name="android:taskToBackEnterAnimation">@null</item>
-        <item name="android:taskToBackExitAnimation">@null</item>
+        <item name="android:taskToBackEnterAnimation">@anim/out_from_right</item>
+        <item name="android:taskToBackExitAnimation">@anim/out_from_right</item>
+    </style>
+    <!-- 页面弹出（入场出场）动画 -->
+    <style name="AnimationActivity" parent="@android:style/Animation">
+        <item name="android:activityOpenEnterAnimation">@anim/in_from_right</item>
+        <item name="android:activityOpenExitAnimation">@anim/in_from_right_abit</item>
+        <item name="android:activityCloseEnterAnimation">@anim/out_to_right_abit</item>
+        <item name="android:activityCloseExitAnimation">@anim/out_to_right</item>
    </style>
 </resources>
--- a/config.gradle
+++ b/config.gradle
@ -10,9 +10,9 @@ ext {
    manifestPlaceholders = [
            //正式

-//            serverHost       : "https://napi.yaoulive.com",
+            serverHost       : "https://napi.yaoulive.com",
            //測試
-            serverHost       : "https://ceshi.yaoulive.com",
+//            serverHost       : "https://ceshi.yaoulive.com",

            //腾讯地图
            txMapAppKey      : "EOZBZ-ASLCU-4XPV3-BDCHZ-4E3Q7-H4BWB",
--- a/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java
@ -148,7 +148,7 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
        window.setWindowAnimations(R.style.bottomToTopAnim);
        WindowManager.LayoutParams params = window.getAttributes();
        params.width = WindowManager.LayoutParams.MATCH_PARENT;
-        params.height = DpUtil.dp2px(350);
+        params.height = DpUtil.dp2px(355);
        params.gravity = Gravity.BOTTOM;
        window.setAttributes(params);
    }
@ -251,7 +251,7 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
        mVipGoldTitle = mRootView.findViewById(R.id.vipGoldTitle);
        mVipGoldDesc = mRootView.findViewById(R.id.vipGoldDesc);
        mVipGold.setOnClickListener(this);
-        mGiftPackage= mRootView.findViewById(R.id.btn_gift_package);
+        mGiftPackage = mRootView.findViewById(R.id.btn_gift_package);
        mGiftPackage.setOnClickListener(this);
        mRootView.findViewById(R.id.live_gift_download_all).setOnClickListener(this);
        mHandler = new Handler() {
@ -295,7 +295,7 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
                            JSONObject user = JSONObject.parseObject(info[0]);
                            int nobleId = user.getIntValue("noble_id");
                            int resId = NobleUtil.nobleIdToImageResId(nobleId);
-                            if(resId!=-1){
+                            if (resId != -1) {
                                mVipGoldIcon.setImageResource(resId);
                                mVipGoldTitle.setText(user.getString("noble_name"));
                                mVipGoldDesc.setText(R.string.live_gift_buy_gold_desc_to);
@ -385,7 +385,7 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
                    String giftJson = obj.getString("giftlist");
                    List<LiveGiftBean> list = JSON.parseArray(giftJson, LiveGiftBean.class);
                    GiftCacheUtil.getInstance().addDownloadList(list);
-                    if(!GiftCacheUtil.getInstance().isDownloading()){
+                    if (!GiftCacheUtil.getInstance().isDownloading()) {
                        GiftCacheUtil.getInstance().downloadAllGift();
                    }
                    if (list.size() == 0) {
@ -405,7 +405,7 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
    }

    private void showGiftList(List<LiveGiftBean> list) {
-        if (bean1!=null&&IMLoginManager.get(mContext).isNewUserGif() && (type_name.equals("熱門") || type_name.equals("Hot"))) {
+        if (bean1 != null && IMLoginManager.get(mContext).isNewUserGif() && (type_name.equals("熱門") || type_name.equals("Hot"))) {
            list.add(0, bean1);
            if (mWishGiftId == null) {
                mWishGiftId = "" + bean1.getId();
@ -503,11 +503,11 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
        } else if (i == R.id.btn_choose) {
            showGiftCount();
        } else if (i == R.id.coin) {
-            forwardMyCoin();
+            forwardMyCoin(0);
        } else if (i == R.id.goldCoin) {
-            forwardMyCoin();
+            forwardMyCoin(2);
        } else if (i == R.id.go_charge) {
-            forwardMyCoin();
+            forwardMyCoin(0);
        } else if (i == R.id.btn_luck_gift_tip) {
            dismiss();
            ((LiveActivity) mContext).openLuckGiftTip();
@ -556,10 +556,10 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
    /**
     * 跳转到我的钻石
     */
-    private void forwardMyCoin() {
+    private void forwardMyCoin(int page) {
        dismiss();
        //我们的
-        ARouter.getInstance().build(PATH_COIN).withInt("p", 0).navigation();
+        ARouter.getInstance().build(PATH_COIN).withInt("p", page).navigation();
    }

    /**
@ -709,6 +709,7 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On

    /**
     * 收到礼物下载完成的通知
+     *
     * @param status
     */
    @Subscribe(threadMode = ThreadMode.MAIN)
--- a/live/src/main/java/com/yunbao/live/utils/LiveTextRender.java
+++ b/live/src/main/java/com/yunbao/live/utils/LiveTextRender.java
@ -230,28 +230,28 @@ public class LiveTextRender {
        int index = 0;

        if (levelDrawable != null) {
-            builder.append(" ");
+            builder.append("  ");
            levelDrawable.setBounds(0, 0, DpUtil.dp2px(32), DpUtil.dp2px(14));
            builder.setSpan(new VerticalImageSpan(levelDrawable), index, index + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
            index = builder.length();
        }

        if (gzDrawablesMap.containsKey(bean)) {//贵族
-            builder.append(" ");
-            gzDrawablesMap.get(bean).setBounds(0, 0, DpUtil.dp2px(32), DpUtil.dp2px(18));
+            builder.append("  ");
+            gzDrawablesMap.get(bean).setBounds(0, 0, DpUtil.dp2px(35), DpUtil.dp2px(20));
            builder.setSpan(new VerticalImageSpan(gzDrawablesMap.get(bean)), index, index + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
            index = builder.length();
        }

        if (ryxzDrawablesMap.containsKey(bean)) {//荣誉勋章
-            builder.append(" ");
+            builder.append("  ");
            ryxzDrawablesMap.get(bean).setBounds(0, 0, DpUtil.dp2px(18), DpUtil.dp2px(18));
            builder.setSpan(new VerticalImageSpan(ryxzDrawablesMap.get(bean)), index, index + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
            index = builder.length();
        }

        if (nhDrawablesMap.containsKey(bean)) {//靓号
-            builder.append(" ");
+            builder.append("  ");
            nhDrawablesMap.get(bean).setBounds(0, 0, DpUtil.dp2px(17), DpUtil.dp2px(17));
            builder.setSpan(new VerticalImageSpan(nhDrawablesMap.get(bean)), index, index + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
            index = builder.length();
@ -268,7 +268,7 @@ public class LiveTextRender {
            }

            if (drawable != null) {
-                builder.append(" ");
+                builder.append("  ");
                drawable.setBounds(0, 0, DpUtil.dp2px(18), DpUtil.dp2px(16));
                builder.setSpan(new VerticalImageSpan(drawable), index, index + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
                index = builder.length();
@ -280,7 +280,7 @@ public class LiveTextRender {
                && !bean.getMedalNmae().equals("null") && !bean.getMedalNmae().equals("(null)") && !bean.getMedalNmae().equals("<null>")) {//粉丝徽章图标
            Drawable drawable = getMedalImage(bean);
            if (drawable != null) {
-                builder.append(" ");
+                builder.append("  ");
                drawable.setBounds(0, 0, DpUtil.dp2px(44), DpUtil.dp2px(17));
                builder.setSpan(new VerticalImageSpan(drawable), index, index + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
                index = builder.length();
@ -291,7 +291,7 @@ public class LiveTextRender {
        if (bean.isManager()) {//直播间管理员图标
            Drawable drawable = ContextCompat.getDrawable(CommonAppContext.sInstance, R.mipmap.icon_live_chat_m);
            if (drawable != null) {
-                builder.append(" ");
+                builder.append("  ");
                drawable.setBounds(0, 0, DpUtil.dp2px(17), DpUtil.dp2px(14));
                builder.setSpan(new VerticalImageSpan(drawable), index, index + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
                index = builder.length();
@ -301,7 +301,7 @@ public class LiveTextRender {
        if (!TextUtils.isEmpty(bean.getLiangName())) {//靓号图标
            Drawable drawable = ContextCompat.getDrawable(CommonAppContext.sInstance, R.mipmap.icon_live_chat_liang);
            if (drawable != null) {
-                builder.append(" ");
+                builder.append("  ");
                drawable.setBounds(0, 0, DpUtil.dp2px(17), DpUtil.dp2px(14));
                builder.setSpan(new VerticalImageSpan(drawable), index, index + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
                // new add
@ -528,9 +528,9 @@ public class LiveTextRender {
        int indexX = 80;
        //水印的位置坐标
        if (level.length() > 2) {
-            indexX = 75;
+            indexX = 87;
        } else {
-            indexX = 84;
+            indexX = 95;
        }
        mCanvas.drawText(level, indexX, 53, mPaint);
        mCanvas.save();
--- a/live/src/main/res/layout/dialog_live_gift_wrap.xml
+++ b/live/src/main/res/layout/dialog_live_gift_wrap.xml
@ -2,181 +2,196 @@
 <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_height="350dp"
    android:orientation="vertical">
+
    <RelativeLayout
        android:layout_width="match_parent"
-        android:orientation="horizontal"
+        android:layout_height="wrap_content"
        android:layout_marginBottom="10dp"
-        android:layout_height="wrap_content">
-
-    <LinearLayout
-        android:id="@+id/live_gift_download_all"
-        android:layout_width="155dp"
-        android:layout_height="32dp"
-        android:layout_marginStart="12dp"
-        android:layout_alignParentStart="true"
-        android:background="@drawable/bg_live_gift_download_all"
-        android:gravity="center"
-        android:visibility="invisible"
        android:orientation="horizontal">

-        <ImageView
-            android:layout_width="19dp"
-            android:layout_height="19dp"
-            android:layout_marginEnd="7dp"
-            android:src="@mipmap/icon_small_download" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:visibility="visible"
-            android:text="一鍵下載所有禮物動畫"
-            android:textSize="10sp" />
-
-    </LinearLayout>
-    <LinearLayout
-        android:id="@+id/btn_luck_gift_tip"
-        android:layout_width="105.27dp"
-        android:layout_alignParentEnd="true"
-        android:layout_height="32dp"
-        android:layout_marginEnd="12dp"
-        android:background="@drawable/bg_live_vip_blue"
-        android:gravity="center"
-        android:orientation="horizontal">
-
-        <ImageView
-            android:id="@+id/vipGoldIcon"
-            android:layout_width="25dp"
-            android:layout_height="25dp"
-            android:layout_marginEnd="7dp"
-            android:scaleType="centerCrop"
-            android:src="@mipmap/icon_vip_gold" />
        <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="wrap_content"
-            android:gravity="start"
-            android:layout_height="wrap_content">
+            android:id="@+id/live_gift_download_all"
+            android:layout_width="155dp"
+            android:layout_height="32dp"
+            android:layout_alignParentStart="true"
+            android:layout_marginStart="12dp"
+            android:background="@drawable/bg_live_gift_download_all"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:visibility="invisible">
+
+            <ImageView
+                android:layout_width="19dp"
+                android:layout_height="19dp"
+                android:layout_marginEnd="7dp"
+                android:src="@mipmap/icon_small_download" />
+
            <TextView
-                android:id="@+id/vipGoldTitle"
                android:layout_width="wrap_content"
                android:layout_height="match_parent"
-                android:layout_gravity="start"
-                android:textColor="#FFFFFF"
-                android:text="@string/live_gift_buy_gold"
-                android:textSize="11.52sp" />
-            <TextView
-                android:id="@+id/vipGoldDesc"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_gravity="center"
-                android:textColor="#999999"
-                android:text="@string/live_gift_buy_gold_desc"
-                android:textSize="7.68sp" />
+                android:gravity="center"
+                android:text="一鍵下載所有禮物動畫"
+                android:textSize="10sp"
+                android:visibility="visible" />
+
        </LinearLayout>

-    </LinearLayout>
+        <LinearLayout
+            android:id="@+id/btn_luck_gift_tip"
+            android:layout_width="105.27dp"
+            android:layout_height="32dp"
+            android:layout_alignParentEnd="true"
+            android:layout_marginEnd="12dp"
+            android:background="@drawable/bg_live_vip_blue"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:id="@+id/vipGoldIcon"
+                android:layout_width="25dp"
+                android:layout_height="25dp"
+                android:layout_marginEnd="7dp"
+                android:scaleType="centerCrop"
+                android:src="@mipmap/icon_vip_gold" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="start"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/vipGoldTitle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="start"
+                    android:text="@string/live_gift_buy_gold"
+                    android:textColor="#FFFFFF"
+                    android:textSize="11.52sp" />
+
+                <TextView
+                    android:id="@+id/vipGoldDesc"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center"
+                    android:text="@string/live_gift_buy_gold_desc"
+                    android:textColor="#999999"
+                    android:textSize="7.68sp" />
+            </LinearLayout>
+
+        </LinearLayout>

    </RelativeLayout>
+
    <RelativeLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:background="@drawable/bg_live_gift">
+
        <LinearLayout
            android:id="@+id/gift_tab_layout"
-            android:orientation="horizontal"
            android:layout_width="match_parent"
+            android:layout_height="40dp"
            android:gravity="center"
-            android:layout_height="50dp">
+            android:orientation="horizontal">
+
            <androidx.recyclerview.widget.RecyclerView
                android:id="@+id/items"
-                android:layout_weight="1"
                android:layout_width="0dp"
                android:layout_height="wrap_content"
                android:layout_marginStart="10dp"
-                android:layout_marginEnd="5dp" />
+                android:layout_marginEnd="5dp"
+                android:layout_weight="1" />

-        <ImageView
-            android:layout_marginEnd="15dp"
-            android:layout_width="wrap_content"
-            android:src="@drawable/bg_live_gift_package_line"
-            android:layout_gravity="center"
-            android:layout_height="23dp"/>
-        <com.yunbao.common.custom.DrawableTextView
-            android:id="@+id/btn_gift_package"
-            android:layout_width="36dp"
-            android:layout_height="36dp"
-            android:layout_marginEnd="10dp"
-            android:drawablePadding="2dp"
-            android:gravity="center_vertical"
-            android:text="@string/live_wrap"
-            android:textColor="#FFFFFF"
-            android:textSize="12sp"
-            app:dt_left_height="23dp"
-            app:dt_left_width="1.3dp" />
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="23dp"
+                android:layout_gravity="center"
+                android:layout_marginEnd="15dp"
+                android:src="@drawable/bg_live_gift_package_line" />
+
+            <com.yunbao.common.custom.DrawableTextView
+                android:id="@+id/btn_gift_package"
+                android:layout_width="36dp"
+                android:layout_height="36dp"
+                android:layout_marginEnd="10dp"
+                android:drawablePadding="2dp"
+                android:gravity="center_vertical"
+                android:text="@string/live_wrap"
+                android:textColor="#FFFFFF"
+                android:textSize="12sp"
+                app:dt_left_height="23dp"
+                app:dt_left_width="1.3dp" />
        </LinearLayout>

        <LinearLayout
            android:id="@+id/group"
            android:layout_width="match_parent"
            android:layout_height="300dp"
-            android:gravity="bottom"
            android:layout_below="@id/gift_tab_layout"
+            android:gravity="bottom"
            android:orientation="vertical">

            <androidx.viewpager.widget.ViewPager
                android:id="@+id/viewPager"
                android:layout_width="match_parent"
                android:layout_height="0dp"
-                android:layout_weight="1"
                android:layout_marginTop="5dp"
-                android:layout_marginBottom="1dp"/>
+                android:layout_weight="1" />

            <androidx.viewpager.widget.ViewPager
                android:id="@+id/vpWrapList"
                android:layout_width="match_parent"
                android:layout_height="0dp"
-                android:layout_weight="1"
                android:layout_marginTop="5dp"
-                android:layout_marginBottom="1dp"
+                android:layout_marginBottom="3dp"
+                android:layout_weight="1"
                android:visibility="gone" />

-            <RadioGroup
-                android:id="@+id/radio_group"
-                android:layout_width="wrap_content"
-                android:layout_height="6dp"
-                android:layout_marginEnd="30dp"
-                android:layout_gravity="end"
-                android:orientation="horizontal" />
-
-            <RadioGroup
-                android:id="@+id/radio_group_wrap"
-                android:layout_width="wrap_content"
-                android:layout_height="6dp"
-                android:layout_gravity="center_horizontal"
-                android:orientation="horizontal"
-                android:visibility="gone" />

            <FrameLayout
                android:layout_width="match_parent"
-                android:layout_height="55dp"
-                android:layout_weight="0"
-                android:paddingLeft="10dp"
-                android:paddingRight="10dp">
+                android:layout_height="66dp"
+                android:layout_weight="0">
+                <RadioGroup
+                    android:id="@+id/radio_group"
+                    android:layout_width="wrap_content"
+                    android:layout_height="6dp"
+                    android:layout_gravity="end"
+                    android:layout_marginTop="3.5dp"
+                    android:layout_marginEnd="20dp"
+                    android:gravity="end"
+                    android:orientation="horizontal" />
+
+                <RadioGroup
+                    android:id="@+id/radio_group_wrap"
+                    android:layout_width="wrap_content"
+                    android:layout_marginEnd="20dp"
+                    android:layout_height="6dp"
+                    android:layout_gravity="end"
+                    android:layout_marginTop="3.5dp"
+                    android:gravity="end"
+                    android:orientation="horizontal"
+                    android:visibility="visible" />

                <RelativeLayout
                    android:id="@+id/btn_send_group"
                    android:layout_width="match_parent"
-                    android:layout_height="match_parent">
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="10dp"
+                    android:layout_marginEnd="10dp">
+

                    <TextView
                        android:id="@+id/btn_send"
                        android:layout_width="60dp"
                        android:layout_height="30dp"
                        android:layout_alignParentEnd="true"
-                        android:layout_centerVertical="true"
+                        android:layout_alignParentBottom="true"
                        android:layout_marginEnd="10dp"
+                        android:layout_marginBottom="10dp"
                        android:background="@drawable/bg_live_gift_send_2"
                        android:enabled="false"
                        android:gravity="center"
@ -188,7 +203,8 @@
                        android:id="@+id/btn_choose"
                        android:layout_width="60dp"
                        android:layout_height="30dp"
-                        android:layout_centerVertical="true"
+                        android:layout_alignParentBottom="true"
+                        android:layout_marginBottom="10dp"
                        android:layout_toLeftOf="@id/btn_send"
                        android:background="@drawable/bg_live_gift_choose"
                        android:gravity="center"
@ -202,31 +218,35 @@
                        android:id="@+id/arrow"
                        android:layout_width="13dp"
                        android:layout_height="7dp"
-                        android:layout_centerVertical="true"
+                        android:layout_alignParentBottom="true"
                        android:layout_marginRight="5dp"
+                        android:layout_marginBottom="22dp"
                        android:layout_toLeftOf="@id/btn_send"
                        android:src="@mipmap/icon_live_gift_2"
-                        app:tint="@color/global"
-                        android:visibility="invisible" />
+                        android:visibility="invisible"
+                        app:tint="@color/global" />
+

                </RelativeLayout>

                <LinearLayout
-                    android:orientation="horizontal"
-                    android:gravity="bottom"
-                    android:layout_marginBottom="5dp"
                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent">
+                    android:layout_height="match_parent"
+                    android:layout_marginBottom="5dp"
+                    android:gravity="bottom"
+                    android:layout_marginStart="20dp"
+                    android:orientation="horizontal">
+
                    <LinearLayout
-                        android:orientation="vertical"
                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent">
+                        android:layout_height="match_parent"
+                        android:orientation="vertical">

                        <com.yunbao.common.custom.DrawableTextView
                            android:id="@+id/goldCoin"
                            android:layout_width="wrap_content"
-                            android:layout_weight="1"
                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
                            android:drawablePadding="4dp"
                            android:gravity="center_vertical"
                            android:textColor="@color/white"
@ -253,16 +273,17 @@
                            app:dt_right_width="14dp" />

                    </LinearLayout>
+
                    <com.yunbao.common.custom.DrawableTextView
                        android:id="@+id/go_charge"
                        android:layout_width="42dp"
                        android:layout_height="22dp"
                        android:layout_marginStart="10dp"
                        android:layout_marginBottom="3dp"
+                        android:background="@drawable/bg_live_gift_buy"
                        android:drawablePadding="4dp"
                        android:gravity="center"
                        android:text="@string/charge"
-                        android:background="@drawable/bg_live_gift_buy"
                        android:textColor="@color/yellow5"
                        android:textSize="12sp"
                        app:dt_left_height="20dp"
--- a/live/src/main/res/layout/item_live_gift.xml
+++ b/live/src/main/res/layout/item_live_gift.xml
@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.yunbao.common.custom.MyFrameLayout2
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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"
-    app:mfl_ratio="1"
+    android:layout_height="92dp"
    android:background="@drawable/bg_live_gift_items"
-    >
+    app:mfl_ratio="1">

    <com.yunbao.common.custom.MyRadioButton
        android:id="@+id/radioButton"
@ -14,15 +12,14 @@
        android:layout_height="match_parent"
        android:background="@drawable/bg_live_gift_item"
        android:button="@null"
-        android:checked="true"
-        />
+        android:checked="true" />

    <com.yunbao.live.custom.GiftMarkView
        android:id="@+id/mark"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
-        android:layout_marginRight="1dp"
-        android:layout_marginTop="1dp"/>
+        android:layout_marginTop="1dp"
+        android:layout_marginRight="1dp" />

    <RelativeLayout
        android:layout_width="45dp"
@ -34,20 +31,21 @@
            android:id="@+id/icon"
            android:layout_width="40dp"
            android:layout_height="40dp"
-            android:layout_centerVertical="true"
-            android:layout_centerHorizontal="true"/>
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true" />

-        <TextView android:id="@+id/expire"
+        <TextView
+            android:id="@+id/expire"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_alignParentBottom="true"
-            android:textColor="@color/color_white"
-            android:gravity="center"
-            android:background="#D996cff0"
-            android:visibility="gone"
            android:layout_centerVertical="true"
            android:layout_marginBottom="2dp"
-            android:textSize="8sp"/>
+            android:background="#D996cff0"
+            android:gravity="center"
+            android:textColor="@color/color_white"
+            android:textSize="8sp"
+            android:visibility="gone" />

    </RelativeLayout>

@ -56,21 +54,22 @@
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="bottom|center"
-        android:gravity="center"
        android:layout_marginBottom="8dp"
+        android:gravity="center"
        android:orientation="horizontal">

-        <ImageView android:id="@+id/pay_ico"
+        <ImageView
+            android:id="@+id/pay_ico"
            android:layout_width="10dp"
-            android:layout_height="10dp"/>
+            android:layout_height="10dp" />

        <TextView
            android:id="@+id/price"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:textColor="@color/gray3"
            android:layout_marginLeft="5dp"
-            android:textSize="11sp"/>
+            android:textColor="@color/gray3"
+            android:textSize="11sp" />

    </LinearLayout>

@ -78,18 +77,17 @@
        android:id="@+id/name"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
        android:layout_marginBottom="23dp"
        android:gravity="center"
        android:textColor="@color/white"
-        android:textSize="12sp"
-        android:layout_gravity="bottom"
-        />
+        android:textSize="12sp" />
+
    <TextView
-        android:visibility="gone"
-        android:layout_gravity="right"
        android:id="@+id/tvRedpoint"
        android:layout_width="wrap_content"
        android:layout_height="14dp"
+        android:layout_gravity="right"
        android:layout_marginRight="10dp"
        android:background="@drawable/bg_red_point"
        android:gravity="center"
@ -98,7 +96,8 @@
        android:paddingLeft="3dp"
        android:paddingRight="3dp"
        android:textColor="@color/white"
-        android:textSize="10sp" />
+        android:textSize="10sp"
+        android:visibility="gone" />

    <LinearLayout
        android:id="@+id/gift_loading_layout"
@ -117,4 +116,4 @@
    </LinearLayout>


-</com.yunbao.common.custom.MyFrameLayout2>
+</FrameLayout>
--- a/live/src/main/res/layout/view_live_room.xml
+++ b/live/src/main/res/layout/view_live_room.xml
@ -9,6 +9,11 @@

    android:paddingTop="15dp">

+    <com.yunbao.common.views.weight.NobleNoticeView
+        android:id="@+id/noble"
+        android:layout_width="match_parent"
+        android:layout_marginTop="60dp"
+        android:layout_height="wrap_content" />

    <LinearLayout
        android:id="@+id/lin"
@ -2089,13 +2094,6 @@
        android:layout_height="wrap_content"
        android:layout_below="@id/live_video" />

-    <com.yunbao.common.views.weight.NobleNoticeView
-        android:id="@+id/noble"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/live_wks_layout"
-        android:layout_marginTop="10dp" />
-

    <LinearLayout
        android:id="@+id/bannerLayout"
--- a/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java
+++ b/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java
@ -154,7 +154,6 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi

        findViewById(R.id.rt_kefu).setOnClickListener(this);
        findViewById(R.id.rt_setting).setOnClickListener(this);
-        findViewById(R.id.v_noble).setOnClickListener(this);
        findViewById(R.id.lt_noble).setOnClickListener(this);
        findViewById(R.id.lt_name).setOnClickListener(this);
        findViewById(R.id.signature).setOnClickListener(this);
--- a/main/src/main/res/layout/view_main_me.xml
+++ b/main/src/main/res/layout/view_main_me.xml
@ -477,11 +477,17 @@
                    android:layout_marginRight="15dp"
                    android:background="@drawable/bg_me_data"
                    android:gravity="center"
+                    android:clickable="true"
+                    android:focusableInTouchMode="true"
+                    android:focusable="true"
                    android:orientation="horizontal">

                    <LinearLayout
                        android:layout_width="wrap_content"
                        android:layout_height="match_parent"
+                        android:clickable="false"
+                        android:focusableInTouchMode="false"
+                        android:focusable="false"
                        android:gravity="center">

                        <ImageView
@ -498,6 +504,9 @@
                        android:layout_weight="1"
                        android:gravity="center|left"
                        android:orientation="vertical"
+                        android:clickable="false"
+                        android:focusableInTouchMode="false"
+                        android:focusable="false"
                        android:paddingLeft="18dp"
                        android:paddingRight="6dp">

@ -525,6 +534,9 @@
                        android:layout_width="18dp"
                        android:layout_height="18dp"
                        android:layout_marginRight="30dp"
+                        android:clickable="false"
+                        android:focusableInTouchMode="false"
+                        android:focusable="false"
                        android:background="@mipmap/icon_more_gray" />
                </LinearLayout>