邀请界面调整

app/src/main/java/com/kfzs/duanduan/fragment/FgtFriendExtractPage.java

@@ -59,8 +59,8 @@ public class FgtFriendExtractPage extends BaseFragment {
             ViewGroup view = (ViewGroup) friend_list_ll.getChildAt(i);
             if(i < size){
                 view.setVisibility(View.VISIBLE);
-                if(i % 2 == 0)
-                    view.setBackgroundColor(0xffF8F8F8);
+//                if(i % 2 == 0)
+//                    view.setBackgroundColor(0xffF8F8F8);
                 int j = 0;
                 Friend friend = list.get(i);
                 TextView friend_item_id = (TextView) view.getChildAt(j++);

app/src/main/java/com/sheep/gamegroup/model/entity/AskTop.java

@@ -8,7 +8,7 @@ public class AskTop {
 
     private float sum_amount;
 
-    private int user_id;
+    private String user_id;
 
     private String invitation_code;
 
@@ -24,10 +24,10 @@ public class AskTop {
     public float getSum_amount(){
         return this.sum_amount;
     }
-    public void setUser_id(int user_id){
+    public void setUser_id(String user_id){
         this.user_id = user_id;
     }
-    public int getUser_id(){
+    public String getUser_id(){
         return this.user_id;
     }
     public void setInvitation_code(String invitation_code){

app/src/main/java/com/sheep/gamegroup/view/activity/AskGetMoneyAct.java

@@ -5,6 +5,7 @@ import android.support.v4.view.ViewPager;
 import android.support.v4.widget.NestedScrollView;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
 import android.util.SparseArray;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
@@ -29,6 +30,7 @@ import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.presenter.AskGetMoneyContract;
 import com.sheep.gamegroup.presenter.AskGetMoneyPresenter;
 import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.ViewHolder;
 import com.sheep.gamegroup.util.ViewUtil;
@@ -141,6 +143,7 @@ public class AskGetMoneyAct extends BaseUMActivity implements AskGetMoneyContrac
         LinearLayout.LayoutParams layoutParams2 = (LinearLayout.LayoutParams) ask_top_2.getLayoutParams();
         layoutParams2.height = G.WIDTH * 3 / 18;
         ask_top_2.setLayoutParams(layoutParams2);
+        ask_top5_not_you.setVisibility(View.INVISIBLE);
     }
 
     private List<AskTop> list = ListUtil.emptyList();
@@ -258,6 +261,15 @@ public class AskGetMoneyAct extends BaseUMActivity implements AskGetMoneyContrac
                         }
                         list.addAll(newList);
                         adapter.notifyDataSetChanged();
+                        String userId = DataUtil.getInstance().getUserId();
+                        boolean hasMe = false;
+                        for (AskTop item : newList) {
+                            if(TextUtils.equals(userId, item.getUser_id())){
+                                hasMe = true;
+                                break;
+                            }
+                        }
+                        ask_top5_not_you.setVisibility(hasMe ? View.INVISIBLE : View.VISIBLE);
                     }
 
                     @Override

app/src/main/res/drawable/shape_page.xml

@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners android:radius="5dp" />
-    <stroke android:color="#BFBFBF"
+    <stroke android:color="#ffffff"
         android:width="1dp"/>
 </shape>

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

@@ -3,6 +3,8 @@
     android:layout_width="match_parent"
     android:layout_height="130dp"
     android:layout_centerInParent="true"
+    android:paddingStart="@dimen/content_padding_10"
+    android:paddingEnd="@dimen/content_padding_10"
     android:orientation="vertical">
 
     <RelativeLayout

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

@@ -204,7 +204,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginBottom="@dimen/content_padding_10"
-                        android:layout_marginStart="9dp"
+                        android:layout_marginStart="@dimen/content_padding_10"
                         android:text="已邀请好友列表"
                         android:textColor="#ffffff"
                         android:textSize="@dimen/text_size_15" />

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

@@ -3,12 +3,15 @@
     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_weight="1"
-        android:gravity="center"
+        android:layout_marginStart="22dp"
+        android:layout_weight="3"
+        android:gravity="start"
         android:singleLine="true"
         android:textSize="12sp"
         android:textColor="#ffffff"
@@ -16,8 +19,8 @@
     <TextView
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_weight="2"
-        android:gravity="center"
+        android:layout_weight="4"
+        android:gravity="start"
         android:singleLine="true"
         android:textSize="12sp"
         android:textColor="#ffffff"
@@ -25,18 +28,18 @@
     <TextView
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:gravity="center"
+        android:layout_weight="2"
+        android:gravity="start"
         android:singleLine="true"
         android:textSize="12sp"
         android:textColor="#ffffff"
-        android:text="获得提成"/>
+        android:text="提成"/>
     <TextView
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_weight="2"
+        android:layout_weight="5"
         android:singleLine="true"
-        android:gravity="center"
+        android:gravity="start"
         android:textSize="12sp"
         android:textColor="#ffffff"
         android:text="注册时间"/>

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

@@ -7,8 +7,9 @@
     <TextView
         android:layout_width="0dp"
         android:layout_height="26dp"
-        android:layout_weight="1"
-        android:gravity="center"
+        android:layout_marginStart="22dp"
+        android:layout_weight="3"
+        android:gravity="start"
         android:singleLine="true"
         android:textSize="10sp"
         android:textColor="#ffffff"
@@ -16,8 +17,8 @@
     <TextView
         android:layout_width="0dp"
         android:layout_height="26dp"
-        android:layout_weight="2"
-        android:gravity="center"
+        android:layout_weight="4"
+        android:gravity="start"
         android:singleLine="true"
         android:textSize="10sp"
         android:textColor="#ffffff"
@@ -25,8 +26,8 @@
     <TextView
         android:layout_width="0dp"
         android:layout_height="26dp"
-        android:layout_weight="1"
-        android:gravity="center"
+        android:layout_weight="2"
+        android:gravity="start"
         android:singleLine="true"
         android:textSize="10sp"
         android:textColor="#ffffff"
@@ -34,9 +35,9 @@
     <TextView
         android:layout_width="0dp"
         android:layout_height="26dp"
-        android:layout_weight="2"
+        android:layout_weight="5"
         android:singleLine="true"
-        android:gravity="center"
+        android:gravity="start"
         android:textSize="10sp"
         android:textColor="#ffffff"
         android:text="注册时间"/>

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

@@ -12,26 +12,26 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center_vertical"
         android:orientation="horizontal"
         android:paddingBottom="@dimen/content_padding_10"
         android:paddingTop="@dimen/content_padding_10">
 
         <RelativeLayout
             android:layout_width="22dp"
-            android:layout_height="match_parent">
+            android:layout_height="wrap_content">
 
             <ImageView
                 android:id="@+id/ask_top5_item_iv"
                 android:layout_width="13dp"
                 android:layout_height="14dp"
-                android:layout_marginTop="4dp" />
+                android:layout_marginTop="3dp"/>
         </RelativeLayout>
 
         <TextView
             android:id="@+id/x_ask_top5_item_user"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
             android:layout_weight="3"
             android:gravity="start"
             android:text="用户"
@@ -42,6 +42,7 @@
             android:id="@+id/x_ask_top5_item_money"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
             android:layout_weight="2"
             android:gravity="start"
             android:singleLine="true"
@@ -53,6 +54,7 @@
             android:id="@+id/x_ask_top5_item_award"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
             android:layout_weight="2"
             android:gravity="start"
             android:singleLine="true"