[Modify]去掉无用图片

app/src/main/java/com/yizhuan/erban/avroom/adapter/AuctionListHeaderItem.java

@@ -1,48 +0,0 @@
-package com.yizhuan.erban.avroom.adapter;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-
-import com.yizhuan.erban.R;
-import com.yizhuan.xchat_android_library.list.BaseGroupItem;
-import com.yizhuan.xchat_android_library.list.ViewHolder;
-
-/**
- * Created by chenran on 2017/8/9.
- */
-
-public class AuctionListHeaderItem extends BaseGroupItem{
-    public AuctionListHeaderItem(Context context, int viewType) {
-        super(context, viewType);
-    }
-
-    @Override
-    public ViewHolder createViewHolder(ViewGroup group) {
-        View view = LayoutInflater.from(getContext()).inflate(R.layout.list_item_auction_header, null);
-        AuctionListHeaderItem.AuctionListHeaderHolder holder = new AuctionListHeaderItem.AuctionListHeaderHolder(view);
-        return holder;
-    }
-
-    @Override
-    public void updateHolder(ViewHolder holder, int groupPos, int childPos) {
-        AuctionListHeaderItem.AuctionListHeaderHolder auctionListHolder = (AuctionListHeaderItem.AuctionListHeaderHolder) holder;
-        if (auctionListHolder != null) {
-            if (getViewType() == AuctionListAdapter.VIEW_TYPE_WEEK_HEADER) {
-                auctionListHolder.image.setImageResource(R.drawable.icon_week_auction_list);
-            } else {
-                auctionListHolder.image.setImageResource(R.drawable.icon_total_auction_list);
-            }
-        }
-    }
-
-    private static class AuctionListHeaderHolder extends ViewHolder {
-        private ImageView image;
-        public AuctionListHeaderHolder(View itemView) {
-            super(itemView);
-            image = (ImageView) itemView.findViewById(R.id.auction_list_header);
-        }
-    }
-}

app/src/main/java/com/yizhuan/erban/ui/gift/dialog/GiftInfoVm.java

@@ -30,8 +30,6 @@ public class GiftInfoVm extends BaseItem<GiftInfo> {
 
     public final ObservableField<String> countDownText = new ObservableField<>();
 
-    public Drawable nobleDrawable = null;
-
     public Drawable radishDrawable = null;
 
     public Drawable radishDrawableSelected = null;
@@ -83,16 +81,6 @@ public class GiftInfoVm extends BaseItem<GiftInfo> {
         }
         this.isKnap.set(isKnap);
         updateCount();
-        int nobleId = data.getLevel();
-        if (nobleId == 0) {
-            // 普通表情
-            nobleDrawable = null;
-        } else {
-            int drawableId = nobleId == 1 ? R.drawable.ic_tag_1 : nobleId == 2 ? R.drawable.ic_tag_2 : nobleId == 3 ?
-                    R.drawable.ic_tag_3 : nobleId == 4 ? R.drawable.ic_tag_4 : nobleId == 5 ? R.drawable.ic_tag_5 : nobleId == 6 ?
-                    R.drawable.ic_tag_6 : nobleId == 7 ? R.drawable.ic_tag_7 : 0;
-            nobleDrawable = context.getResources().getDrawable(drawableId);
-        }
         isShowNew = data.isHasLatest();
         isShowLimit = data.isHasTimeLimit();
         isShowEffect = data.isHasEffect();

app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendListAdapter.java

@@ -58,7 +58,7 @@ public class FriendListAdapter extends BaseQuickAdapter<UserInfo, BaseViewHolder
         VipHelper.loadVipIcon(helper.getView(R.id.iv_vip_icon), item.getUserVipInfoVO());
         VipHelper.loadVipNickColor(helper.getView(R.id.tv_userName), item.getUserVipInfoVO(), "#FF333333");
         NobleAvatarView nobleAvatarView = helper.getView(R.id.noble_avatar_view);
-        nobleAvatarView.setSize(55, 75, 15);
+        nobleAvatarView.setSize(54, 70, 15);
         nobleAvatarView.setData(item.getAvatar(), item.getNobleUsers());
         nobleAvatarView.setOnClickListener(v -> {
             if (type == AbstractSelectFriendAction.TYPE_NORMAL

app/src/main/java/com/yizhuan/erban/ui/relation/adapter/AttentionListAdapter.java

@@ -95,7 +95,7 @@ public class AttentionListAdapter extends BaseQuickAdapter<AttentionInfo, BaseVi
         }
 
         NobleAvatarView nobleAvatarView = baseViewHolder.getView(R.id.noble_avatar_view);
-        nobleAvatarView.setSize(55, 75, 15);
+        nobleAvatarView.setSize(54, 70, 15);
         nobleAvatarView.setData(attentionInfo.avatar, attentionInfo.nobleUsers);
 
         AppCompatImageView ivUserLevel = baseViewHolder.getView(R.id.iv_user_level);

app/src/main/java/com/yizhuan/erban/ui/relation/adapter/FansViewAdapter.java

@@ -103,7 +103,7 @@ public class FansViewAdapter extends BaseQuickAdapter<FansInfo, BaseViewHolder>
         baseViewHolder.getView(R.id.iv_user_official).setVisibility(fansInfo.isOfficial() ? View.VISIBLE : View.GONE);
 
         NobleAvatarView nobleAvatarView = baseViewHolder.getView(R.id.noble_avatar_view);
-        nobleAvatarView.setSize(55, 75, 15);
+        nobleAvatarView.setSize(54, 70, 15);
         nobleAvatarView.setData(fansInfo.getAvatar(), fansInfo.getNobleUsers());
 
         AppCompatImageView ivUserLevel = baseViewHolder.getView(R.id.iv_user_level);

app/src/main/res/layout/attention_item_new.xml

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/rly"
     android:layout_width="match_parent"
-    android:layout_height="71dp"
+    android:layout_height="70dp"
     android:orientation="horizontal">
 
     <com.yizhuan.erban.ui.widget.NobleAvatarView
@@ -12,13 +12,12 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_marginStart="5dp" />
+        android:layout_marginStart="@dimen/dp_8" />
 
     <LinearLayout
+        android:layout_marginTop="@dimen/dp_16"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="10dp"
-        android:layout_marginTop="10dp"
         android:layout_weight="1"
         android:orientation="vertical">
 
@@ -46,7 +45,7 @@
                 android:ellipsize="end"
                 android:lines="1"
                 android:textColor="@color/text_title_color"
-                android:textSize="15sp"
+                android:textSize="@dimen/sp_14"
                 app:layout_flexShrink="1"
                 tools:text="@string/layout_attention_item_new_01" />
 
@@ -90,7 +89,7 @@
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/iv_charm_level"
                 android:layout_width="@dimen/dp_19"
-                android:layout_height="@dimen/dp_19"
+                android:layout_height="22dp"
                 android:layout_marginEnd="2dp"
                 android:scaleType="fitCenter"
                 android:visibility="gone"
@@ -103,11 +102,10 @@
             android:id="@+id/tv_user_desc"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
             android:ellipsize="end"
             android:lines="1"
-            android:textColor="@color/text_normal_c6c6e9"
+            android:textColor="@color/color_B3B3C3"
-            android:textSize="13sp"
+            android:textSize="@dimen/sp_12"
             tools:text="1234568940" />
 
     </LinearLayout>
@@ -117,7 +115,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_marginStart="10dp"
         android:layout_marginEnd="15dp">
 
         <TextView

app/src/main/res/layout/dialog_auction_finish.xml

@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@color/transparent"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/transparent"
-        android:orientation="vertical"
-        android:gravity="center_horizontal"
-        >
-        
-        <ImageView
-            android:id="@+id/close_btn"
-            android:layout_width="35dp"
-            android:layout_height="35dp"
-            android:src="@drawable/icon_finish_auction_close"
-            android:layout_gravity="right"
-            android:layout_marginRight="45dp"
-            />
-
-        <RelativeLayout
-            android:layout_width="275dp"
-            android:layout_height="290dp"
-            android:background="@drawable/icon_auction_finish_bg"
-            >
-
-            <RelativeLayout
-                android:layout_width="81dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="29dp"
-                android:layout_marginTop="97dp">
-
-                <RelativeLayout
-                    android:id="@+id/user_avatar_layout"
-                    android:layout_width="81dp"
-                    android:layout_height="81dp">
-
-                    <com.yizhuan.erban.common.widget.CircleImageView
-                        android:id="@+id/user_avatar"
-                        android:layout_width="65dp"
-                        android:layout_height="65dp"
-                        android:layout_centerInParent="true" />
-
-                    <ImageView
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:src="@drawable/icon_finish_first" />
-                </RelativeLayout>
-
-                <TextView
-                    android:id="@+id/user_nick"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/user_avatar_layout"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginTop="8dp"
-                    android:textColor="@color/text_color_primary"
-                    android:textSize="12dp" />
-
-            </RelativeLayout>
-
-            <RelativeLayout
-
-                android:layout_width="81dp"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_marginRight="29dp"
-                android:layout_marginTop="97dp">
-
-                <RelativeLayout
-                    android:id="@+id/voice_actor_avatar_layout"
-                    android:layout_width="81dp"
-                    android:layout_height="81dp">
-
-                    <com.yizhuan.erban.common.widget.CircleImageView
-                        android:id="@+id/voice_actor_avatar"
-                        android:layout_width="65dp"
-                        android:layout_height="65dp"
-                        android:layout_centerInParent="true" />
-                </RelativeLayout>
-
-                <TextView
-                    android:id="@+id/voice_actor_nick"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/voice_actor_avatar_layout"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginTop="8dp"
-                    android:textColor="@color/text_color_primary"
-                    android:textSize="12dp" />
-            </RelativeLayout>
-        </RelativeLayout>
-    </LinearLayout>
-
-
-</RelativeLayout>

app/src/main/res/layout/fans_list_item_new.xml

@@ -3,23 +3,22 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/rly"
-    android:gravity="center_vertical"
     android:layout_width="match_parent"
     android:layout_height="70dp"
     android:orientation="horizontal">
 
     <com.yizhuan.erban.ui.widget.NobleAvatarView
         android:id="@+id/noble_avatar_view"
-        android:layout_width="@dimen/dp_50"
+        android:layout_width="wrap_content"
-        android:layout_height="@dimen/dp_50"
+        android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_marginStart="@dimen/dp_15"
+        android:layout_marginStart="@dimen/dp_8"
         android:gravity="center_vertical" />
 
     <LinearLayout
+        android:layout_marginTop="@dimen/dp_16"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="10dp"
         android:layout_weight="1"
         android:orientation="vertical">
 
@@ -41,15 +40,14 @@
 
             <TextView
                 android:id="@+id/tv_userName"
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
-                android:layout_weight="1"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="2dp"
                 android:ellipsize="end"
                 android:lines="1"
                 android:textColor="@color/text_title_color"
-                android:textSize="15sp"
+                android:textSize="@dimen/sp_14"
-                tools:text="@string/layout_fans_list_item_new_01" />
+                tools:text="@string/layout_attention_item_new_01" />
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/iv_gender"
@@ -104,10 +102,9 @@
             android:id="@+id/tv_user_desc"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
             android:ellipsize="end"
             android:lines="1"
-            android:textColor="@color/text_normal_c6c6e9"
+            android:textColor="@color/color_B3B3C3"
             android:textSize="12sp"
             tools:text="1234568940" />
 
@@ -118,7 +115,6 @@
         android:layout_width="68dp"
         android:layout_height="30dp"
         android:layout_gravity="center_vertical"
-        android:layout_marginStart="@dimen/dp_26"
         android:layout_marginEnd="@dimen/dp_15"
         android:background="@drawable/selector_common_confirm"
         android:gravity="center"

app/src/main/res/layout/item_erban_grid_2_empty.xml

@@ -1,34 +0,0 @@
-<?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"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/ll_container"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:layout_marginStart="7.5dp"
-    android:layout_marginEnd="7.5dp"
-    android:paddingTop="6dp"
-    android:paddingBottom="6dp"
-    tools:layout_width="108dp">
-
-    <com.yizhuan.erban.ui.widget.SquareLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <com.makeramen.roundedimageview.RoundedImageView
-            android:id="@+id/iv_cover"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scaleType="fitCenter"
-            android:src="@drawable/icon_erban_grid_2_empty"
-            app:riv_corner_radius="@dimen/dp_16" />
-
-
-    </com.yizhuan.erban.ui.widget.SquareLayout>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_15" />
-
-</LinearLayout>

app/src/main/res/layout/item_reward_first.xml

@@ -35,7 +35,7 @@
         android:id="@+id/tv_reward"
         android:layout_marginTop="@dimen/dp_5"
         tools:text="@string/layout_item_reward_first_01"
-        tools:textColor="@color/red"
+        tools:textColor="@color/color_red"
         android:gravity="center"
         android:textSize="@dimen/sp_12"
         android:textColor="@color/white"

app/src/main/res/layout/item_reward_fourth.xml

@@ -1,61 +0,0 @@
-<?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:id="@+id/ll_reward_root"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:gravity="center_horizontal"
-    android:orientation="vertical">
-
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <RelativeLayout
-            android:layout_gravity="center_horizontal"
-            android:id="@+id/rl_container_28_day"
-            tools:background="@color/black_transparent_10"
-            android:layout_width="@dimen/dp_sign_in_total_reward_item_size"
-            android:layout_height="@dimen/dp_sign_in_total_reward_item_size">
-
-            <com.coorchice.library.SuperTextView
-                android:id="@+id/stv_shape"
-                app:corner="@dimen/dp_50"
-                app:solid="@color/white_transparent_30"
-                android:visibility="gone"
-                android:layout_centerInParent="true"
-                android:layout_width="@dimen/dp_sign_in_total_reward_item_size"
-                android:layout_height="@dimen/dp_sign_in_total_reward_item_size" />
-
-            <ImageView
-                android:id="@+id/iv_reward"
-                android:layout_centerInParent="true"
-                android:src="@drawable/icon_reward_un_sign_in"
-                android:layout_width="45dp"
-                android:layout_height="45dp" />
-
-        </RelativeLayout>
-
-        <ImageView
-            android:layout_gravity="center_horizontal"
-            android:layout_marginStart="15dp"
-            android:src="@drawable/icon_big_reward"
-            android:layout_width="37dp"
-            android:layout_height="19dp" />
-
-    </FrameLayout>
-
-    <TextView
-        android:id="@+id/tv_reward"
-        android:layout_marginTop="@dimen/dp_5"
-        tools:text="@string/layout_item_reward_fourth_01"
-        tools:textColor="@color/red"
-        android:gravity="center"
-        android:textSize="@dimen/sp_12"
-        android:textColor="@color/white"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-</LinearLayout>

app/src/main/res/layout/item_reward_second.xml

@@ -36,7 +36,7 @@
         android:id="@+id/tv_reward"
         android:layout_marginTop="@dimen/dp_5"
         tools:text="@string/layout_item_reward_second_01"
-        tools:textColor="@color/red"
+        tools:textColor="@color/color_red"
         android:gravity="center"
         android:textSize="@dimen/sp_12"
         android:textColor="@color/white"

app/src/main/res/layout/item_reward_third.xml

@@ -34,7 +34,7 @@
         android:id="@+id/tv_reward"
         android:layout_marginTop="@dimen/dp_5"
         tools:text="@string/layout_item_reward_third_01"
-        tools:textColor="@color/red"
+        tools:textColor="@color/color_red"
         android:gravity="center"
         android:textSize="@dimen/sp_12"
         android:textColor="@color/white"

app/src/main/res/layout/layout_auction_view.xml

@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge 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="match_parent">
-
-    <ImageView
-        android:id="@+id/auction_header"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:scaleType="centerCrop"
-        android:src="@drawable/icon_auction_wing" />
-
-    <com.yizhuan.erban.common.widget.CircleImageView
-        android:id="@+id/auction_owner_avatar"
-        android:layout_width="86dp"
-        android:layout_height="86dp"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="13dp"
-        app:cborder_color="@color/color_33FFFFFF"
-        app:cborder_width="3sp" />
-
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="13dp"
-        android:src="@drawable/icon_be_acution" />
-
-
-    <TextView
-        android:id="@+id/auction_owner_nick"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/auction_header"
-        android:layout_centerHorizontal="true"
-        android:drawablePadding="5dp"
-        android:drawableRight="@drawable/ic_gender_female"
-        android:text="@string/layout_layout_auction_view_01"
-        android:textColor="@color/white"
-        android:textSize="@dimen/font_medium" />
-
-    <ImageView
-        android:id="@+id/icon_current_auction_list"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/auction_owner_nick"
-        android:layout_marginTop="15dp"
-        android:src="@drawable/icon_current_auction_list" />
-
-
-    <RelativeLayout
-        android:layout_width="77dp"
-        android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/rl_second"
-        android:layout_toLeftOf="@+id/rl_second"
-
-        android:orientation="vertical">
-
-        <ImageView
-            android:id="@+id/auction_first_avatar"
-            android:layout_width="55dp"
-            android:layout_height="55dp"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="11dp" />
-
-        <ImageView
-            android:id="@+id/iv_first_current_list"
-            android:layout_width="77dp"
-            android:layout_height="77dp"
-            android:src="@drawable/icon_current_list_first" />
-
-
-        <TextView
-            android:id="@+id/auction_first_nick"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/iv_first_current_list"
-            android:layout_centerHorizontal="true"
-            android:layout_gravity="center_horizontal"
-            android:ellipsize="end"
-            android:lines="1"
-            android:maxLines="1"
-            android:text="@string/layout_layout_auction_view_02"
-            android:textColor="@color/white"
-            android:textSize="@dimen/font_small" />
-
-        <TextView
-            android:id="@+id/auction_first_corn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/auction_first_nick"
-            android:layout_centerHorizontal="true"
-            android:layout_gravity="center_horizontal"
-            android:drawablePadding="4dp"
-            android:drawableRight="@drawable/icon_auction_corn"
-            android:text="5000"
-            android:textColor="@color/white"
-            android:textSize="@dimen/font_medium" />
-
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:id="@+id/rl_second"
-        android:layout_width="77dp"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/icon_current_auction_list"
-        android:layout_centerHorizontal="true"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
-        android:layout_marginTop="13dp"
-
-        android:orientation="vertical">
-
-        <ImageView
-            android:id="@+id/auction_second_avatar"
-            android:layout_width="55dp"
-            android:layout_height="55dp"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="11dp" />
-
-        <ImageView
-            android:id="@+id/iv_second_current_list"
-            android:layout_width="77dp"
-            android:layout_height="77dp"
-            android:src="@drawable/icon_current_list_second" />
-
-
-        <TextView
-            android:id="@+id/auction_second_nick"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/iv_second_current_list"
-            android:layout_centerHorizontal="true"
-            android:layout_gravity="center_horizontal"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:text="@string/layout_layout_auction_view_03"
-            android:textColor="@color/white"
-            android:textSize="@dimen/font_small" />
-
-        <TextView
-            android:id="@+id/auction_second_corn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/auction_second_nick"
-            android:layout_centerHorizontal="true"
-            android:drawablePadding="4dp"
-            android:drawableRight="@drawable/icon_auction_corn"
-            android:text="5000"
-            android:textColor="@color/white"
-            android:textSize="@dimen/font_medium" />
-
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:layout_width="77dp"
-        android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/rl_second"
-        android:layout_toRightOf="@+id/rl_second"
-        android:orientation="vertical">
-
-        <ImageView
-            android:id="@+id/auction_third_avatar"
-            android:layout_width="55dp"
-            android:layout_height="55dp"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="11dp" />
-
-        <ImageView
-            android:id="@+id/iv_third_current_list"
-            android:layout_width="77dp"
-            android:layout_height="77dp"
-            android:src="@drawable/icon_current_list_third" />
-
-
-        <TextView
-            android:id="@+id/auction_third_nick"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/iv_third_current_list"
-            android:layout_centerHorizontal="true"
-            android:layout_gravity="center_horizontal"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:text="@string/layout_layout_auction_view_04"
-            android:textColor="@color/white"
-            android:textSize="@dimen/font_small" />
-
-        <TextView
-            android:id="@+id/auction_third_corn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/auction_third_nick"
-            android:layout_centerHorizontal="true"
-            android:layout_gravity="center_horizontal"
-            android:drawablePadding="4dp"
-            android:drawableRight="@drawable/icon_auction_corn"
-            android:text="5000"
-            android:textColor="@color/white"
-            android:textSize="@dimen/font_medium" />
-
-    </RelativeLayout>
-
-
-    <ImageView
-        android:id="@+id/auction_tip_image"
-        android:layout_width="45dp"
-        android:layout_height="50dp"
-        android:layout_above="@+id/auction_btn_image"
-        android:layout_alignParentRight="true"
-        android:layout_marginRight="15dp"
-        android:paddingBottom="6dp"
-        android:src="@drawable/icon_hammer_tip" />
-
-    <ImageView
-        android:id="@+id/auction_btn_image"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:layout_marginRight="15dp"
-
-        android:src="@drawable/icon_hammer" />
-</merge>

app/src/main/res/layout/layout_bill_date.xml

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/rly_date"
-    android:layout_width="match_parent"
-    android:layout_height="58dp"
-    android:background="@color/white">
-
-    <TextView
-        android:id="@+id/tv_date"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_marginLeft="15dp"
-        android:text="@string/layout_layout_bill_date_01"
-        android:textColor="@color/color_999999"
-        android:textSize="18sp" />
-
-    <ImageView
-        android:id="@+id/iv_today_select"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_centerVertical="true"
-        android:layout_toLeftOf="@+id/tv_selector_date"
-        android:paddingLeft="8dp"
-        android:paddingRight="8dp"
-        android:src="@mipmap/ic_day_today_yellow"
-        android:visibility="visible" />
-
-    <ImageView
-        android:id="@+id/tv_selector_date"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_alignParentRight="true"
-        android:layout_centerVertical="true"
-        android:layout_marginRight="15dp"
-        android:paddingLeft="8dp"
-        android:src="@drawable/icon_date_yellow" />
-</RelativeLayout>

app/src/main/res/layout/list_item_attention_user_live.xml

@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/rly_home"
-    android:layout_width="match_parent"
-    android:layout_height="150dp"
-    android:background="@color/white"
-    android:paddingBottom="10dp"
-    android:paddingLeft="10dp"
-    android:paddingRight="10dp">
-
-    <ImageView
-        android:id="@+id/image_bg"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-    <ImageView
-        android:id="@+id/flag_logo"
-        android:layout_width="36dp"
-        android:layout_height="16dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginTop="10dp"
-        android:src="@drawable/icon_attention_flag_auction" />
-
-    <LinearLayout
-        android:layout_width="100dp"
-        android:layout_height="28dp"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="33dp"
-        android:background="@drawable/bg_radius_live_black"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            android:id="@+id/live_animation"
-            android:layout_width="9dp"
-            android:layout_height="12dp"
-            android:layout_marginLeft="15dp" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="8dp"
-            android:layout_toRightOf="@id/live_animation"
-            android:text="@string/online"
-            android:textColor="@color/white"
-            android:textSize="13sp" />
-
-    </LinearLayout>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="55dp"
-        android:layout_alignParentBottom="true"
-        android:background="@drawable/bg_radius_attention_black" />
-
-    <ImageView
-        android:id="@+id/avatar"
-        android:layout_width="36dp"
-        android:layout_height="36dp"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="9.5dp"
-        android:layout_marginLeft="10dp" />
-
-
-    <TextView
-        android:id="@+id/nick"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBottom="@+id/avatar"
-        android:layout_alignTop="@+id/avatar"
-        android:layout_marginLeft="10dp"
-        android:layout_toRightOf="@id/avatar"
-        android:drawablePadding="5dp"
-        android:gravity="center_vertical"
-        android:textColor="@color/white"
-        android:textSize="13sp" />
-</RelativeLayout>

app/src/main/res/layout/list_item_auction_header.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="28dp">
-        <ImageView
-            android:id="@+id/auction_list_header"
-            android:layout_centerHorizontal="true"
-            android:layout_alignParentBottom="true"
-            android:layout_width="178dp"
-            android:layout_height="28dp"
-            android:src="@drawable/icon_week_auction_list"
-            />
-    </RelativeLayout>
-</LinearLayout>

app/src/main/res/layout/list_item_friend_new.xml

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/container"
     android:layout_width="match_parent"
-    android:layout_height="71dp"
+    android:layout_height="70dp"
     android:orientation="horizontal">
 
     <com.yizhuan.erban.ui.widget.NobleAvatarView
@@ -12,13 +12,12 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_marginStart="5dp" />
+        android:layout_marginStart="@dimen/dp_8" />
 
     <LinearLayout
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="10dp"
+        android:layout_marginTop="@dimen/dp_16"
-        android:layout_marginTop="10dp"
         android:layout_weight="1"
         android:orientation="vertical">
 
@@ -106,10 +105,9 @@
             android:id="@+id/tv_user_desc"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
             android:ellipsize="end"
             android:lines="1"
-            android:textColor="@color/text_normal_c6c6e9"
+            android:textColor="@color/color_B3B3C3"
             android:textSize="12sp"
             tools:text="1234568940" />
 
@@ -120,7 +118,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_marginStart="10dp"
         android:layout_marginEnd="15dp">
 
         <TextView

app/src/main/res/layout/noble_avatar_layout.xml

@@ -9,21 +9,22 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
-        tools:src="@drawable/default_avatar" />
+        tools:src="@drawable/default_avatar"
+        tools:layout_width="54dp"
+        tools:layout_height="54dp"/>
 
     <ImageView
         android:id="@+id/iv_avatar_head_wear"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
-        android:visibility="visible"
+        android:visibility="visible" />
-        />
 
     <ImageView
         android:id="@+id/iv_user_noble_level"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignBottom="@+id/iv_avatar"
         android:layout_alignEnd="@+id/iv_avatar"
-         />
+        android:layout_alignBottom="@+id/iv_avatar" />
+
 </merge>

app/src/main/res/layout/red_packet_dialog.xml

@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:background="@color/transparent">
-
-    <RelativeLayout
-        android:id="@+id/container"
-        android:layout_width="257dp"
-        android:layout_height="347dp"
-        android:layout_alignParentTop="true"
-        android:layout_centerHorizontal="true">
-
-        <RelativeLayout
-            android:id="@+id/open_red_packet"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@mipmap/bg_open_redpacket"
-            android:visibility="visible">
-
-            <ImageView
-                android:id="@+id/img_open"
-                android:layout_width="84dp"
-                android:layout_height="84dp"
-                android:layout_alignParentBottom="true"
-                android:layout_centerHorizontal="true"
-                android:layout_marginBottom="38dp"
-                android:src="@mipmap/ic_open_redpacket" />
-
-            <TextView
-                android:id="@+id/source"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_above="@id/img_open"
-                android:layout_centerHorizontal="true"
-                android:layout_marginBottom="27dp"
-                android:textSize="@dimen/dialog_title_text_fnt"
-                android:textColor="#F9E3AE"
-                tools:text="@string/layout_red_packet_dialog_01" />
-
-
-        </RelativeLayout>
-
-        <LinearLayout
-            android:id="@+id/check_red_packet"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@mipmap/bg_view_redpacket"
-            android:orientation="vertical"
-            android:visibility="invisible">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="113dp"
-                android:gravity="center">
-
-                <TextView
-                    android:id="@+id/tv_red_money"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    tools:text="1.99"
-                    android:textSize="45sp"
-                    android:textColor="#FEED8F" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="bottom"
-                    android:layout_marginLeft="4dp"
-                    android:text="@string/layout_red_packet_dialog_02"
-                    android:textSize="13sp"
-                    android:textColor="#FEED8F" />
-
-            </LinearLayout>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginTop="4dp"
-                android:text="@string/layout_red_packet_dialog_03"
-                android:textSize="@dimen/font_larger"
-                android:textColor="@color/white" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:text="@string/layout_red_packet_dialog_04"
-                android:textSize="@dimen/font_medium"
-                android:textColor="@color/white" />
-
-            <ImageView
-                android:id="@+id/tv_look"
-                android:layout_width="164dp"
-                android:layout_height="50dp"
-                android:layout_marginTop="29dp"
-                android:layout_gravity="center_horizontal"
-                android:src="@mipmap/ic_see_redpacket" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                android:layout_gravity="center_horizontal"
-                android:text="@string/layout_red_packet_dialog_05"
-                android:textSize="@dimen/font_medium"
-                android:textColor="@color/white" />
-
-        </LinearLayout>
-
-
-        <ImageView
-            android:id="@+id/img_close"
-            android:layout_width="27dp"
-            android:layout_height="27dp"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentRight="true"
-            android:layout_marginTop="10dp"
-            android:layout_marginRight="12dp"
-            android:src="@mipmap/ic_close_redpacket" />
-
-    </RelativeLayout>
-
-</RelativeLayout>

app/src/main/res/values-ar/strings.xml

@@ -3341,8 +3341,6 @@
     <string name="layout_family_attention_item_01">مِلكِي</string>
     <string name="layout_family_fans_list_item_01">مِلكِي</string>
     <string name="layout_family_list_item_friend_01">مِلكِي</string>
-    <string name="layout_fans_list_item_01">بلدي بلدي بلدي بلدي بلدي</string>
-    <string name="layout_fans_list_item_new_01">بلدي بلدي بلدي بلدي بلدي</string>
     <string name="layout_floating_live_mini_view_01">إيريس ميازاوا إيريس ميازاوا</string>
     <string name="layout_fragment_add_user_info_01">يسجل</string>
     <string name="layout_fragment_add_user_info_02">كنية</string>