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

子任务添加一种状态,修改脏数据引起的一些bug

liujiangyao лет назад: 8
Родитель
Сommit
9e4ecda166

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/view/adapter/AdpTaskDetailChildListview.java

@@ -129,7 +129,7 @@ public class AdpTaskDetailChildListview extends BaseAdapter {
                         .setDraw2View(
                                 context,
                                 holder.state_task_tv,
-                                R.mipmap.task_dec_overdue_audit,
+                                R.mipmap.task_dec_faile,
                                 R.color.txt_red_ff4a5f
                         );
                 break;

+ 9 - 7
app/src/main/java/com/sheep/gamegroup/view/adapter/TryMakeMoneyAdp.java

@@ -178,6 +178,9 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 }else {
                     viewHolder.itemView.findViewById(R.id.line_tv).setVisibility(View.VISIBLE);
                 }
+                if(etyList.get(i) == null || etyList.get(i).getTask() == null){
+                    return;
+                }
                 switch (type){
                     case 2://即将开始
                         detail_task_tv.setText("即将开始");
@@ -200,13 +203,6 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
 
                 //CommonUtil.getInstance().getCharSequence(context, etyList.get(i).getName(), "")
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_anem_tv)).setText(etyList.get(i).getName()+"");
-//                ((TextView)viewHolder.itemView.findViewById(R.id.item_anem_tv)).setText(
-//                        CommonUtil.getInstance()
-//                                .getCharSequence(
-//                                        context,
-//                                        etyList.get(i).getName()+"",
-//                                        "task_daily_check")
-//                );
                 TextView task_type_tv = viewHolder.itemView.findViewById(R.id.task_type_tv);
                 //设置标签颜色task_type_tv
                 if(!TextUtils.isEmpty(etyList.get(i).getChild_task_name())){
@@ -304,6 +300,11 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
 
                 viewHolder.itemView.findViewById(R.id.cancel_task_tv).setVisibility(View.GONE);
 
+                if(etyList.get(i) == null
+                        || etyList.get(i).getRelease_task() == null
+                        || etyList.get(i).getRelease_task().getTask() == null){
+                    return;
+                }
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_anem_tv)).setText(etyList.get(i).getRelease_task().getName()+"");
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_num_tv)).setText("剩余"+ etyList.get(i).getRelease_task().getLast_num()+"份");
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_money)).setText("+"+ etyList.get(i).getRelease_task().getBonus() +"元");
@@ -313,6 +314,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 ((TextView)viewHolder.itemView.findViewById(R.id.detail_task_tv)).setText("取消任务");
 
                 TextView task_type_tv = viewHolder.itemView.findViewById(R.id.task_type_tv);
+
                 //设置标签颜色task_type_tv
                 if(!TextUtils.isEmpty(etyList.get(i).getRelease_task().getChild_task_name())){
                     task_type_tv.setVisibility(View.VISIBLE);

BIN
app/src/main/res/mipmap-xhdpi/task_dec_faile.png