Merge branch '2.8' of http://10.8.230.114:3000/xmy_android/small_sheep_android into 2.8

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

@@ -110,9 +110,6 @@ public class FgtFindChild extends BaseCompatFragment {
     RecyclerView view_list;
     private void initView(){
         title.setVisibility(View.GONE);
-        RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) empty_view.getLayoutParams();
-        layoutParams.topMargin = getResources().getDimensionPixelSize(R.dimen.content_padding);
-        empty_view.setLayoutParams(layoutParams);
         refresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
             @Override
             public void onRefresh() {
@@ -142,6 +139,8 @@ public class FgtFindChild extends BaseCompatFragment {
                     return;
                 }
                 View rootConvertView = holder.itemView;
+                View padding = rootConvertView.findViewById(R.id.padding);
+                padding.setVisibility(holder.getAdapterPosition() == 0 ? View.GONE : View.VISIBLE);
                 TextView find_item_name = (TextView)rootConvertView.findViewById(R.id.find_item_name);
                 TextView find_item_time = (TextView)rootConvertView.findViewById(R.id.find_item_time);
                 ImageView find_item_iv = (ImageView)rootConvertView.findViewById(R.id.find_item_iv);

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

@@ -15,6 +15,7 @@ import com.kfzs.duanduan.ActDownloadMgr;
 import com.kfzs.duanduan.event.BigEvent;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.model.entity.GridViewEntity;
+import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.MyGridview;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.gamegroup.view.adapter.AdpTryMakemoney;
@@ -125,6 +126,7 @@ public class GamemakeMoneyAct extends BaseActivity {
             }
         });
         pager.setCurrentItem(currentItem);
+        CommonUtil.getInstance().reflex(indicator, activity);
     }
 
     @Override

app/src/main/java/com/sheep/gamegroup/view/adapter/TryMakeMoneyAdp.java

@@ -16,6 +16,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.bumptech.glide.request.RequestOptions;
 import com.kfzs.appstore.utils.adapter.recyclerview.ViewHolder;
 import com.kfzs.duanduan.adp.AdpCommonRecy;
@@ -371,7 +372,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
             @NonNull
             @Override
             public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) {
-                ConstraintLayout view = (ConstraintLayout) LayoutInflater.from(context)
+                View view = LayoutInflater.from(context)
                         .inflate(R.layout.game_agency_recharge_plotform_item, viewGroup, false);
                 RecyclerView.ViewHolder viewHolder = new RecyclerView.ViewHolder(view) {
                     @Override
@@ -388,6 +389,8 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 if(item == null){
                     return;
                 }
+                View padding = viewHolder.itemView.findViewById(R.id.padding);
+                padding.setVisibility(viewHolder.getAdapterPosition() == 0 ? View.VISIBLE : View.GONE);
                 TextView detail_task_tv_center = viewHolder.itemView.findViewById(R.id.detail_task_tv);
                 detail_task_tv_center.setVisibility(View.VISIBLE);
 
@@ -406,7 +409,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
 
                 Glide.with(context)
                         .load(item.getIcon())
-                        .apply(new RequestOptions().placeholder(R.mipmap.icon).centerCrop())
+                        .apply(new RequestOptions().placeholder(R.mipmap.icon))
                         .into((ImageView) viewHolder.itemView.findViewById(R.id.item_icon_iv));
 
 

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

@@ -83,15 +83,7 @@
     </LinearLayout>
     <android.support.design.widget.TabLayout
         android:id="@+id/indicator"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:tabTextAppearance="@android:style/TextAppearance.Holo.Medium"
-        app:tabIndicatorColor="#4bc1fe"
-        app:tabGravity="fill"
-        app:tabSelectedTextColor="#4bc1fe"
-        app:tabTextColor="#444444"
-        android:background="@color/white"
-        app:tabMode="fixed" />
+        style="@style/style_tab"/>
 
     <android.support.v4.view.ViewPager
         android:id="@+id/pager"

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

@@ -5,14 +5,16 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_marginEnd="@dimen/content_padding"
     android:layout_marginStart="@dimen/content_padding"
-    android:layout_marginTop="@dimen/content_padding"
     android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
     android:orientation="vertical"
     android:paddingTop="14dp"
     android:paddingStart="@dimen/content_padding"
     android:paddingEnd="@dimen/content_padding"
     android:paddingBottom="15dp">
-
+    <View
+        android:id="@+id/padding"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/content_padding_10"/>
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

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

@@ -1,25 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:paddingRight="12dp"
+    android:paddingBottom="@dimen/content_padding_12"
     android:paddingLeft="12dp"
-    android:paddingBottom="@dimen/content_padding_12">
+    android:paddingRight="12dp"
+    android:orientation="vertical">
 
+    <View
+        android:id="@+id/padding"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/content_padding_10" />
+
+    <android.support.constraint.ConstraintLayout 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">
 
         <RelativeLayout
             android:id="@+id/icon_layout"
             android:layout_width="@dimen/view_size_100"
             android:layout_height="@dimen/view_size_80"
-            app:layout_constraintTop_toTopOf="parent"
+            android:background="@drawable/sp_bg_transparent_radius_transparent"
             app:layout_constraintBottom_toBottomOf="parent"
-            android:background="@drawable/sp_bg_transparent_radius_transparent">
+            app:layout_constraintTop_toTopOf="parent">
+
             <ImageView
                 android:id="@+id/item_icon_iv"
                 android:layout_width="@dimen/view_size_100"
                 android:layout_height="@dimen/view_size_80"
-                android:src="@drawable/icon_lj"/>
+                android:src="@drawable/icon_lj" />
+
             <TextView
                 android:id="@+id/end_of_time_tv"
                 android:layout_width="match_parent"
@@ -28,62 +39,69 @@
                 android:background="#66FFFFFF"
                 android:gravity="center"
                 android:lines="1"
-                android:visibility="gone"/>
+                android:visibility="gone" />
         </RelativeLayout>
+
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
             android:orientation="vertical"
-            app:layout_constraintStart_toEndOf="@+id/icon_layout"
-            app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            android:layout_marginStart="15dp">
+            app:layout_constraintStart_toEndOf="@+id/icon_layout"
+            app:layout_constraintTop_toTopOf="parent">
+
             <TextView
                 android:id="@+id/item_name_tv"
+                style="@style/txt_style_15"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text=""
-                android:singleLine="true"
-                android:gravity="start"
                 android:ellipsize="middle"
-                style="@style/txt_style_15"/>
+                android:gravity="start"
+                android:singleLine="true"
+                android:text="" />
+
             <TextView
                 android:id="@+id/item_num_tv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text=""
-                app:layout_constraintTop_toBottomOf="@+id/item_name_tv"
-                app:layout_constraintStart_toStartOf="@+id/item_name_tv"
                 android:layout_marginBottom="@dimen/content_padding_2"
+                android:text=""
+                android:textColor="@color/txt_black_8e8e8e"
                 android:textSize="@dimen/text_size_2"
-                android:textColor="@color/txt_black_8e8e8e"/>
+                app:layout_constraintStart_toStartOf="@+id/item_name_tv"
+                app:layout_constraintTop_toBottomOf="@+id/item_name_tv" />
         </LinearLayout>
 
         <RelativeLayout
             android:id="@+id/detail_task_layout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent">
+
             <TextView
                 android:id="@+id/detail_task_tv"
-                android:text="取消任务"
+                style="@style/style_button_find"
                 android:layout_marginTop="@dimen/content_padding_small"
-                style="@style/style_button_find"/>
+                android:text="取消任务" />
+
             <TextView
                 android:id="@+id/detail_task_tv_down"
-                android:text="取消任务"
-                android:layout_marginTop="@dimen/content_padding_small"
                 style="@style/style_button_find"
-                android:visibility="gone"/>
+                android:layout_marginTop="@dimen/content_padding_small"
+                android:text="取消任务"
+                android:visibility="gone" />
 
         </RelativeLayout>
-    <TextView
-        android:id="@+id/line_tv"
-        android:layout_width="match_parent"
-        android:layout_height="0.5dp"
-        android:background="@color/white_bg_line"
-        android:layout_marginTop="@dimen/content_padding_20"
-        app:layout_constraintTop_toBottomOf="@id/icon_layout"/>
-</android.support.constraint.ConstraintLayout>
+
+        <TextView
+            android:id="@+id/line_tv"
+            android:layout_width="match_parent"
+            android:layout_height="0.5dp"
+            android:layout_marginTop="@dimen/content_padding_20"
+            android:background="@color/white_bg_line"
+            app:layout_constraintTop_toBottomOf="@id/icon_layout" />
+    </android.support.constraint.ConstraintLayout>
+</LinearLayout>

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

@@ -8,8 +8,8 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/white"
-        android:layout_marginStart="@dimen/dp_10"
-        android:layout_marginEnd="@dimen/dp_10"
+        android:layout_marginStart="@dimen/content_padding_10"
+        android:layout_marginEnd="@dimen/content_padding_10"
         android:layout_marginBottom="@dimen/dp_10">
 
         <ImageView
@@ -38,8 +38,8 @@
         android:id="@+id/swipe_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_10"
-        android:layout_marginEnd="@dimen/dp_10"
+        android:layout_marginStart="@dimen/content_padding_10"
+        android:layout_marginEnd="@dimen/content_padding_10"
         android:layout_marginBottom="@dimen/dp_10">
 
         <ListView

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

@@ -30,6 +30,9 @@
             android:id="@+id/view_list"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_margin="@dimen/content_padding_10"/>
+            android:layout_marginBottom="@dimen/content_padding_10"
+            android:layout_marginStart="@dimen/content_padding_10"
+            android:layout_marginEnd="@dimen/content_padding_10"
+            />
     </com.sheep.gamegroup.util.SheepSwipeRefreshLayout>
 </RelativeLayout>

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

@@ -174,6 +174,7 @@
             style="@style/style_button_find"
             android:text="取消任务"
             android:visibility="invisible"
+            android:layout_marginTop="5dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />