添加 办卡赚钱失败原因

app/src/main/java/com/sheep/gamegroup/util/BtStatusUtil.java

@@ -39,6 +39,15 @@ public class BtStatusUtil {
      * @return
      */
     public static String getUploadText(CreditCardProgressQuery creditCardProgressQuery) {
-        return TextUtils.isEmpty(creditCardProgressQuery.getRemarks()) ? getUploadText(creditCardProgressQuery.getStatus()) : creditCardProgressQuery.getRemarks();
+        int status = creditCardProgressQuery.getStatus();
+        switch (status){
+            case 6:
+                return "重新上传";
+            case 7:
+                return "正在审核";
+            case 8:
+                return SheepApp.getInstance().getResources().getString(R.string.task_offline);
+        }
+        return "上传截图";
     }
 }

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

@@ -23,6 +23,7 @@ import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyListview;
 import com.sheep.gamegroup.util.TimeUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
+import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
@@ -58,6 +59,8 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
     TextView dateTv;
     @BindView(R.id.price_tv)
     TextView priceTv;
+    @BindView(R.id.item_money_vip_tv)
+    TextView item_money_vip_tv;
     @BindView(R.id.detail_task_tv)
     TextView detailTaskTv;
     @BindView(R.id.web_text)
@@ -95,9 +98,11 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
         activity = this;
         id = getIntent().getIntExtra("id", 0);
         TitleBarUtils.getInstance()
+                .setShowOrHide(activity, true)
                 .setTitle(activity, getString(R.string.task_detail))
                 .setTitleFinish(activity);
         btnUpImag.setVisibility(View.GONE);
+        ViewUtil.setDefaultText(item_money_vip_tv);
     }
 
     private int id;
@@ -143,8 +148,9 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
         webText.loadDataWithBaseURL(null, sHead + taskEty.getDesc() + "</body></html>", "text/html", "utf-8", null);
         nameTv.setText(taskReleaseEty.getName());
         priceTv.setText(String.format(Locale.CHINA, "+%s元", taskReleaseEty.getBonusText()));
+        ViewUtil.setText(item_money_vip_tv, taskReleaseEty.getVipBonusText());
         if(!taskReleaseEty.getDeadline().equals("永久")){
-            dateTv.setText(TimeUtil.newInstance().TimeStamp2Date(Long.valueOf(taskReleaseEty.getDeadline()), "yyyy/MM/dd HH:mm"));
+            dateTv.setText(TimeUtil.getDate("yyyy/MM/dd HH:mm", Long.valueOf(taskReleaseEty.getDeadline())));
         }else {
             dateTv.setText("截至日期："+taskReleaseEty.getDeadline());
         }
@@ -156,11 +162,12 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
                         .dontAnimate())
                 .into(iconIv);
 
+        ViewUtil.setVisibility(detailTaskTv, false);
         if (taskEty.getRunTask() == 0 || taskEty.getInspect_type() == 1) {
-            detailTaskTv.setVisibility(View.INVISIBLE);
+//            detailTaskTv.setVisibility(View.INVISIBLE);
             bottom_btn_layout.setVisibility(View.VISIBLE);
         } else {
-            detailTaskTv.setVisibility(View.VISIBLE);
+//            detailTaskTv.setVisibility(View.VISIBLE);
             bottom_btn_layout.setVisibility(View.VISIBLE);
 
         }

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

@@ -1,6 +1,7 @@
 package com.sheep.gamegroup.view.adapter;
 
 import android.content.Context;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -14,6 +15,7 @@ import com.sheep.gamegroup.model.entity.Release_task;
 import com.sheep.gamegroup.model.util.EntityUtils;
 import com.sheep.gamegroup.util.BtStatusUtil;
 import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.view.activity.ActCreditCardTaskList;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.gamegroup.absBase.AbsChooseImageActivity;
@@ -62,11 +64,14 @@ public class CreditCardProgressQueryAdp extends BaseAdapter {
             holder.credit_card_task_upload_tv = convertView.findViewById(R.id.credit_card_task_upload_tv);
             holder.credit_card_task_tip1_tv = convertView.findViewById(R.id.credit_card_task_tip1_tv);
             holder.credit_card_task_tip2_tv = convertView.findViewById(R.id.credit_card_task_tip2_tv);
+            holder.credit_card_task_reson_tv = convertView.findViewById(R.id.credit_card_task_reson_tv);
             convertView.setTag(holder);
         }
 
         final CreditCardProgressQuery creditCardProgressQuery = (CreditCardProgressQuery) getItem(position);
         final Release_task ety = creditCardProgressQuery.getRelease_task();
+        String reason = creditCardProgressQuery.getRemarks();
+        ViewUtil.setText(holder.credit_card_task_reson_tv, TextUtils.isEmpty(reason) ? "" : ("失败原因：" + reason));
         try {
             Glide.with(context).load(ety.getTask().getIcon())
                     .into(holder.credit_card_task_iv);
@@ -102,6 +107,7 @@ public class CreditCardProgressQueryAdp extends BaseAdapter {
         TextView credit_card_task_name_tv;
         TextView credit_card_task_find_tv, credit_card_task_upload_tv;
         TextView credit_card_task_tip1_tv, credit_card_task_tip2_tv;
+        TextView credit_card_task_reson_tv;
     }
 
 }

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

@@ -7,6 +7,7 @@
     android:paddingTop="@dimen/content_padding_10">
 
     <RelativeLayout
+        android:id="@+id/credit_card_task_rl"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
@@ -91,6 +92,17 @@
                 android:textSize="15sp" />
         </LinearLayout>
 
-
     </RelativeLayout>
+    <TextView
+        android:id="@+id/credit_card_task_reson_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/content_padding_20"
+        android:minWidth="90dp"
+        android:layout_marginEnd="@dimen/content_padding_10"
+        android:gravity="center"
+        android:layout_alignParentEnd="true"
+        android:text="与任务要求不符"
+        android:textSize="8sp"
+        android:textColor="@color/txt_black_818181"
+        android:layout_alignBottom="@id/credit_card_task_rl"/>
 </RelativeLayout>