任务审核添加 失败原因

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

@@ -1285,13 +1285,15 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         }
         if(homeListEntitysGridview.size() > 8){
             HomeListEntity homeListEntity = new HomeListEntity();
-            homeListEntity.setTitle("查看更多");
-            homeListEntity.setDesc("查看更多");
             homeListEntity.setJump("-2");
             homeListEntity.setSelect(flag);
             if (flag) {
+                homeListEntity.setTitle("收起模块");
+                homeListEntity.setDesc("收起模块");
                 homeListEntity.setIcon(R.mipmap.homepage_chakangd_click+"");
             } else {
+                homeListEntity.setTitle("查看更多");
+                homeListEntity.setDesc("查看更多");
                 homeListEntity.setIcon(R.mipmap.homepage_chakangd+"");
             }
             homeListEntitysGridview.set(7, homeListEntity);

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

@@ -80,6 +80,7 @@ public class TaskListItemAdp extends BaseAdapter {
             holder.price_tv = convertView.findViewById(R.id.price_tv);
             holder.icon_iv = convertView.findViewById(R.id.icon_iv);
             holder.detail_task_tv = convertView.findViewById(R.id.detail_task_tv);
+            holder.desc_tv = convertView.findViewById(R.id.desc_tv);
             convertView.setTag(holder);
         }
 
@@ -98,6 +99,7 @@ public class TaskListItemAdp extends BaseAdapter {
             holder.price_tv.setTextColor(context.getResources().getColor(R.color.time_created));
         }
         holder.price_tv.setText(stateStr);
+        holder.desc_tv.setText(ety.getRemarks());
         convertView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -115,7 +117,7 @@ public class TaskListItemAdp extends BaseAdapter {
 
     class ViewHolder{
         ImageView icon_iv;
-        TextView name_tv, date_tv, price_tv,detail_task_tv;
+        TextView name_tv, date_tv, price_tv,detail_task_tv,desc_tv;
     }
 
     /**
@@ -165,20 +167,20 @@ public class TaskListItemAdp extends BaseAdapter {
                 break;
             case 3://完成
             case 9:
-                textView.setBackgroundResource(R.drawable.shape_red_stroke_rectangle_10_radius);
-                textView.setTextColor(context.getResources().getColor(R.color.red_FD2D54));
+                textView.setBackgroundResource(R.drawable.shape_gray_stroke_rectangle_10_radius);
+                textView.setTextColor(context.getResources().getColor(R.color.gray_CCCCCC));
                 textView.setText("已完成");
                 break;
             case 4://失败
             case 5:
             case 8:
-                textView.setBackgroundResource(R.drawable.shape_red_stroke_rectangle_10_radius);
-                textView.setTextColor(context.getResources().getColor(R.color.red_FD2D54));
+                textView.setBackgroundResource(R.drawable.shape_gray_stroke_rectangle_10_radius);
+                textView.setTextColor(context.getResources().getColor(R.color.gray_CCCCCC));
                 textView.setText("任务失败");
                 break;
             case 6:
-                textView.setBackgroundResource(R.drawable.shape_gray_stroke_rectangle_10_radius);
-                textView.setTextColor(context.getResources().getColor(R.color.gray_CCCCCC));
+                textView.setBackgroundResource(R.drawable.shape_red_stroke_rectangle_10_radius);
+                textView.setTextColor(context.getResources().getColor(R.color.red_FD2D54));
                 textView.setText("重新提交");
                 break;
         }

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

@@ -81,7 +81,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
     private int from;// 1 来自主页
     private int type = 0;//0:推荐 1:热门 2:预约 3:游戏推荐
     private String show_type;
-    private int is_succession;//0:一般任务 1:连续任务
+    private int is_succession;//0:一般任务 1:连续任务3:所有任务
 
     public TryMakeMoneyAdp(Context context) {
         super(context);

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtAudit.java

@@ -117,6 +117,8 @@ public class FgtAudit extends BaseFragment {
                     if(baseMessage != null){
                         List<TaskAcceptedEty> releaseEtyList = baseMessage.getDataList(TaskAcceptedEty.class);
                         ListUtil.addAll(etyList, releaseEtyList);
+                        if(!etyList.isEmpty())
+                            etyList.add(null);
                     }
                     notifyDataSetChanged();
                 }

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtMainAudit.java

@@ -113,6 +113,7 @@ public class FgtMainAudit extends BaseCompatFragment {
     }
 
     private void new_tab(){
+//        indicator.newTab();
         pager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(indicator));
         indicator.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(pager));
         pager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {

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

@@ -37,8 +37,9 @@
         android:id="@+id/gridview_item_tag_tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="试玩赚钱"
-        android:textSize="7sp"
+        android:text="试玩"
+        android:textSize="9sp"
         android:textColor="@color/black_6_3"
+        android:padding="@dimen/content_padding_3"
         android:layout_toRightOf="@+id/linearlayout"/>
 </RelativeLayout>

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

@@ -0,0 +1,11 @@
+<?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="match_parent">
+
+    <View
+        android:layout_width="15dp"
+        android:layout_height="15dp"
+        android:background="@drawable/shape_red_solid_rectangle"/>
+
+</LinearLayout>

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

@@ -4,7 +4,9 @@
     android:layout_height="wrap_content"
     android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
     android:padding="@dimen/content_padding_20"
-    android:layout_margin="@dimen/content_padding_10">
+    android:layout_marginBottom="@dimen/content_padding_10"
+    android:layout_marginLeft="@dimen/content_padding_10"
+    android:layout_marginRight="@dimen/content_padding_10">
 
     <ImageView
         android:id="@+id/icon_iv"
@@ -13,6 +15,7 @@
         android:src="@mipmap/icon"
         android:layout_centerVertical="true"/>
     <LinearLayout
+        android:id="@+id/content_tv"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
@@ -77,7 +80,13 @@
         </RelativeLayout>
     </LinearLayout>
 
-
-
-
+    <TextView
+        android:id="@+id/desc_tv"
+        android:layout_marginTop="@dimen/content_padding_10"
+        android:layout_below="@+id/icon_iv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text=""
+        android:textSize="@dimen/text_size_2"
+        android:textColor="@color/txt_black_818181"/>
 </RelativeLayout>