任务详情，修改提交

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

@@ -9,6 +9,15 @@ public class Ext {
     private String query_url;
     private String url;
     private String title;
+    private String task_desc_url;
+
+    public String getTask_desc_url() {
+        return task_desc_url;
+    }
+
+    public void setTask_desc_url(String task_desc_url) {
+        this.task_desc_url = task_desc_url;
+    }
 
     public int getId() {
         return id;

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

@@ -121,7 +121,7 @@ public class TaskReleaseEty implements Serializable{
     }
 
     public String getDeadline() {
-        return deadline;
+        return (TextUtils.isEmpty(deadline) || deadline.equals("0")) ? "永久" : deadline;
     }
 
     public void setDeadline(String deadline) {

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

@@ -31,6 +31,7 @@ import com.sheep.gamegroup.model.entity.Ext;
 import com.sheep.gamegroup.model.entity.HomeListEntity;
 import com.sheep.gamegroup.model.entity.RequestParameEty;
 import com.sheep.gamegroup.model.entity.TaskChild;
+import com.sheep.gamegroup.model.entity.TaskDescEntity;
 import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.model.entity.TaskListen;
 import com.sheep.gamegroup.model.entity.UserEntity;
@@ -236,8 +237,8 @@ public class CommonUtil {
         String str = "若<font color='#ff2d4b'><small>" + date + "</small></font>后任务未完成，视为自动放弃，您可重新接受";
         return str;
     }
-    public String assemblyStrings(String date){
-        String str = "剩余试玩时间：<font color='#ff2d4b'><small>" + date + "</small></font>";
+    public String assemblyStrings(String date, String notice){
+        String str = notice + "<font color='#ff2d4b'><small>" + date + "</small></font>";
         return str;
     }
     /**
@@ -583,34 +584,38 @@ public class CommonUtil {
         switch (taskChild.getStatus()){
             case 1:
             default:
-                state = "(即将开始)";
+                state = " (即将开始)";
                 break;
             case 2:
-                state = "(可领取 )";
+                state = " (可领取 )";
                 break;
             case 3:
-                state = "(进行中 )";
+                state = " (进行中 )";
                 break;
             case 4:
-                state = "(待审核 )";
+                state = " (待审核 )";
                 break;
             case 5:
-                state = "(已完成 )";
+                state = " (已完成 )";
                 break;
             case 6:
-                state = "(审核失败)";
+                state = " (审核失败)";
                 break;
             case 7:
-                state = "(已过期 )";
+                state = " (已过期 )";
                 break;
         }
-        textView.setText(Html.fromHtml(i + "、"  + taskChild.getName() + "<font color='#ff2d4b'><small>" + state + "</small></font>"));
+        textView.setText(Html.fromHtml(taskChild.getName() + "<font color='#FAF632'>" + state + "</font>"));
+    }
+    public void bindDataTaskDetailSonStep(TaskDescEntity taskDescEntity, TextView textView, int i){
+
+        textView.setText(Html.fromHtml("<font color='#FF53BBF2'>" + "第" + taskDescEntity.getStep() + "步：" +"</font>") + taskDescEntity.getDesc() + " ");
     }
 
     /**
      * 倒计时
      */
-    public SelfCountDownTimer getCountDownTimer(long demoTime, final TextView textView){
+    public SelfCountDownTimer getCountDownTimer(long demoTime, final TextView textView, final String notice){
         SelfCountDownTimer selfCountDownTimer = new SelfCountDownTimer( demoTime * 1000, 1000, (int) demoTime) {
             @Override
             public void onTimerRest() {
@@ -619,7 +624,7 @@ public class CommonUtil {
 
             @Override
             public void onTimerTick(long millisUntilFinished, int counTime) {
-                textView.setText(Html.fromHtml(CommonUtil.getInstance().assemblyStrings(TimeUtil.getHours(millisUntilFinished))+""));
+                textView.setText(Html.fromHtml(CommonUtil.getInstance().assemblyStrings(TimeUtil.getHours(millisUntilFinished), notice)+""));
             }
 
             @Override
@@ -633,7 +638,7 @@ public class CommonUtil {
     /**
      * 重置map参数
      */
-    private HashMap<View, SelfCountDownTimer> timerHashMap= new HashMap<>();
+    public HashMap<View, SelfCountDownTimer> timerHashMap= new HashMap<>();
     public void getHashMap(TextView textView){
         SelfCountDownTimer scTimer = timerHashMap.get(textView);
         if(scTimer != null){
@@ -648,6 +653,8 @@ public class CommonUtil {
      * 重置map参数
      */
     public void cancelAllTimers( HashMap<View, SelfCountDownTimer> timerHashMap) {
+        if(timerHashMap == null)
+            return;
         Set<Map.Entry<View, SelfCountDownTimer>> s = timerHashMap.entrySet();
         Iterator it = s.iterator();
         while (it.hasNext()) {
@@ -790,8 +797,8 @@ public class CommonUtil {
 
                         try {
                             Ext ext = baseMessage.getData(Ext.class);
-                            if (ext != null && !TextUtils.isEmpty(ext.getUrl())) {
-                                SpUtils.saveTaskDetailsUrl(context, ext.getUrl());
+                            if (ext != null && !TextUtils.isEmpty(ext.getTask_desc_url())) {
+                                SpUtils.saveTaskDetailsUrl(context, ext.getTask_desc_url());
                             }
                         } catch (Exception e) {
                             e.printStackTrace();

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

@@ -58,6 +58,8 @@ public class ActMyMoney extends BaseActivity {
     TextView my_money_available_amount;
     @BindView(R.id.my_money_dingxiang_amount)
     TextView my_money_dingxiang_amount;
+    @BindView(R.id.my_money_dingxiang_amount_iv)
+    ImageView my_money_dingxiang_amount_iv;
 
     private GiftpackListAdapter mAdapter;
 
@@ -121,7 +123,7 @@ public class ActMyMoney extends BaseActivity {
                 Jump2View.getInstance().goRechargeAct(ActMyMoney.this, null);
                 break;
             case R.id.my_money_dingxiang_amount_iv://定向货币详情
-                ViewUtil.showOrienteeringDetails(ActMyMoney.this);
+//                ViewUtil.showOrienteeringDetails(ActMyMoney.this);
                 break;
         }
     }

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

@@ -60,6 +60,7 @@ import com.sheep.gamegroup.util.LocationUtils;
 import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.MyListview;
+import com.sheep.gamegroup.util.SelfCountDownTimer;
 import com.sheep.gamegroup.util.TimeUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.gamegroup.util.ViewUtil;
@@ -142,6 +143,35 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     RelativeLayout ems_game_layout;
     @BindView(R.id.detail_share_friend_tv)
     TextView detail_share_friend_tv;
+    @BindView(R.id.taskdetail_user_use_layout)
+    LinearLayout taskdetail_user_use_layout;
+    @BindView(R.id.taskdetail_explain_layout)
+    LinearLayout taskdetail_explain_layout;
+    @BindView(R.id.item_exlpain_title)
+    TextView item_exlpain_title;
+    @BindView(R.id.item_exlpain_conetent)
+    TextView item_exlpain_conetent;
+    @BindView(R.id.item_notice)
+    TextView item_notice;
+
+    @BindView(R.id.start_task_btntv)
+    TextView start_task_btntv;
+    @BindView(R.id.start_task_line)
+    TextView start_task_line;
+    @BindView(R.id.down_task_btntv)
+    TextView down_task_btntv;
+    @BindView(R.id.down_task_line)
+    TextView down_task_line;
+    @BindView(R.id.install_task_btntv)
+    TextView install_task_btntv;
+    @BindView(R.id.install_task_line)
+    TextView install_task_line;
+    @BindView(R.id.award_task_btntv)
+    TextView award_task_btntv;
+    @BindView(R.id.end_of_time_tv)
+    TextView end_of_time_tv;
+    @BindView(R.id.num_tv)
+    TextView num_tv;
 
     private Activity activity;
     @Inject
@@ -219,7 +249,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     }
 
     private void initWigget() {
-        detail_shrae_friend_layout.setVisibility(View.GONE);
+        detail_shrae_friend_layout.setVisibility(View.VISIBLE);
 
         taskEty = taskReleaseEty.getTask();
         if (taskEty.getChild() != null && taskEty.getChild().size() > 0) {
@@ -247,7 +277,8 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         webText.loadDataWithBaseURL(null, sHead + taskEty.getDesc() + "</body></html>", "text/html", "utf-8", null);
         nameTv.setText(taskReleaseEty.getName() + "");
         priceTv.setText("+" + taskReleaseEty.getBonus() + "元");
-        dateTv.setText(TimeUtil.getDate(TimeUtil.FORMAT, Long.valueOf(taskReleaseEty.getDeadline())) + "");
+        dateTv.setText("截至日期："+TimeUtil.getDate(TimeUtil.FORMAT, Long.valueOf(taskReleaseEty.getDeadline())) + "");
+        num_tv.setText("剩" + taskReleaseEty.getLast_num() + "份");
 
 
         Glide.with(SheepApp.mContext)
@@ -342,9 +373,9 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
 
         taskSchedule();
         //2.6修改
-//        if(btn_show)
-//            bottom_btn_layout.setVisibility(View.GONE);
-//        setSonVuewShow();
+        if(btn_show)
+            bottom_btn_layout.setVisibility(View.GONE);
+        setSonVuewShow();
     }
 
     private void checkAcceptedTask() {
@@ -564,9 +595,9 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                 case R.id.detail_share_friend_tv:
                     try{
                         StringBuffer stringBuffer = new StringBuffer();
-                        stringBuffer.append(SpUtils.getTaskDetailsUrl(activity)+"/#/?");
+                        stringBuffer.append(SpUtils.getTaskDetailsUrl(activity)+"/?");
                         stringBuffer.append("authorization="+ SpUtils.getOpenId(activity));
-                        stringBuffer.append("&task_id="+taskReleaseEty.getAccepted_task_id());
+                        stringBuffer.append("&task_id="+taskId);
                         stringBuffer.append("&invitation_code="+MyDbManager.getInstance().dbFindValue());
                         CommonUtil.getInstance()
                                 .popShare(activity, stringBuffer.toString() +"", "all");
@@ -655,7 +686,8 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                 } else if (PackageUtil.isAppInstalled(SheepApp.mContext, taskEty.getPackage_names())) {
                     llInfos.addView(getStep("APP下载", "已完成", 0));
                     llInfos.addView(getStep("完成任务", "进行中", 1));
-                } else {
+                }
+                else {
                     llInfos.addView(getStep("APP下载", "待完成", 2));
                 }
             } else {
@@ -936,6 +968,8 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         item_layout.setBackgroundResource(R.drawable.sp_bg_white_solid_top);
         detail_task_recyclerview.setVisibility(View.GONE);
         ems_game_layout.setVisibility(View.GONE);
+        taskdetail_explain_layout.setVisibility(View.GONE);
+        taskdetail_user_use_layout.setVisibility(View.GONE);
         switch (taskEty.getTask_type()){
             case 1000://连续任务
                 if(taskEty.getChild().size() > 0 && taskEty.getChild().get(0).getDescEntityList() != null){
@@ -943,6 +977,10 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     detail_item_layout_2.setVisibility(View.GONE);
                     detail_item_layout_3.setVisibility(View.GONE);
                     detail_task_listview.setVisibility(View.GONE);
+
+                    taskdetail_explain_layout.setVisibility(View.VISIBLE);
+                    item_exlpain_title.setText(getString(R.string.supplement_explain_n));
+                    item_exlpain_conetent.setText(getString(R.string.supplement_explain));
                     sonListviewAdp = new TaskdetailSonListviewAdp(taskEty.getChild(), activity);
                     detail_task_recyclerview.setAdapter(sonListviewAdp);
                 }
@@ -953,6 +991,10 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                 ems_game_layout.setVisibility(View.VISIBLE);
                 detail_shrae_friend_layout.setVisibility(View.GONE);
                 item_layout.setBackgroundResource(R.drawable.x_shap_shadow_bg_rectgangle_white);
+                taskdetail_explain_layout.setVisibility(View.VISIBLE);
+                item_notice.setVisibility(View.VISIBLE);
+                item_exlpain_title.setText(getString(R.string.warm_prompt_n));
+                item_exlpain_conetent.setText(getString(R.string.warm_prompt_content));
                 break;
             default:
 
@@ -974,6 +1016,58 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
             detail_task_recyclerview.setAdapter(sonListviewAdp);
         }
 
+        //自动审核
+        if(taskEty.getInspect_type() == 3){
+            taskdetail_user_use_layout.setVisibility(View.VISIBLE);
+
+            start_task_btntv.setBackground(getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
+            start_task_line.setBackground(getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
+            down_task_btntv.setBackground(getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
+            down_task_line.setBackground(getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
+            install_task_btntv.setBackground(getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
+            install_task_line.setBackground(getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
+            if (taskEty != null) {
+                int thisRun = taskEty.getRunTask();
+                if (thisRun == 1) {//接受了任务
+                    start_task_btntv.setBackground(getResources().getDrawable(R.drawable.selector_button_full_main));
+                    start_task_line.setBackground(getResources().getDrawable(R.drawable.selector_button_full_main));
+                    if (PackageUtil.isAppInstalled(SheepApp.mContext, taskEty.getPackage_names())) {
+                        down_task_btntv.setBackground(getResources().getDrawable(R.drawable.selector_button_full_main));
+                        down_task_line.setBackground(getResources().getDrawable(R.drawable.selector_button_full_main));
+                        install_task_btntv.setBackground(getResources().getDrawable(R.drawable.selector_button_full_main));
+                        install_task_line.setBackground(getResources().getDrawable(R.drawable.selector_button_full_main));
+                    } else if(!TextUtils.isEmpty(PackageUtil.isExistsFile(taskEty.getPackage_names()))){
+
+                        down_task_btntv.setBackground(getResources().getDrawable(R.drawable.selector_button_full_main));
+                        down_task_line.setBackground(getResources().getDrawable(R.drawable.selector_button_full_main));
+                        install_task_btntv.setBackground(getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
+                        install_task_line.setBackground(getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
+                    } else {
+                        down_task_btntv.setBackground(getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
+                        down_task_line.setBackground(getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
+                        install_task_btntv.setBackground(getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
+                        install_task_line.setBackground(getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
+                    }
+                } else {
+                }
+            } else {
+            }
+        }
+
+        //截至时间
+        if(taskReleaseEty != null && taskReleaseEty.getDemo_time() > 0){
+            CommonUtil.getInstance().getHashMap(end_of_time_tv);
+
+            end_of_time_tv.setVisibility(View.VISIBLE);
+            SelfCountDownTimer selfCountDownTimer = CommonUtil.getInstance().getCountDownTimer(taskReleaseEty.getDemo_time(), end_of_time_tv, "");
+            selfCountDownTimer.reset(taskReleaseEty.getDemo_time());
+            selfCountDownTimer.start();
+
+            CommonUtil.getInstance().addTimerHashMap(end_of_time_tv, selfCountDownTimer);
+        }else {
+            end_of_time_tv.setVisibility(View.GONE);
+        }
+
     }
 
     /**
@@ -1009,4 +1103,10 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     }
                 });
     }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        CommonUtil.getInstance().cancelAllTimers(CommonUtil.getInstance().timerHashMap);
+    }
 }

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

@@ -116,7 +116,7 @@ public class TryMakeMoneyact extends BaseActivity {
             @Override
             public void onTabSelected(TabLayout.Tab tab) {
                 if(tab.getPosition() == 0){
-                    task_gridview_layout.setVisibility(View.VISIBLE);
+                    task_gridview_layout.setVisibility(View.GONE);
                 }else {
                     task_gridview_layout.setVisibility(View.GONE);
                 }
@@ -166,36 +166,38 @@ public class TryMakeMoneyact extends BaseActivity {
 
     @Override
     public void initData() {
-        if(is_succession == 0){
-            SheepApp.get(activity)
-                    .getNetComponent()
-                    .getApiService()
-                    .getChildTask(1)
-                    .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(new SheepSubscriber<BaseMessage>(activity) {
-                        @Override
-                        public void onError(BaseMessage baseMessage) {
-                            G.showToast(baseMessage.getMsg()+"");
-                            task_gridview_layout.setVisibility(View.GONE);
-                        }
-
-                        @Override
-                        public void onNext(BaseMessage baseMessage) {
-
-                            task_gridview_layout.setVisibility(View.VISIBLE);
-                            List<GridViewEntity> entityList = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), GridViewEntity.class);
-                            if(entityList != null){
-                                gridviewListAll.clear();
-                                gridviewListAll.add(new GridViewEntity(true, -1, "全部" ));
-                                gridviewListAll.addAll(entityList);
-                                setValueList2(clickFlag);
-                            }
-                        }
-                    });
-        }else {
-            task_gridview_layout.setVisibility(View.GONE);
-        }
+        //真tm神经病 需求改了无数次
+        task_gridview_layout.setVisibility(View.GONE);
+//        if(is_succession == 0){
+//            SheepApp.get(activity)
+//                    .getNetComponent()
+//                    .getApiService()
+//                    .getChildTask(1)
+//                    .subscribeOn(Schedulers.io())
+//                    .observeOn(AndroidSchedulers.mainThread())
+//                    .subscribe(new SheepSubscriber<BaseMessage>(activity) {
+//                        @Override
+//                        public void onError(BaseMessage baseMessage) {
+//                            G.showToast(baseMessage.getMsg()+"");
+//                            task_gridview_layout.setVisibility(View.GONE);
+//                        }
+//
+//                        @Override
+//                        public void onNext(BaseMessage baseMessage) {
+//
+//                            task_gridview_layout.setVisibility(View.VISIBLE);
+//                            List<GridViewEntity> entityList = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), GridViewEntity.class);
+//                            if(entityList != null){
+//                                gridviewListAll.clear();
+//                                gridviewListAll.add(new GridViewEntity(true, -1, "全部" ));
+//                                gridviewListAll.addAll(entityList);
+//                                setValueList2(clickFlag);
+//                            }
+//                        }
+//                    });
+//        }else {
+//            task_gridview_layout.setVisibility(View.GONE);
+//        }
 
     }
 

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

@@ -12,6 +12,9 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.*;
 
+import com.azoft.carousellayoutmanager.CarouselLayoutManager;
+import com.azoft.carousellayoutmanager.CarouselZoomPostLayoutListener;
+import com.azoft.carousellayoutmanager.CenterScrollListener;
 import com.bumptech.glide.Glide;
 import com.sheep.gamegroup.model.entity.ScreenshotsEntity;
 import com.sheep.gamegroup.model.entity.TaskChild;
@@ -19,6 +22,7 @@ import com.sheep.gamegroup.model.entity.TaskDescEntity;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.MyListview;
 import com.sheep.gamegroup.util.SelfCountDownTimer;
+import com.sheep.gamegroup.view.customview.SpaceItemDecoration;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.G;
 
@@ -62,6 +66,7 @@ public class TaskdetailSonListviewAdp extends BaseAdapter {
             holder = new ViewHolder();
             convertView = LayoutInflater.from(context).inflate(R.layout.taskdetail_mylistview_item, null);
             holder.title_item_tv = convertView.findViewById(R.id.title_item_tv);
+            holder.num_item_textview = convertView.findViewById(R.id.num_item_textview);
             holder.item_remaining_time_tv = convertView.findViewById(R.id.item_remaining_time_tv);
             holder.select_tab_iv = convertView.findViewById(R.id.select_tab_iv);
 
@@ -84,6 +89,7 @@ public class TaskdetailSonListviewAdp extends BaseAdapter {
             holder.item_show_layout.setBackgroundResource(R.drawable.x_shap_shadow_bg_rectgangle_white);
         }else {
             holder.title_item_layout.setVisibility(View.VISIBLE);
+            holder.num_item_textview.setText(position + 1+"");
             CommonUtil.getInstance()
                     .bindDataTaskDetailSon(descEntity, holder.title_item_tv, position);
             holder.title_item_price_tv.setText("+" + descEntity.getAmount() +"元");
@@ -113,7 +119,7 @@ public class TaskdetailSonListviewAdp extends BaseAdapter {
             CommonUtil.getInstance().getHashMap(holder.item_remaining_time_tv);
 
             holder.item_remaining_time_tv.setVisibility(View.VISIBLE);
-            SelfCountDownTimer selfCountDownTimer = CommonUtil.getInstance().getCountDownTimer(descEntity.getDemo_time(), holder.item_remaining_time_tv);
+            SelfCountDownTimer selfCountDownTimer = CommonUtil.getInstance().getCountDownTimer(descEntity.getDemo_time(), holder.item_remaining_time_tv, "剩余试玩时间：");
             selfCountDownTimer.reset(descEntity.getDemo_time());
             selfCountDownTimer.start();
 
@@ -134,7 +140,9 @@ public class TaskdetailSonListviewAdp extends BaseAdapter {
                         return true;
                     }
                     TextView textView = convertView.findViewById(R.id.textview);
-                    textView.setText(taskDescEntity.getStep() + "、" + taskDescEntity.getDesc());
+                    CommonUtil.getInstance()
+                            .bindDataTaskDetailSonStep(taskDescEntity, textView, position);
+//                    textView.setText(taskDescEntity.getStep() + "、" + taskDescEntity.getDesc());
                     return true;
                 }
 
@@ -175,9 +183,15 @@ public class TaskdetailSonListviewAdp extends BaseAdapter {
             for(ScreenshotsEntity s: descEntity.getScreenshotsList()){
                 imgListStr.add(s.getImg());
             }
-            LinearLayoutManager layoutManager = new LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, true);
-//            holder.recycler_screenshot_view.setHasFixedSize(true);
+
+//        CarouselLayoutManager layoutManager = new CarouselLayoutManager(CarouselLayoutManager.HORIZONTAL,true);
+//        layoutManager.setPostLayoutListener(new CarouselZoomPostLayoutListener());
+//            holder.recycler_screenshot_view.addOnScrollListener(new CenterScrollListener());
+//        layoutManager.setMaxVisibleItems(1);
+            LinearLayoutManager layoutManager = new LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false);
+            holder.recycler_screenshot_view.setHasFixedSize(true);
             holder.recycler_screenshot_view.setLayoutManager(layoutManager);
+            holder.recycler_screenshot_view.addItemDecoration(new SpaceItemDecoration(30));
             holder.recycler_screenshot_view.setAdapter(new RecyclerView.Adapter() {
                 @NonNull
                 @Override
@@ -212,7 +226,7 @@ public class TaskdetailSonListviewAdp extends BaseAdapter {
                             break;
 
                     }
-                    int with = G.WIDTH / size;
+                    int with = G.WIDTH / 3 - 50;
                     int heigth = G.WIDTH / 3 ;
                     viewHolder.itemView.setLayoutParams(new RecyclerView.LayoutParams(with, heigth));
 
@@ -270,7 +284,7 @@ public class TaskdetailSonListviewAdp extends BaseAdapter {
     }
 
     class ViewHolder{
-        TextView  title_item_tv, item_remaining_time_tv, title_item_price_tv;
+        TextView  title_item_tv, item_remaining_time_tv, title_item_price_tv, num_item_textview;
         ImageView select_tab_iv;
         LinearLayout title_item_layout, taskdetail_screenshot_layout, item_show_layout;
         MyListview item_detail_listview;

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

@@ -99,7 +99,7 @@ public class TaskdetailSonRecycleViewAdp extends RecyclerView.Adapter<RecyclerVi
             CommonUtil.getInstance().getHashMap(item_remaining_time_tv);
 
             item_remaining_time_tv.setVisibility(View.VISIBLE);
-            SelfCountDownTimer selfCountDownTimer = CommonUtil.getInstance().getCountDownTimer(descEntity.getDemo_time(), item_remaining_time_tv);
+            SelfCountDownTimer selfCountDownTimer = CommonUtil.getInstance().getCountDownTimer(descEntity.getDemo_time(), item_remaining_time_tv, "剩余试玩时间：");
             selfCountDownTimer.reset(descEntity.getDemo_time());
             selfCountDownTimer.start();
 

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

@@ -199,6 +199,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_anem_tv)).setText(etyList.get(i).getName()+"");
                 TextView task_type_tv = viewHolder.itemView.findViewById(R.id.task_type_tv);
                 task_type_tv.setVisibility(View.VISIBLE);
+                ((TextView)viewHolder.itemView.findViewById(R.id.item_money)).setVisibility(View.GONE);
                 //领取任务
                 final boolean isInstall = PackageUtil.isAppInstalled(SheepApp.mContext, etyList.get(i).getPackage_name());
                 String taskTypeTvValue = "下载游戏";

app/src/main/java/com/sheep/gamegroup/view/customview/SpaceItemDecoration.java

@@ -0,0 +1,30 @@
+package com.sheep.gamegroup.view.customview;
+
+import android.graphics.Rect;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+
+/**
+ * Created by ljy on 2018/6/20.
+ */
+
+public class SpaceItemDecoration extends RecyclerView.ItemDecoration {
+
+    int mSpace;
+
+    public SpaceItemDecoration(int mSpace) {
+        this.mSpace = mSpace;
+    }
+
+    @Override
+    public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
+        super.getItemOffsets(outRect, view, parent, state);
+        super.getItemOffsets(outRect, view, parent, state);
+        outRect.left = mSpace;
+        outRect.right = mSpace;
+        outRect.bottom = mSpace;
+        if (parent.getChildAdapterPosition(view) == 0) {
+            outRect.top = mSpace;
+        }
+    }
+}

app/src/main/res/drawable/sp_bg_white_circle_stroke.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+
+    <stroke
+        android:width="1px" android:color="@color/txt_gray_e6e4e4"/>
+
+    <solid
+        android:color="@color/transparent"/>
+
+</shape>

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

@@ -94,7 +94,8 @@
                     android:layout_width="35dp"
                     android:layout_height="35dp"
                     android:padding="10dp"
-                    android:src="@mipmap/question_mark"/>
+                    android:src="@mipmap/question_mark"
+                    android:visibility="invisible"/>
             </LinearLayout>
 
             <TextView

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

@@ -135,7 +135,7 @@
         android:id="@+id/order_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:visibility="gone"
+        android:visibility="visible"
         android:padding="15dp">
         <ImageView
             android:id="@+id/order_item_icon_iv"

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

@@ -74,57 +74,100 @@
                     android:id="@+id/detail_item_layout_1"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_margin="@dimen/content_padding_10">
+                    android:layout_marginTop="@dimen/content_padding_10"
+                    android:layout_marginLeft="@dimen/content_padding_10"
+                    android:layout_marginRight="@dimen/content_padding_10"
+                    android:layout_marginBottom="@dimen/content_padding_22">
                     <RelativeLayout
                         android:id="@+id/item_layout"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
                         android:padding="@dimen/content_padding_10">
-                        <ImageView
-                            android:id="@+id/icon_iv"
-                            android:layout_width="@dimen/view_size_60"
-                            android:layout_height="@dimen/view_size_60"
-                            android:src="@mipmap/icon"
-                            android:layout_centerVertical="true"/>
+                        <RelativeLayout
+                            android:id="@+id/icon_layout"
+                            android:layout_width="@dimen/view_size_65"
+                            android:layout_height="@dimen/view_size_65"
+                            android:layout_centerVertical="true">
+                            <ImageView
+                                android:id="@+id/icon_iv"
+                                android:layout_width="@dimen/view_size_65"
+                                android:layout_height="@dimen/view_size_65"
+                                android:src="@mipmap/icon"/>
+                            <TextView
+                                android:id="@+id/end_of_time_tv"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_alignParentBottom="true"
+                                android:background="#66FFFFFF"
+                                android:lines="1"
+                                android:visibility="gone"/>
+                        </RelativeLayout>
 
                         <RelativeLayout
                             android:id="@+id/name_date_layout"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_toRightOf="@+id/icon_iv"
+                            android:layout_toRightOf="@+id/icon_layout"
+                            android:layout_toLeftOf="@+id/price_layout"
                             android:layout_marginLeft="@dimen/content_padding"
-                            android:layout_centerVertical="true">
+                            android:layout_centerVertical="true"
+                            >
                             <TextView
                                 android:id="@+id/name_tv"
-                                style="@style/nomal_txt_style"
+                                android:textSize="@dimen/text_size_15"
+                                android:textColor="@color/black_444444"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
+                                android:lines="2"
+                                android:ellipsize="middle"
                                 android:text=""/>
 
                             <TextView
-                                android:id="@+id/date_tv"
+                                android:id="@+id/num_tv"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:text=""
                                 android:layout_below="@+id/name_tv"
-                                android:textSize="@dimen/text_size_3"
-                                android:textColor="@color/txt_black_818181"
-                                android:layout_marginTop="@dimen/content_padding_10"/>
+                                android:textSize="@dimen/text_size_2"
+                                android:textColor="@color/txt_black_818181"/>
+
+                            <TextView
+                                android:id="@+id/date_tv"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="111"
+                                android:layout_below="@+id/num_tv"
+                                android:textSize="@dimen/text_size_2"
+                                android:textColor="@color/txt_black_818181"/>
                         </RelativeLayout>
 
-                        <TextView
-                            android:id="@+id/price_tv"
+                        <LinearLayout
+                            android:id="@+id/price_layout"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text=""
-                            android:textColor="@color/txt_red"
-                            android:textSize="@dimen/text_size_15"
                             android:layout_centerVertical="true"
-                            android:layout_toRightOf="@+id/name_date_layout"
                             android:layout_marginLeft="@dimen/content_padding_10"
                             android:layout_alignParentRight="true"
-                            android:gravity="right"/>
+                            android:gravity="right"
+                            android:orientation="vertical">
+                            <TextView
+                                android:id="@+id/price_tv"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text=""
+                                android:textColor="@color/txt_red"
+                                android:textSize="@dimen/text_size_20"
+                                android:layout_gravity="center_horizontal"/>
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="任务奖励"
+                                android:textSize="@dimen/text_size_2"
+                                android:layout_gravity="center_horizontal"
+                                android:textColor="@color/txt_black_818181"/>
+                        </LinearLayout>
+
                     </RelativeLayout>
                     <TextView
                         android:id="@+id/detail_task_tv"
@@ -149,7 +192,7 @@
                         android:layout_below="@+id/item_layout"
                         android:padding="@dimen/content_padding_10"
                         android:background="@drawable/sp_bg_blue_solid_gray"
-                        android:visibility="gone">
+                        android:visibility="visible">
                         <TextView
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
@@ -157,14 +200,15 @@
                             android:text="邀请好友完成任务，可额外获取任务奖励的20%哦!"
                             style="@style/nomal_txt_style_13"
                             android:layout_gravity="center_vertical"
-                            android:gravity="center_vertical"/>
+                            android:gravity="center_vertical"
+                            android:paddingRight="@dimen/content_padding_small"/>
                         <TextView
                             android:id="@+id/detail_share_friend_tv"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="发送给好友"
-                            android:textColor="@color/txt_bule"
-                            android:textSize="@dimen/text_size_3"
+                            android:textColor="@color/blue_34a6e7"
+                            android:textSize="@dimen/text_size_13"
                             android:layout_gravity="center_vertical"
                             android:paddingLeft="@dimen/common_margin_10"
                             android:paddingRight="@dimen/common_margin_10"
@@ -180,9 +224,11 @@
                     android:layout_height="wrap_content"
                     android:scrollbars="none"
                     android:listSelector="@color/transparent"
-                    android:padding="@dimen/content_padding_10"
-                    android:layout_margin="@dimen/content_padding_10"
-                    android:visibility="gone"/>
+                    android:divider="@null"
+                    android:layout_marginStart="@dimen/content_padding_10"
+                    android:layout_marginEnd="@dimen/content_padding_10"
+                    android:layout_marginBottom="@dimen/content_padding_10"
+                    android:visibility="visible"/>
 
                 <com.sheep.gamegroup.util.MyListview
                     android:id="@+id/detail_task_listview"
@@ -203,7 +249,8 @@
                     android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
                     android:padding="@dimen/content_padding_20"
                     android:layout_margin="@dimen/content_padding_10"
-                    android:orientation="vertical">
+                    android:orientation="vertical"
+                    android:visibility="gone">
 
                     <TextView
                         android:layout_width="match_parent"
@@ -227,7 +274,8 @@
                     android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
                     android:padding="@dimen/content_padding_20"
                     android:layout_margin="@dimen/content_padding_10"
-                    android:orientation="vertical">
+                    android:orientation="vertical"
+                    android:visibility="gone">
 
                     <TextView
                         android:layout_width="match_parent"
@@ -244,6 +292,12 @@
 
                     </LinearLayout>
                 </LinearLayout>
+                <!--用户操作-->
+                <include
+                    layout="@layout/taskdetail_item_user_use"/>
+                <!--温馨提示-->
+                <include
+                    layout="@layout/taskdetail_item_supplement_explain"/>
             </LinearLayout>
         </ScrollView>
 

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

@@ -13,5 +13,6 @@
         android:id="@+id/screens_tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"/>
+        android:layout_gravity="center_horizontal"
+        android:visibility="gone"/>
 </LinearLayout>

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

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/taskdetail_explain_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_vertical"
+    android:layout_margin="@dimen/content_padding_10"
+    android:paddingRight="@dimen/content_padding_small"
+    android:paddingTop="@dimen/content_padding_small"
+    android:paddingBottom="@dimen/content_padding_15"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/x_shap_shadow_bg_rectgangle_white">
+
+        <TextView
+            android:layout_width="4dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/content_padding_3"
+            android:background="@color/blue_FF53BBF2"
+            android:text="1"
+            android:textColor="@color/blue_FF53BBF2"
+            android:textSize="@dimen/text_size_2" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_marginLeft="@dimen/content_padding_15">
+            <TextView
+                android:id="@+id/item_exlpain_title"
+                style="@style/txt_style_15_323232"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/supplement_explain_n"
+                android:layout_marginBottom="@dimen/content_padding_15"/>
+
+            <TextView
+                android:id="@+id/item_exlpain_conetent"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/supplement_explain"
+                style="@style/nomal_txt_style_13"/>
+        </LinearLayout>
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/item_notice"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        style="@style/nomal_txt_style_13"
+        android:layout_marginLeft="@dimen/content_padding_small"
+        android:layout_marginTop="@dimen/content_padding_20"
+        android:text="@string/warm_prompt_content_notice"
+        android:visibility="gone"/>
+</LinearLayout>

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

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/taskdetail_user_use_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_vertical"
+    android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
+    android:layout_margin="@dimen/content_padding_10"
+    android:paddingRight="@dimen/content_padding_small"
+    android:paddingTop="@dimen/content_padding_small"
+    android:paddingBottom="@dimen/content_padding_15"
+    android:orientation="horizontal">
+
+    <TextView
+        android:layout_width="4dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/content_padding_3"
+        android:background="@color/blue_FF53BBF2"
+        android:text="1"
+        android:textColor="@color/blue_FF53BBF2"
+        android:textSize="@dimen/text_size_2" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_marginLeft="@dimen/content_padding_15">
+        <TextView
+            style="@style/txt_style_15_323232"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="用户操作"
+            android:layout_marginBottom="@dimen/content_padding_15"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/start_task_btntv"
+                style="@style/style_button_show"
+                android:layout_weight="1"
+                android:text="领取任务"/>
+            <TextView
+                android:id="@+id/start_task_line"
+                style="@style/style_ash_line_tv"/>
+            <TextView
+                android:id="@+id/down_task_btntv"
+                style="@style/style_button_show"
+                android:layout_weight="1"
+                android:text="下载任务"/>
+            <TextView
+                android:id="@+id/down_task_line"
+                style="@style/style_ash_line_tv"/>
+            <TextView
+                android:id="@+id/install_task_btntv"
+                style="@style/style_button_show"
+                android:layout_weight="1"
+                android:text="开始任务"/>
+            <TextView
+                android:id="@+id/install_task_line"
+                style="@style/style_ash_line_tv"/>
+            <TextView
+                android:id="@+id/award_task_btntv"
+                style="@style/style_button_show"
+                android:background="@drawable/sp_rectangle_bg_gray_radius"
+                android:layout_weight="1"
+                android:text="领取奖励"/>
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>

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

@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:visibility="visible"
-    android:paddingBottom="@dimen/content_padding_small">
+    android:paddingBottom="@dimen/content_padding_16">
 
     <LinearLayout
         android:id="@+id/title_item_layout"
@@ -15,7 +15,13 @@
         android:gravity="center_vertical"
         android:background="@drawable/sp_bg_blue_top"
         android:padding="@dimen/content_padding_3"
-        android:visibility="gone">
+        android:visibility="visible">
+        <TextView
+            android:id="@+id/num_item_textview"
+            style="@style/style_ash_num_white"
+            android:layout_gravity="center_vertical"
+            android:text=""
+            android:layout_marginLeft="@dimen/content_padding_8"/>
         <TextView
             android:id="@+id/title_item_tv"
             android:layout_width="0dp"
@@ -32,7 +38,7 @@
             android:singleLine="true"
             android:text=""
             style="@style/white_txt_style_13"
-            android:textColor="@color/txt_red"
+            android:textColor="@color/yellow_FAF632"
             android:layout_marginLeft="@dimen/content_padding_2"
             android:layout_marginRight="@dimen/content_padding_3"/>
         <ImageView
@@ -48,19 +54,20 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:paddingTop="@dimen/content_padding_small"
-        android:background="@drawable/sp_bg_white_solid_bottom">
+        android:paddingTop="@dimen/content_padding_12">
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            android:layout_gravity="center_vertical">
+            android:layout_gravity="center_vertical"
+            android:background="@drawable/sp_bg_white_solid_bottom"
+            android:paddingBottom="@dimen/content_padding_15">
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="4dp"
                 android:layout_height="wrap_content"
                 android:text="1"
-                android:textColor="@color/blue_34a6e7"
-                android:background="@color/blue_34a6e7"
+                android:textColor="@color/blue_FF53BBF2"
+                android:background="@color/blue_FF53BBF2"
                 android:textSize="@dimen/text_size_2"
                 android:layout_marginTop="@dimen/content_padding_small"/>
 
@@ -71,14 +78,15 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal">
+                    android:orientation="horizontal"
+                    android:layout_marginBottom="@dimen/content_padding_15">
 
                     <TextView
                         android:layout_width="0dp"
                         android:layout_weight="1"
                         android:layout_height="wrap_content"
                         android:text="任务详情"
-                        style="@style/txt_style_15_black"
+                        style="@style/txt_style_15_323232"
                         android:layout_marginLeft="@dimen/content_padding_15"/>
                     <TextView
                         android:id="@+id/item_remaining_time_tv"
@@ -95,6 +103,8 @@
                     android:layout_height="wrap_content"
                     android:scrollbars="none"
                     android:listSelector="@color/transparent"
+                    android:layout_marginLeft="@dimen/content_padding_15"
+                    android:layout_marginBottom="@dimen/content_padding_15"
                     android:divider="@null"/>
             </LinearLayout>
         </LinearLayout>
@@ -106,13 +116,16 @@
             android:orientation="horizontal"
             android:layout_gravity="center_vertical"
             android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
-            android:visibility="gone">
+            android:visibility="visible"
+            android:layout_marginTop="@dimen/content_padding_1"
+            android:paddingTop="@dimen/content_padding_small"
+            android:paddingBottom="@dimen/content_padding_15">
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="4dp"
                 android:layout_height="wrap_content"
                 android:text="1"
-                android:textColor="@color/blue_34a6e7"
-                android:background="@color/blue_34a6e7"
+                android:textColor="@color/blue_FF53BBF2"
+                android:background="@color/blue_FF53BBF2"
                 android:textSize="@dimen/text_size_2"
                 android:layout_marginTop="@dimen/content_padding_3"/>
 
@@ -123,14 +136,15 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal">
+                    android:orientation="horizontal"
+                    android:layout_marginBottom="@dimen/content_padding_15">
 
                     <TextView
                         android:layout_width="0dp"
                         android:layout_weight="1"
                         android:layout_height="wrap_content"
                         android:text="示列截图"
-                        style="@style/txt_style_15_black"
+                        style="@style/txt_style_15_323232"
                         android:layout_marginLeft="@dimen/content_padding_15"/>
                 </LinearLayout>
                 <!--<com.sheep.gamegroup.util.MyListview-->
@@ -143,6 +157,8 @@
                     android:id="@+id/recycler_screenshot_view"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/content_padding_15"
+                    android:layout_marginBottom="@dimen/content_padding_15"
                     android:scrollbars="none" />
             </LinearLayout>
         </LinearLayout>

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

@@ -2,7 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:layout_marginBottom="@dimen/content_padding_big">
 
     <TextView
         android:id="@+id/textview"

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

@@ -18,7 +18,7 @@
         android:layout_gravity="center_horizontal"
         android:gravity="center_vertical"
         android:orientation="horizontal"
-        android:visibility="gone">
+        android:visibility="visible">
         <TextView
             style="@style/style_ash_tv"
             android:layout_marginRight="@dimen/common_margin_10"
@@ -61,7 +61,8 @@
         android:paddingRight="@dimen/content_padding"
         android:paddingBottom="@dimen/content_padding_small"
         android:paddingTop="@dimen/content_padding_small"
-        android:background="@color/white">
+        android:background="@color/white"
+        android:visibility="gone">
         <com.sheep.gamegroup.util.MyGridview
             android:id="@+id/tab_gridview"
             android:layout_width="0dp"

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

@@ -65,8 +65,8 @@
             android:visibility="invisible"/>
         <ImageView
             android:id="@+id/item_icon_iv"
-            android:layout_width="@dimen/view_size_60"
-            android:layout_height="@dimen/view_size_60"
+            android:layout_width="@dimen/view_size_65"
+            android:layout_height="@dimen/view_size_65"
             android:src="@drawable/icon_lj"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"/>
@@ -74,12 +74,12 @@
             android:id="@+id/item_money"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="+10元"
-            android:textSize="18dp"
+            android:text=""
+            android:textSize="20dp"
             android:textColor="@color/txt_red"
-            android:layout_marginTop="@dimen/content_padding_15"
+            android:layout_marginTop="@dimen/content_padding_10"
             app:layout_constraintTop_toBottomOf="@+id/item_anem_tv"
-            app:layout_constraintBottom_toBottomOf="@+id/item_anem_tv"
+            app:layout_constraintBottom_toTopOf="@+id/item_anem_tv"
             app:layout_constraintEnd_toEndOf="parent"/>
         <TextView
             android:id="@+id/item_anem_tv"
@@ -101,8 +101,7 @@
             android:text=""
             app:layout_constraintTop_toBottomOf="@+id/item_anem_tv"
             app:layout_constraintStart_toStartOf="@+id/item_anem_tv"
-            android:layout_marginTop="@dimen/content_padding_small"
-            android:layout_marginBottom="@dimen/content_padding_10"
+            android:layout_marginBottom="@dimen/content_padding_2"
             android:textSize="@dimen/text_size_12"
             android:textColor="@color/txt_black_8e8e8e"/>
         <TextView
@@ -114,7 +113,6 @@
             app:layout_constraintStart_toStartOf="@+id/item_num_tv"
             app:layout_constraintBottom_toBottomOf="parent"
             android:textColor="@color/txt_black_8e8e8e"
-            android:layout_marginTop="@dimen/content_padding_10"
             android:textSize="@dimen/text_size_12" />
         <TextView
             android:id="@+id/detail_task_tv"

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

@@ -39,15 +39,19 @@
 
     <!--APP中的主要内容的各种间距值pading默认值和较大值-->
     <dimen name="content_padding_3">3dp</dimen>
+    <dimen name="content_padding_1">1dp</dimen>
     <dimen name="content_padding_2">2dp</dimen>
     <dimen name="content_padding_small">6dp</dimen>
     <dimen name="content_padding_8">8dp</dimen>
     <dimen name="content_padding_big">18dp</dimen>
-    <dimen name="content_padding_10">10dp</dimen>
+    <dimen name="content_padding_10">13dp</dimen>
+    <dimen name="content_padding_12">12dp</dimen>
     <dimen name="content_padding_13">13dp</dimen>
     <dimen name="content_padding_15">15dp</dimen>
+    <dimen name="content_padding_16">16dp</dimen>
     <dimen name="content_padding_18">18dp</dimen>
     <dimen name="content_padding_20">20dp</dimen>
+    <dimen name="content_padding_22">22dp</dimen>
     <dimen name="content_padding_25">25dp</dimen>
     <dimen name="content_padding_30">30dp</dimen>
     <dimen name="content_padding_35">35dp</dimen>

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

@@ -23,6 +23,14 @@
         <item name="android:layout_margin">@dimen/content_padding_10</item>
         <item name="android:textSize">@dimen/text_size_15</item>
     </style>
+    <style name="style_button_show" parent="button">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">30dp</item>
+        <item name="android:gravity">center</item>
+        <item name="android:background">@drawable/selector_button_full_main</item>
+        <item name="android:textColor">@color/btn_color_main</item>
+        <item name="android:textSize">@dimen/text_size_2</item>
+    </style>
 
     <style name="style_button_stroke" parent="button">
         <item name="android:layout_width">match_parent</item>
@@ -179,10 +187,24 @@
         <item name="android:gravity">center</item>
         <item name="android:background">@drawable/sp_bg_gray_circle_stroke</item>
     </style>
+    <style name="style_ash_num_white">
+        <item name="android:layout_width">15dp</item>
+        <item name="android:layout_height">15dp</item>
+        <item name="android:textSize">10sp</item>
+        <item name="android:textColor">@color/txt_gray_e6e4e4</item>
+        <item name="android:gravity">center</item>
+        <item name="android:background">@drawable/sp_bg_white_circle_stroke</item>
+    </style>
     <style name="style_ash_img">
         <item name="android:layout_width">15dp</item>
         <item name="android:layout_height">15dp</item>
     </style>
+    <style name="style_ash_line_tv">
+        <item name="android:layout_width">18dp</item>
+        <item name="android:layout_height">1dp</item>
+        <item name="android:background">@color/txt_gray_e6e4e4</item>
+        <item name="android:layout_gravity">center_vertical</item>
+    </style>
 
     <style name="style_circle_main_v">
         <item name="android:layout_width">18dp</item>

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

@@ -7,6 +7,7 @@
     <color name="black">#000000</color>
     <color name="black_191919">#191919</color>
     <color name="black_444444">#444444</color>
+    <color name="black_666666">#666666</color>
     <color name="black_E6F3FB">#E6F3FB</color>
     <color name="white_bg_line">#dfdfdf</color>
     <color name="txt_red">#ff2d4b</color>
@@ -27,6 +28,7 @@
     <color name="yellow2_end">#FDB812</color>
     <color name="yellow_start">#f4c76c</color>
     <color name="yellow_end">#fd9c11</color>
+    <color name="yellow_FAF632">#FAF632</color>
     <color name="blue_start">#80d2fe</color>
     <color name="blue_E2F4FE">#E2F4FE</color>
     <color name="blue_end">#1394e8</color>

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

@@ -12,8 +12,8 @@
     </style>
 
     <style name="nomal_txt_style_13">
-        <item name="android:textSize">@dimen/text_size_13</item>
-        <item name="android:textColor">@color/black_444444</item>
+        <item name="android:textSize">@dimen/text_size_2</item>
+        <item name="android:textColor">@color/black_666666</item>
     </style>
     <style name="white_txt_style_13">
         <item name="android:textSize">@dimen/text_size_13</item>
@@ -40,6 +40,10 @@
         <item name="android:textSize">@dimen/text_size_15</item>
         <item name="android:textColor">@color/black</item>
     </style>
+    <style name="txt_style_15_323232">
+        <item name="android:textSize">@dimen/text_size_15</item>
+        <item name="android:textColor">#323232</item>
+    </style>
 
     <style name="txt_style_16_black">
         <item name="android:textSize">@dimen/text_size_16</item>

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

@@ -54,4 +54,10 @@
     <string name="user_know_one">1、用户需在平台首次下载该游戏并注册;</string>
     <string name="user_know_two">2、任务奖励充值消费需要满足充值条件;</string>
     <string name="user_know_three">3、用户充值不满足需求，平台将以绵羊币的方式退还给小绵羊用户。</string>
+
+    <string name="supplement_explain">部分机型的用户需要去手机设置里开启允许平台监控的权限，方可点击 \"领取奖励\" 完成</string>
+    <string name="supplement_explain_n">补充说明</string>
+    <string name="warm_prompt_n">温馨提示</string>
+    <string name="warm_prompt_content">游戏必须是在小绵羊平台下载的游戏，且游戏账号是新注册的，否者任务奖励无法使用。</string>
+    <string name="warm_prompt_content_notice">注意：用户若删除游戏后，系统自动检测让其下载安装游戏。</string>
 </resources>