2.6 bug 修改

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

@@ -274,7 +274,7 @@ public class TaskEty implements Serializable{
      * 重组desc字段
      * @param desc
      */
-    private Object regroupDesc(String desc){
+    public Object regroupDesc(String desc){
         if(TextUtils.isEmpty(desc)){
             return desc;
         }

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

@@ -18,6 +18,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.arialyy.annotations.Download;
 import com.arialyy.aria.core.Aria;
@@ -206,7 +207,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         isFromTaskList = taskAcceptedEty != null;
         taskId = getIntent().getIntExtra("task_id", -1);
         game_id = getIntent().getIntExtra("game_id", -1);
-        game_id = getIntent().getIntExtra("game_type", -1);
+        game_type = getIntent().getIntExtra("game_type", -1);
         DaggerTaskDetailComponent.builder()
                 .netComponent(SheepApp.get(activity).getNetComponent())
                 .taskDetailModule(new TaskDetailModule(this))
@@ -391,6 +392,14 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
             btnUpImag.setText("上传截图");
         }
 
+        //自动审核
+        if(taskEty.getInspect_type() == 3){
+
+            taskdetail_explain_layout.setVisibility(View.VISIBLE);
+        }else {
+            taskdetail_explain_layout.setVisibility(View.GONE);
+        }
+
     }
 
     private void checkAcceptedTask() {
@@ -446,6 +455,17 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
             }
             bottom_btn_layout.setVisibility(View.GONE);
             ((View)llInfos.getParent()).setVisibility(View.GONE);
+            if(taskEty == null){
+                taskEty = taskReleaseEty.getTask();
+                if(taskEty != null && taskEty.getDesc() != null){
+                    if(taskEty.getDesc().startsWith("[")){
+                        List<TaskDescEntity> taskDescEntityList = JSONArray.parseArray(taskEty.getDesc(), TaskDescEntity.class);
+                        taskEty.setDescEntityList(taskDescEntityList);
+                    }
+
+                }
+            }
+
             setSonVuewShow();
         }
     }
@@ -987,10 +1007,10 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         detail_task_recyclerview.setVisibility(View.GONE);
         ems_game_layout.setVisibility(View.GONE);
         taskdetail_user_use_layout.setVisibility(View.GONE);
-        taskdetail_explain_layout.setVisibility(View.VISIBLE);
+        taskdetail_explain_layout.setVisibility(View.GONE);
         switch (taskEty.getTask_type()){
             case 1000://连续任务
-                if(taskEty.getChild().size() > 0 && taskEty.getChild().get(0).getDescEntityList() != null){
+                if(taskEty.getChild() != null && taskEty.getChild().size() > 0 && taskEty.getChild().get(0).getDescEntityList() != null){
                     detail_task_recyclerview.setVisibility(View.VISIBLE);
                     detail_item_layout_2.setVisibility(View.GONE);
                     detail_item_layout_3.setVisibility(View.GONE);
@@ -1001,9 +1021,12 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     item_exlpain_conetent.setText(getString(R.string.supplement_explain));
                     sonListviewAdp = new TaskdetailSonListviewAdp(taskEty.getChild(), activity);
                     detail_task_recyclerview.setAdapter(sonListviewAdp);
+                    isSuccession = true;
+                }else {
+
+                    isSuccession = false;
                 }
 
-                isSuccession = true;
                 break;
             case 1002:
             case 1003://游戏任务
@@ -1089,12 +1112,12 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
 //        }
 
         //截至时间
-        if(taskReleaseEty != null && taskReleaseEty.isIs_running() && taskReleaseEty.getCancel_duration() > 0){
+        if(gettaskAcceptedEty != null &&taskReleaseEty != null && taskReleaseEty.isIs_running() && gettaskAcceptedEty.getEnd_time() > 0){
             CommonUtil.getInstance().getHashMap(end_of_time_tv);
 
             end_of_time_tv.setVisibility(View.VISIBLE);
-            SelfCountDownTimer selfCountDownTimer = CommonUtil.getInstance().getCountDownTimer(taskReleaseEty.getCancel_duration(), end_of_time_tv, "");
-            selfCountDownTimer.reset(taskReleaseEty.getCancel_duration());
+            SelfCountDownTimer selfCountDownTimer = CommonUtil.getInstance().getCountDownTimer(gettaskAcceptedEty.getEnd_time(), end_of_time_tv, "");
+            selfCountDownTimer.reset((int) gettaskAcceptedEty.getEnd_time());
             selfCountDownTimer.start();
 
             CommonUtil.getInstance().addTimerHashMap(end_of_time_tv, selfCountDownTimer);

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

@@ -12,6 +12,7 @@ import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
@@ -76,6 +77,8 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
     LinearLayout bottom_btn_layout;
     @BindView(R.id.detail_task_listview)
     MyListview detail_task_listview;
+    @BindView(R.id.item_layout)
+    RelativeLayout item_layout;
     private Activity activity;
 
     private TaskEty taskEty;
@@ -109,6 +112,7 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
             netTaskSchedule();
             return;
         }
+        item_layout.setBackgroundResource(R.drawable.sp_bg_white_solid_top);
         webText.setWebChromeClient(new WebChromeClient() {
 
         });

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

@@ -76,7 +76,7 @@ public class AdpGameTaskOrderList extends BaseAdapter {
         }
         if(gameTaskOrderEnty.getPay_type() == 1){
             if(!TextUtils.isEmpty(payType)){
-                payType  += ",";
+                payType  += "\n" + " ";
             }else {
                 payType  += "";
             }
@@ -84,7 +84,7 @@ public class AdpGameTaskOrderList extends BaseAdapter {
         }else {//3
             payType = "绵羊币(" + gameTaskOrderEnty.getAmount() +")";
         }
-        holder.pay_type_tv.setText("支付方式：" + payType);
+        holder.pay_type_tv.setText(payType);
         holder.date_tv.setText("提交时间："+TimeUtil.getDate(TimeUtil.FORMAT, Long.valueOf(gameTaskOrderEnty.getCreate_time()))+"");
         holder.price_tv.setText("提交金额："+gameTaskOrderEnty.getAmount());
         holder.order_type_tv.setText("订单状态：");

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

@@ -589,7 +589,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
 
                     countdown_tv.setVisibility(View.VISIBLE);
                     String sr = "<font color='#ff2d4b'><small>" + "" + "</small></font>";
-                    countdown_tv.setText(sr+"");
+//                    countdown_tv.setText(sr+"");
                     SelfCountDownTimer selfCountDownTimer = new SelfCountDownTimer( etyList.get(i).getEnd_time() * 1000, 1000, etyList.get(i).getRelease_task().getCancel_duration()) {
                         @Override
                         public void onTimerRest() {

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

@@ -16,16 +16,27 @@
         style="@style/style_nomal_tv"
         android:text="提交金额："
         app:layout_constraintTop_toBottomOf="@+id/date_tv"/>
-    <TextView
-        android:id="@+id/pay_type_tv"
-        style="@style/style_nomal_tv"
-        android:text="支付方式："
-        app:layout_constraintTop_toBottomOf="@+id/price_tv"/>
+    <LinearLayout
+        android:id="@+id/pay_type_layout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintTop_toBottomOf="@+id/price_tv">
+        <TextView
+            style="@style/style_nomal_tv"
+            android:text="支付方式:"
+            />
+        <TextView
+            android:id="@+id/pay_type_tv"
+            style="@style/style_nomal_tv"
+            android:text=""
+            />
+    </LinearLayout>
     <TextView
         android:id="@+id/order_type_tv"
         style="@style/style_nomal_tv"
         android:text="订单状态："
-        app:layout_constraintTop_toBottomOf="@+id/pay_type_tv"/>
+        app:layout_constraintTop_toBottomOf="@+id/pay_type_layout"/>
     <TextView
         android:id="@+id/order_end_time_tv"
         style="@style/style_nomal_tv"

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

@@ -121,6 +121,7 @@
             android:textSize="@dimen/text_size_12"
             android:textColor="@color/txt_black_8e8e8e"/>
         <LinearLayout
+            android:id="@+id/item_date_layout"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
@@ -168,6 +169,7 @@
     </android.support.constraint.ConstraintLayout>
 
     <TextView
+        android:id="@+id/countdown_tv"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/sp_rectangle_bg_gray_radius"

app/src/main/res/values/dd_styles.xml

@@ -216,8 +216,8 @@
     </style>
 
     <style name="style_circle_main_v">
-        <item name="android:layout_width">18dp</item>
-        <item name="android:layout_height">18dp</item>
+        <item name="android:layout_width">10dp</item>
+        <item name="android:layout_height">10dp</item>
         <item name="android:background">@drawable/sp_bg_circle_main</item>
     </style>
 
@@ -226,7 +226,7 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:gravity">center</item>
         <item name="android:textColor">#353235</item>
-        <item name="android:textSize">15sp</item>
+        <item name="android:textSize">10sp</item>
     </style>
 
     <style name="style_about_us_title">