Просмотр исходного кода

邀请好友界面添加好友排行榜top5的规则提示框;优化邀请好友界面

zengjiebin лет назад: 7
Родитель
Сommit
eaa623ef53

+ 8 - 4
app/src/main/java/com/kfzs/duanduan/fragment/FgtFriendExtractPage.java

@@ -55,14 +55,16 @@ public class FgtFriendExtractPage extends BaseFragment {
     private int page = 1;
     private void notifyDataSetChanged(){
         int size = list.size();
-        for (int i = 0; i < friend_list_ll.getChildCount(); i++) {
-            ViewGroup view = (ViewGroup) friend_list_ll.getChildAt(i);
-            if(i < size){
+        for (int i = 0; i < friend_list_ll.getChildCount(); ) {
+            View line = friend_list_ll.getChildAt(i);
+            ViewGroup view = (ViewGroup) friend_list_ll.getChildAt(i+1);
+            if(i/2 < size){
+                line.setVisibility(View.VISIBLE);
                 view.setVisibility(View.VISIBLE);
 //                if(i % 2 == 0)
 //                    view.setBackgroundColor(0xffF8F8F8);
                 int j = 0;
-                Friend friend = list.get(i);
+                Friend friend = list.get(i/2);
                 TextView friend_item_id = (TextView) view.getChildAt(j++);
                 friend_item_id.setText(friend.getInvitation_code());
                 TextView friend_item_name = (TextView) view.getChildAt(j++);
@@ -72,8 +74,10 @@ public class FgtFriendExtractPage extends BaseFragment {
                 TextView friend_item_time = (TextView) view.getChildAt(j);
                 friend_item_time.setText(TimeUtil.TimeStamp2Date(friend.getCreate_time(), "yyyy/MM/dd HH:mm"));
             } else {
+                line.setVisibility(View.INVISIBLE);
                 view.setVisibility(View.INVISIBLE);
             }
+            i += 2;
         }
         CommonUtil.getInstance().updateEmptyView(empty_view, list.isEmpty(), true);
     }

+ 24 - 1
app/src/main/java/com/sheep/gamegroup/model/entity/DialogConfig.java

@@ -1,9 +1,13 @@
 package com.sheep.gamegroup.model.entity;
 
+import android.support.annotation.IntDef;
+import android.view.Gravity;
 import android.view.View;
 
 import com.sheep.jiuyan.samllsheep.R;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -162,10 +166,29 @@ public class DialogConfig {
         return msgGravity;
     }
 
-    public DialogConfig setMsgGravity(int msgGravity) {
+    @IntDef({Gravity.START, Gravity.END, Gravity.CENTER, Gravity.TOP, Gravity.BOTTOM, Gravity.NO_GRAVITY})
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface GRAVITY {
+    }
+    public DialogConfig setMsgGravity(@GRAVITY int msgGravity) {
         this.msgGravity = msgGravity;
         return this;
     }
+    public static final int THEME_DEFAULT = 0;
+    public static final int THEME_PURPLE = 1;
+    private int theme = THEME_DEFAULT;
+    @IntDef({THEME_DEFAULT, THEME_PURPLE})
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface THEME {
+    }
+    public DialogConfig setTheme(@THEME int theme) {
+        this.theme = theme;
+        return this;
+    }
+
+    public int getTheme() {
+        return theme;
+    }
 
     public boolean isBtnLeftNotDissDialog() {
         return btnLeftNotDissDialog;

+ 19 - 0
app/src/main/java/com/sheep/gamegroup/util/ViewUtil.java

@@ -6,10 +6,12 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.Bitmap;
+import android.graphics.Color;
 import android.media.MediaPlayer;
 import android.net.Uri;
 import android.os.Build;
 import android.provider.MediaStore;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
@@ -336,6 +338,11 @@ public class ViewUtil {
         View dialog_parent = View.inflate(mContext, R.layout.dialog_parent, null);
         final AlertDialog dialog = new AlertDialog.Builder(mContext, mContext instanceof Activity ? R.style.MyDialogActivityTheme : R.style.AppTheme_Dialog_Alert).setView(dialog_parent).create();
         TextView dialog_title = dialog_parent.findViewById(R.id.dialog_title);
+        switch (dialogConfig.getTheme()){//设置按钮风格
+            case DialogConfig.THEME_PURPLE:
+                dialog_title.setBackgroundResource(R.drawable.shape_purple_solid_rectangle_top);
+                break;
+        }
         View dialog_close = dialog_parent.findViewById(R.id.dialog_close);
         LinearLayout dialog_center_ll = dialog_parent.findViewById(R.id.dialog_center_ll);
         View view = LayoutInflater.from(mContext).inflate(dialogConfig.getLayoutId(), dialog_center_ll, true);
@@ -388,6 +395,12 @@ public class ViewUtil {
         TextView dialog_btn_left = view.findViewById(R.id.dialog_btn_left);
         boolean isLeftBtnShow = btnLeftText != null || btnLeftOnClickListener != null;
         if(dialog_btn_left != null) {
+            switch (dialogConfig.getTheme()){//设置按钮风格
+                case DialogConfig.THEME_PURPLE:
+                    dialog_btn_left.setBackgroundResource(R.drawable.selector_button_full_purple);
+                    dialog_btn_left.setTextColor(Color.WHITE);
+                    break;
+            }
             dialog_btn_left.setVisibility(isLeftBtnShow ? View.VISIBLE : View.GONE);
             if (!TextUtils.isEmpty(btnLeftText))
                 dialog_btn_left.setText(btnLeftText);
@@ -406,6 +419,12 @@ public class ViewUtil {
         TextView dialog_btn_right = view.findViewById(R.id.dialog_btn_right);
         boolean isRigthBtnShow = btnRightText != null || btnRightOnClickListener != null;
         if(dialog_btn_right != null) {
+            switch (dialogConfig.getTheme()){//设置按钮风格
+                case DialogConfig.THEME_PURPLE:
+                    dialog_btn_right.setBackgroundResource(R.drawable.selector_button_full_purple);
+                    dialog_btn_right.setTextColor(Color.WHITE);
+                    break;
+            }
             dialog_btn_right.setVisibility(isRigthBtnShow ? View.VISIBLE : View.GONE);
             if (!TextUtils.isEmpty(btnRightText))
                 dialog_btn_right.setText(btnRightText);

+ 48 - 20
app/src/main/java/com/sheep/gamegroup/view/activity/AskGetMoneyAct.java

@@ -7,6 +7,7 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.util.SparseArray;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
@@ -24,6 +25,7 @@ import com.sheep.gamegroup.di.modules.AskGetMoneyModule;
 import com.sheep.gamegroup.model.entity.AskAward;
 import com.sheep.gamegroup.model.entity.AskTop;
 import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.DialogConfig;
 import com.sheep.gamegroup.model.entity.FriendAndAwardEntity;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
@@ -91,6 +93,8 @@ public class AskGetMoneyAct extends BaseUMActivity implements AskGetMoneyContrac
     MarqueeView ask_award_info;
     @BindView(R.id.ask_scroll_view)
     NestedScrollView scrollView;
+    @BindView(R.id.empty_view)
+    View empty_view;
 
     private FriendAndAwardEntity mEntity;
 
@@ -118,7 +122,7 @@ public class AskGetMoneyAct extends BaseUMActivity implements AskGetMoneyContrac
                 "  <head>\n" +
                 "    <title>HTML字符串</title>\n" +
                 "    <metahttp-equivmetahttp-equiv=\"content-type\" content=\"text/html;charset=utf-8\">\n" +
-                "    <meta name=\"viewport\" content=\"width="+G.WIDTH+", user-scalable=no\">\n" +
+                "    <meta name=\"viewport\" content=\"width=" + G.WIDTH + ", user-scalable=no\">\n" +
                 "    <style type=\"text/css\">\n" +
                 "      body {\n" +
                 "        margin: 0;\n" +
@@ -131,17 +135,17 @@ public class AskGetMoneyAct extends BaseUMActivity implements AskGetMoneyContrac
                 "    </style>\n" +
                 "  </head>\n" +
                 "  <body>\n" +
-                "    <img src=\"http://cdngame.kuaifazs.com/ask_bg.png\" width=\"100%\">\n" +
+                "    <img src=\"http://cdngame.kuaifazs.com/ask_bg2.png\" width=\"100%\">\n" +
                 "  </body>\n" +
                 "</html>";
-        ask_bg.getSettings().setDefaultTextEncodingName("UTF-8") ;
-        ask_bg.loadData(content, "text/html", "UTF-8") ;
+        ask_bg.getSettings().setDefaultTextEncodingName("UTF-8");
+        ask_bg.loadData(content, "text/html", "UTF-8");
 //                16,18,19
         LinearLayout.LayoutParams layoutParams1 = (LinearLayout.LayoutParams) ask_top_1.getLayoutParams();
-        layoutParams1.height = G.WIDTH * 16 / 18;
+        layoutParams1.height = G.WIDTH * 690 / 625;
         ask_top_1.setLayoutParams(layoutParams1);
         LinearLayout.LayoutParams layoutParams2 = (LinearLayout.LayoutParams) ask_top_2.getLayoutParams();
-        layoutParams2.height = G.WIDTH * 3 / 18;
+        layoutParams2.height = G.WIDTH * 112 / 625;
         ask_top_2.setLayoutParams(layoutParams2);
         ask_top5_not_you.setVisibility(View.INVISIBLE);
     }
@@ -175,16 +179,23 @@ public class AskGetMoneyAct extends BaseUMActivity implements AskGetMoneyContrac
             @Override
             public void convert(ViewHolder holder, final AskTop item) {
                 View itemView = holder.itemView;
-                if (item == null)
+                int position = holder.getAdapterPosition();
+                if (position == 0) {
                     return;
+                }
                 TextView x_ask_top5_item_user = itemView.findViewById(R.id.x_ask_top5_item_user);
                 TextView x_ask_top5_item_money = itemView.findViewById(R.id.x_ask_top5_item_money);
                 TextView x_ask_top5_item_award = itemView.findViewById(R.id.x_ask_top5_item_award);
+                ImageView ask_top5_item_iv = itemView.findViewById(R.id.ask_top5_item_iv);
+
+                if (item == null) {//空数据占位置
+                    itemView.setVisibility(View.INVISIBLE);
+                    return;
+                }
                 ViewUtil.setText(x_ask_top5_item_user, String.format(Locale.CHINA, "昵称\n%s\n邀请人数:%d", item.getNickname(), item.getSum_friend()));
                 ViewUtil.setText(x_ask_top5_item_money, String.format(Locale.CHINA, "%.0f", item.getSum_amount()));
                 ViewUtil.setText(x_ask_top5_item_award, item.getPrize());
-                ImageView ask_top5_item_iv = itemView.findViewById(R.id.ask_top5_item_iv);
-                switch (holder.getAdapterPosition()){
+                switch (position) {
                     case 1:
                         ask_top5_item_iv.setImageResource(R.mipmap.ask_top_1);
                         break;
@@ -251,20 +262,15 @@ public class AskGetMoneyAct extends BaseUMActivity implements AskGetMoneyContrac
                     @Override
                     public void onNext(BaseMessage baseMessage) {
                         List<AskTop> newList = baseMessage.getDataList(AskTop.class);
-                        if(ListUtil.isEmpty(newList)){
+                        if (ListUtil.isEmpty(newList)) {
                             return;
                         }
-                        if(BuildConfig.DEBUG) {
-                            while (newList.size() < 5){
-                                newList.add(newList.get(0));
-                            }
-                        }
                         list.addAll(newList);
-                        adapter.notifyDataSetChanged();
+                        notifyDataSetChanged();
                         String userId = DataUtil.getInstance().getUserId();
                         boolean hasMe = false;
                         for (AskTop item : newList) {
-                            if(TextUtils.equals(userId, item.getUser_id())){
+                            if (TextUtils.equals(userId, item.getUser_id())) {
                                 hasMe = true;
                                 break;
                             }
@@ -274,7 +280,8 @@ public class AskGetMoneyAct extends BaseUMActivity implements AskGetMoneyContrac
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
-
+                        notifyDataSetChanged();
+                        ask_top5_not_you.setVisibility(View.VISIBLE);
                     }
                 });
         SheepApp.getInstance().getNetComponent().getApiService().getInvitationTopRecord()
@@ -298,6 +305,14 @@ public class AskGetMoneyAct extends BaseUMActivity implements AskGetMoneyContrac
                 });
     }
 
+    private void notifyDataSetChanged() {
+        CommonUtil.getInstance().updateEmptyView(empty_view, list.size() == 1, true);
+        while (list.size() < 5) {
+            list.add(null);
+        }
+        adapter.notifyDataSetChanged();
+    }
+
 
     @Override
     public void NetSuccess(int code, String msg, String s) {
@@ -326,7 +341,6 @@ public class AskGetMoneyAct extends BaseUMActivity implements AskGetMoneyContrac
     }
 
 
-
     private SparseArray<FgtFriendExtractPage> mTestFragments;
 
     public void setFriendExtractCount(int count, int page, int size) {
@@ -367,7 +381,7 @@ public class AskGetMoneyAct extends BaseUMActivity implements AskGetMoneyContrac
             @Override
             public void onPageSelected(int i) {
                 curPage = i + 1;
-                friend_extract_page_tv.setText(String.format(Locale.CHINA,"%d", curPage));
+                friend_extract_page_tv.setText(String.format(Locale.CHINA, "%d", curPage));
                 checkAddPage(curPage, mTestFragments.get(curPage).getList().size());
             }
 
@@ -399,10 +413,24 @@ public class AskGetMoneyAct extends BaseUMActivity implements AskGetMoneyContrac
             ask_award_info.stopFlipping();
         }
     }
+
     //显示分享对话框
     public void showShareView(View view) {
         String url = userEntity.getShareLink();
         String description = mEntity.getShare_desc();
         ViewUtil.showShareDialog(activity, url, description);
     }
+
+    //显示邀请好友排行榜top5的规则的对话框
+    public void showAstTop5Tip(View view) {
+        ViewUtil.showMsgDialog(activity, new DialogConfig().setTitle("活动说明")
+                .setMsg(".每天实时更新排行数据。\n" +
+                        ".根据当月已赚赏金(定向货币除外)和邀请人数进行排行\n" +
+                        ".每个月前5名可获取排行奖励。\n" +
+                        ".每个月月底最后一天24:00可公布结果,获奖的用户需通过“小绵羊领头羊”公众号发送获奖截图证明及收货信息,核对信息真实后,会第一时间发放!\n" +
+                        ".本活动最终解释权归成都橙风有量科技有限公司所有!")
+                .setMsgGravity(Gravity.START)
+                .setTheme(DialogConfig.THEME_PURPLE)
+                .setBtnLeftText("我知道了"));
+    }
 }

+ 6 - 0
app/src/main/res/drawable/shape_purple_solid_rectangle_top.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:topLeftRadius="18dp" android:topRightRadius="18dp" />
+    <solid android:color="@color/button_color_purple" />
+</shape>

+ 71 - 11
app/src/main/res/layout/friend_list.xml

@@ -2,17 +2,77 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/friend_list_ll"
     android:layout_width="match_parent"
-    android:layout_height="130dp"
+    android:layout_height="@dimen/ask_friend_list_h"
     android:layout_centerInParent="true"
     android:orientation="vertical">
-    <include layout="@layout/x_ask_getmoney_act_layout_item"
-        android:visibility="invisible"/>
-    <include layout="@layout/x_ask_getmoney_act_layout_item"
-        android:visibility="invisible"/>
-    <include layout="@layout/x_ask_getmoney_act_layout_item"
-        android:visibility="invisible"/>
-    <include layout="@layout/x_ask_getmoney_act_layout_item"
-        android:visibility="invisible"/>
-    <include layout="@layout/x_ask_getmoney_act_layout_item"
-        android:visibility="invisible"/>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginTop="@dimen/dp_10"
+        android:layout_marginBottom="@dimen/dp_10"
+        android:layout_marginStart="@dimen/content_padding_10"
+        android:layout_marginEnd="@dimen/content_padding_10"
+        android:background="#F5F5F5"
+        android:visibility="invisible" />
+
+    <include
+        layout="@layout/x_ask_getmoney_act_layout_item"
+        android:visibility="invisible" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginTop="@dimen/dp_10"
+        android:layout_marginBottom="@dimen/dp_10"
+        android:layout_marginStart="@dimen/content_padding_10"
+        android:layout_marginEnd="@dimen/content_padding_10"
+        android:background="#F5F5F5"
+        android:visibility="invisible" />
+
+    <include
+        layout="@layout/x_ask_getmoney_act_layout_item"
+        android:visibility="invisible" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginTop="@dimen/dp_10"
+        android:layout_marginBottom="@dimen/dp_10"
+        android:layout_marginStart="@dimen/content_padding_10"
+        android:layout_marginEnd="@dimen/content_padding_10"
+        android:background="#F5F5F5"
+        android:visibility="invisible" />
+
+    <include
+        layout="@layout/x_ask_getmoney_act_layout_item"
+        android:visibility="invisible" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginTop="@dimen/dp_10"
+        android:layout_marginBottom="@dimen/dp_10"
+        android:layout_marginStart="@dimen/content_padding_10"
+        android:layout_marginEnd="@dimen/content_padding_10"
+        android:background="#F5F5F5"
+        android:visibility="invisible" />
+
+    <include
+        layout="@layout/x_ask_getmoney_act_layout_item"
+        android:visibility="invisible" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginTop="@dimen/dp_10"
+        android:layout_marginBottom="@dimen/dp_10"
+        android:layout_marginStart="@dimen/content_padding_10"
+        android:layout_marginEnd="@dimen/content_padding_10"
+        android:background="#F5F5F5"
+        android:visibility="invisible" />
+
+    <include
+        layout="@layout/x_ask_getmoney_act_layout_item"
+        android:visibility="invisible" />
 </LinearLayout>

+ 2 - 4
app/src/main/res/layout/friend_list_empty.xml

@@ -1,10 +1,8 @@
 <?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="130dp"
+    android:layout_height="@dimen/ask_friend_list_h"
     android:layout_centerInParent="true"
-    android:paddingStart="@dimen/content_padding_10"
-    android:paddingEnd="@dimen/content_padding_10"
     android:orientation="vertical">
 
     <RelativeLayout
@@ -18,7 +16,7 @@
             android:layout_width="wrap_content"
             android:layout_height="80dp"
             android:layout_centerHorizontal="true"
-            android:layout_marginTop="@dimen/dp_10"
+            android:layout_marginTop="80dp"
             android:gravity="center"
             android:scaleType="centerInside"
             android:src="@mipmap/wushuju"

+ 61 - 9
app/src/main/res/layout/x_ask_getmoney_act_layout.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout 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:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools"
     tools:context="com.sheep.gamegroup.view.activity.AskGetMoneyAct">
 
 
@@ -13,23 +13,32 @@
         android:id="@+id/ask_scroll_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginBottom="@dimen/content_padding_10"
+        android:layout_marginBottom="60dp"
         android:layout_marginTop="?attr/actionBarSize"
         android:orientation="vertical"
         android:scrollbars="none">
 
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            android:background="#FFD269">
 
             <WebView
                 android:id="@+id/ask_bg"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" />
 
+            <!--底部有白条,用这一层覆盖-->
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="100dp"
+                android:layout_alignParentBottom="true"
+                android:background="#FFD269"/>
+            <!--内容   注:layout_marginBottom 为底部添加一点空间-->
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:layout_marginBottom="@dimen/content_padding_10"
                 android:baselineAligned="false"
                 android:descendantFocusability="beforeDescendants"
                 android:focusable="true"
@@ -122,9 +131,9 @@
                 <android.support.constraint.ConstraintLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/content_padding_10"
                     android:layout_marginEnd="@dimen/content_padding_10"
                     android:layout_marginStart="@dimen/content_padding_10"
-                    android:layout_marginTop="@dimen/content_padding_10"
                     android:background="@drawable/x_shap_shadow_bg_rectgangle_purple_red"
                     android:padding="@dimen/content_padding_10">
 
@@ -132,6 +141,8 @@
                         android:id="@+id/ask_top5_title"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:paddingBottom="@dimen/content_padding_10"
+                        android:paddingTop="@dimen/content_padding_10"
                         android:text="本月排行榜top5"
                         android:textColor="#ffffff"
                         android:textSize="14sp"
@@ -146,14 +157,56 @@
                         android:textColor="#ffffff"
                         android:textSize="10sp"
                         app:layout_constraintBottom_toBottomOf="@+id/ask_top5_title"
+                        app:layout_constraintEnd_toStartOf="@+id/ask_top3_tip"
+                        app:layout_constraintTop_toTopOf="@+id/ask_top5_title" />
+
+                    <ImageView
+                        android:id="@+id/ask_top3_tip"
+                        android:layout_width="18dp"
+                        android:layout_height="38dp"
+                        android:paddingBottom="@dimen/content_padding_10"
+                        android:paddingEnd="3dp"
+                        android:paddingStart="3dp"
+                        android:paddingTop="@dimen/content_padding_10"
+                        android:src="@mipmap/ask_top5_tip"
+                        android:onClick="showAstTop5Tip"
+                        app:layout_constraintBottom_toBottomOf="@+id/ask_top5_title"
                         app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
+                        app:layout_constraintTop_toTopOf="@+id/ask_top5_title" />
+                    <RelativeLayout
+                        android:id="@+id/empty_view"
+                        android:layout_width="match_parent"
+                        android:layout_height="0dp"
+                        app:layout_constraintTop_toTopOf="@+id/ask_top5_list"
+                        app:layout_constraintBottom_toBottomOf="@+id/ask_top5_list"
+                        android:visibility="invisible">
 
+                        <ImageView
+                            android:id="@+id/empty_view_img"
+                            android:layout_width="wrap_content"
+                            android:layout_height="80dp"
+                            android:layout_marginTop="140dp"
+                            android:layout_centerHorizontal="true"
+                            android:gravity="center"
+                            android:scaleType="centerInside"
+                            android:src="@mipmap/wushuju"/>
+
+                        <TextView
+                            android:id="@+id/empty_view_msg"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:gravity="center"
+                            android:layout_below="@id/empty_view_img"
+                            android:layout_centerHorizontal="true"
+                            android:layout_marginTop="@dimen/content_padding_10"
+                            android:text="@string/wushuju"
+                            android:textColor="#ffffff"
+                            android:textSize="15sp" />
+                    </RelativeLayout>
                     <android.support.v7.widget.RecyclerView
                         android:id="@+id/ask_top5_list"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="10dp"
                         app:layout_constraintTop_toBottomOf="@+id/ask_top5_title" />
 
                 </android.support.constraint.ConstraintLayout>
@@ -214,8 +267,8 @@
                     <com.kfzs.duanduan.view.ViewPagerPlus
                         android:id="@+id/friend_extract_vp"
                         android:layout_width="match_parent"
-                        android:layout_height="130dp"
-                        android:layout_marginTop="@dimen/content_padding_10" />
+                        android:layout_height="@dimen/ask_friend_list_h"
+                        android:layout_marginTop="3dp" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -275,7 +328,6 @@
                             android:textSize="12sp" />
                     </LinearLayout>
                 </LinearLayout>
-
             </LinearLayout>
         </RelativeLayout>
     </android.support.v4.widget.NestedScrollView>

+ 5 - 7
app/src/main/res/layout/x_ask_getmoney_act_layout_include.xml

@@ -3,15 +3,13 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
-    android:paddingStart="@dimen/content_padding_10"
-    android:paddingEnd="@dimen/content_padding_10"
     android:orientation="horizontal">
     <TextView
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="22dp"
+        android:layout_marginStart="@dimen/content_padding_10"
         android:layout_weight="3"
-        android:gravity="start"
+        android:gravity="center"
         android:singleLine="true"
         android:textSize="12sp"
         android:textColor="#ffffff"
@@ -20,7 +18,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="4"
-        android:gravity="start"
+        android:gravity="center"
         android:singleLine="true"
         android:textSize="12sp"
         android:textColor="#ffffff"
@@ -29,7 +27,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="2"
-        android:gravity="start"
+        android:gravity="center"
         android:singleLine="true"
         android:textSize="12sp"
         android:textColor="#ffffff"
@@ -39,7 +37,7 @@
         android:layout_height="wrap_content"
         android:layout_weight="5"
         android:singleLine="true"
-        android:gravity="start"
+        android:gravity="center"
         android:textSize="12sp"
         android:textColor="#ffffff"
         android:text="注册时间"/>

+ 5 - 5
app/src/main/res/layout/x_ask_getmoney_act_layout_item.xml

@@ -7,9 +7,9 @@
     <TextView
         android:layout_width="0dp"
         android:layout_height="26dp"
-        android:layout_marginStart="22dp"
+        android:layout_marginStart="@dimen/content_padding_10"
         android:layout_weight="3"
-        android:gravity="start"
+        android:gravity="center"
         android:singleLine="true"
         android:textSize="10sp"
         android:textColor="#ffffff"
@@ -18,7 +18,7 @@
         android:layout_width="0dp"
         android:layout_height="26dp"
         android:layout_weight="4"
-        android:gravity="start"
+        android:gravity="center"
         android:singleLine="true"
         android:textSize="10sp"
         android:textColor="#ffffff"
@@ -27,7 +27,7 @@
         android:layout_width="0dp"
         android:layout_height="26dp"
         android:layout_weight="2"
-        android:gravity="start"
+        android:gravity="center"
         android:singleLine="true"
         android:textSize="10sp"
         android:textColor="#ffffff"
@@ -37,7 +37,7 @@
         android:layout_height="26dp"
         android:layout_weight="5"
         android:singleLine="true"
-        android:gravity="start"
+        android:gravity="center"
         android:textSize="10sp"
         android:textColor="#ffffff"
         android:text="注册时间"/>

BIN
app/src/main/res/mipmap-xxhdpi/ask_top5_tip.png


BIN
app/src/main/res/mipmap-xxhdpi/ask_top_1.png


BIN
app/src/main/res/mipmap-xxhdpi/ask_top_1.webp


BIN
app/src/main/res/mipmap-xxhdpi/ask_top_2.png


BIN
app/src/main/res/mipmap-xxhdpi/ask_top_2.webp


BIN
app/src/main/res/mipmap-xxhdpi/ask_top_3.png


BIN
app/src/main/res/mipmap-xxhdpi/ask_top_3.webp


+ 2 - 0
app/src/main/res/values/dimens.xml

@@ -18,4 +18,6 @@
     <dimen name="textSize2">15sp</dimen>
     <dimen name="textSize3">18sp</dimen>
     <dimen name="textSize4">21sp</dimen>
+
+    <dimen name="ask_friend_list_h">245dp</dimen>
 </resources>