2.2 正式版本前修改代码

app/src/main/java/com/kfzs/duanduan/event/EventTypes.java

@@ -27,5 +27,6 @@ public enum EventTypes {
     DIALOG_ACTIVITY_DOWNLOAD_FILE,//dialogActivity 下载通知
 
     TASK_AGAIN_UPLOAD_FILE,//任务审核上传图片 通知
+    TASK_AGAIN_UPLOAD_FILE_DATA,//任务审核上传图片 通知
     REFRESH_DATA_PHONE,//刷新手机
 }

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

@@ -66,7 +66,7 @@ public class FgtCreditCardTaskList extends BaseFragment {
     private void onItemClickTask(TaskReleaseEty taskReleaseEty) {
         taskReleaseEty.getTask().setBonus(taskReleaseEty.getBonus());
         taskReleaseEty.getTask().setName(taskReleaseEty.getName());
-        Jump2View.getInstance().goCreditCardTaskDetail(getActivity(), taskReleaseEty.getTask());
+        Jump2View.getInstance().goCreditCardTaskDetail(getActivity(), taskReleaseEty);
     }
 
     private void initData() {

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

@@ -30,6 +30,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.bumptech.glide.load.resource.bitmap.CenterCrop;
 import com.bumptech.glide.request.RequestOptions;
 import com.kfzs.duanduan.BaseCompatFragment;
 import com.kfzs.duanduan.event.BigEvent;
@@ -67,6 +68,7 @@ import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.PreferenceUtils;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp;
+import com.sheep.gamegroup.view.customview.GlideCircleTransform;
 import com.sheep.gamegroup.view.dialog.DialogNewbieTask1;
 import com.sheep.gamegroup.view.dialog.DialogNewbieTaskList;
 import com.sheep.gamegroup.view.dialog.DialogNewbieTaskRegistSuccess;
@@ -93,6 +95,7 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import butterknife.Unbinder;
+import jp.wasabeef.glide.transformations.CropCircleTransformation;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
 
@@ -174,7 +177,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                 case 1:
                     if(releaseEtyLists != null && releaseEtyLists.size()>0){
 
-                        tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RELEASE_TASK, releaseEtyLists), position);
+                        tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RELEASE_TASK, releaseEtyLists), position>2?1:position);
                     }
                     tryMakeMoneyAdp.notifyDataSetChanged();
                     recyclerview.setFocusable(false);
@@ -219,10 +222,10 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         if (BuildConfig.DEBUG || ReactUtil.isSmallDebug()) {
             sheepNumTv.append("  邀请人：" + userEntity.getParent_code());
         }
+
         Glide.with(activity)
                 .load(userEntity.getAvatar())
-                .apply(new RequestOptions().centerCrop()
-                        .placeholder(R.drawable.icon))
+                .apply(new RequestOptions().circleCrop().placeholder(R.drawable.icon))
                 .into(iconImgIv);
 
     }

app/src/main/java/com/kfzs/duanduan/view/DragRelativeLayout.java

@@ -2,6 +2,7 @@ package com.kfzs.duanduan.view;
 
 import android.content.Context;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.MotionEvent;
 import android.widget.RelativeLayout;
 
@@ -41,6 +42,16 @@ public class DragRelativeLayout extends RelativeLayout {
                 isMove = true;
                 setX(getX() + (event.getX() - moveX));
                 setY(getY() + (event.getY() - moveY));
+                Log.e("moveX---",moveX+"");
+                Log.e("moveY---",moveY+"");
+                Log.e("event.getX()---",event.getX()+"");
+                Log.e("event.getY()---",event.getY()+"");
+                if(event.getX() -moveX >10 || event.getX() -moveX < -10
+                        ||event.getY() - moveY >10 || event.getY() - moveY < 10){
+                    isMove = true;
+                }else {
+                    isMove = false;
+                }
                 break;
             case MotionEvent.ACTION_UP:
                 if (getX() * 2 < G.WIDTH)
@@ -55,7 +66,7 @@ public class DragRelativeLayout extends RelativeLayout {
             case MotionEvent.ACTION_CANCEL:
                 break;
         }
-
+        invalidate();
         return true;
     }
 }

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

@@ -80,9 +80,12 @@ public class ImageGlarryDrawable {
             textView.setLayoutParams(textViewLayoutParams);
             textView.setText(pic.getTitle()+"");
             textView.setTextColor(mActivity.getResources().getColor(R.color.white));
-            textView.setGravity(Gravity.CENTER);
-            textView.setPadding(3, 3, 3, 3);
+            textView.setGravity(Gravity.LEFT|Gravity.CENTER_VERTICAL);
+            textView.setLines(1);
+            textView.setEllipsize(TextUtils.TruncateAt.MARQUEE);
+            textView.setPadding(8, 3, 3, 3);
             textView.setBackgroundColor(mActivity.getResources().getColor(R.color.dark));
+            textView.setBackground(mActivity.getResources().getDrawable(R.drawable.sp_bg_gradient_retangle_transe));
             textView.getBackground().mutate().setAlpha(100);
 
 

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

@@ -13,6 +13,7 @@ import com.sheep.gamegroup.model.entity.NewbieTask;
 import com.sheep.gamegroup.model.entity.NewbieTaskRecord;
 import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
 import com.sheep.gamegroup.model.entity.TaskEty;
+import com.sheep.gamegroup.model.entity.TaskReleaseEty;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.entity.WXOnHookAccount;
 import com.sheep.gamegroup.view.activity.AccountAndSecurityAct;
@@ -297,7 +298,7 @@ public class Jump2View {
      * @param context
      * @param curTask
      */
-    public synchronized void goCreditCardTaskDetail(Context context, TaskEty curTask){
+    public synchronized void goCreditCardTaskDetail(Context context, TaskReleaseEty curTask){
         Intent intent = new Intent(context, TaskDetailCreditCardAct.class);
         intent.putExtra("task_entity", curTask);
         context.startActivity(intent);

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

@@ -107,6 +107,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     private int taskId = -1;
 
     private int type;//-1:开始任务 1：下载 2：安装 3：打开  10：打开H5
+    private boolean isDownLoad = false;//是否下载
 
 
     @Override
@@ -302,49 +303,61 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     }
 
     private void setBtnStr(int taskType){
-
+        isDownLoad = PackageUtil.isAppInstalled(SheepApp.mContext, taskEty.getPackage_names());
         DownloadTarget task = Aria.download(this).load(taskEty.getDownload_link());
         int taskState = task.getTaskState();
         String buttonStr = "";
-        switch (taskState) {
-            case IEntity.STATE_RUNNING:
-                type = 1;
-                buttonStr = task.getPercent() + "%";
-                break;
-            case IEntity.STATE_STOP:
-                type = 1;
-                buttonStr = CommonUtil.CONTINUE_DOWNLOAD;
-                break;
-            case IEntity.STATE_COMPLETE:
-                if (PackageUtil.isAppInstalled(SheepApp.mContext, taskEty.getPackage_names())) {
-                    type = 3;
-                    if(taskType == 3){//应用
-                        buttonStr = CommonUtil.OPEN_APPLY;
+        if(isDownLoad){
+            type = 3;
+            if(taskType == 3){//应用
+                buttonStr = CommonUtil.OPEN_APPLY;
 
-                    }else {
-                        buttonStr = CommonUtil.START_PLAY;
+            }else {
+                buttonStr = CommonUtil.START_PLAY;
+
+            }
+        }else {
+            switch (taskState) {
+                case IEntity.STATE_RUNNING:
+                    type = 1;
+                    buttonStr = task.getPercent() + "%";
+                    break;
+                case IEntity.STATE_STOP:
+                    type = 1;
+                    buttonStr = CommonUtil.CONTINUE_DOWNLOAD;
+                    break;
+                case IEntity.STATE_COMPLETE:
+                    if (PackageUtil.isAppInstalled(SheepApp.mContext, taskEty.getPackage_names())) {
+                        type = 3;
+                        if(taskType == 3){//应用
+                            buttonStr = CommonUtil.OPEN_APPLY;
+
+                        }else {
+                            buttonStr = CommonUtil.START_PLAY;
 
+                        }
+                    }else if(!TextUtils.isEmpty(PackageUtil.isExistsFile(activity, taskEty.getPackage_names(), ""))){
+                        type = 2;
+                        btnTaskItem.setText("开始安装");
+                        buttonStr = CommonUtil.START_INSTALL;
                     }
-                }else if(!TextUtils.isEmpty(PackageUtil.isExistsFile(activity, taskEty.getPackage_names(), ""))){
-                    type = 2;
-                    btnTaskItem.setText("开始安装");
-                    buttonStr = CommonUtil.START_INSTALL;
-                }
-                else {
+                    else {
+                        type = 1;
+                        task.resetState();
+                        buttonStr = CommonUtil.START_DOWNLOAD;
+
+                    }
+                    break;
+                case IEntity.STATE_FAIL:
+                    type = 1;
+                    buttonStr = CommonUtil.FAIL_DOWNLOAD;
+                    break;
+                default:
                     type = 1;
-                    task.resetState();
                     buttonStr = CommonUtil.START_DOWNLOAD;
+                    break;
+            }
 
-                }
-                break;
-            case IEntity.STATE_FAIL:
-                type = 1;
-                buttonStr = CommonUtil.FAIL_DOWNLOAD;
-                break;
-            default:
-                type = 1;
-                buttonStr = CommonUtil.START_DOWNLOAD;
-                break;
         }
         btnTaskItem.setText(buttonStr+"");
     }

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

@@ -84,7 +84,8 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
     @Override
     public void initView() {
         activity = this;
-        taskEty = (TaskEty) getIntent().getSerializableExtra("task_entity");
+        taskReleaseEty = (TaskReleaseEty) getIntent().getSerializableExtra("task_entity");
+        taskEty = taskReleaseEty.getTask();
         TitleBarUtils.getInstance()
                 .setTitle(activity, "任务详情")
                 .setTitleFinish(activity);
@@ -171,7 +172,7 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
     private void netTaskSchedule() {
         if(mPd == null || !mPd.isShowing())
             showProgress();
-        SheepApp.getInstance().getNetComponent().getApiService().getReleaseTaskCreditCardDesc(taskEty.getId())
+        SheepApp.getInstance().getNetComponent().getApiService().getReleaseTaskCreditCardDesc(taskReleaseEty.getId())
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new SheepSubscriber<BaseMessage>(activity) {
@@ -180,6 +181,7 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
                         if(BuildConfig.DEBUG)
                             System.out.println("baseMessage onNext "+JSON.toJSONString(baseMessage));
                         taskReleaseEty = baseMessage.getData(TaskReleaseEty.class);
+                        taskEty = taskReleaseEty.getTask();
                         taskSchedule();
                         hideProgress();
                     }
@@ -189,6 +191,7 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
                         if(BuildConfig.DEBUG)
                             System.out.println("baseMessage onError "+JSON.toJSONString(baseMessage));
                         hideProgress();
+                        G.showToast(baseMessage.getMsg()+"");
                     }
                 });
     }
@@ -232,7 +235,7 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
     private void acceptTask() {
         JSONObject object = new JSONObject();
         object.put("device_id", DeviceUtil.getDeviceId(activity));
-        object.put("release_task_id", Integer.valueOf(taskEty.getId()+""));
+        object.put("release_task_id", Integer.valueOf(taskReleaseEty.getId()+""));
         UMConfigUtils.onEvent(UMConfigUtils.Event.TASK_ACCEPT);
         SheepApp.getInstance().getNetComponent().getApiService().releaseTaskCreditCard(object)
                         .subscribeOn(Schedulers.io())

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

@@ -10,6 +10,8 @@ import android.os.Message;
 import android.provider.MediaStore;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.text.TextUtils;
+import android.view.View;
+import android.widget.AdapterView;
 import android.widget.ListView;
 
 import com.alibaba.fastjson.JSON;
@@ -24,20 +26,24 @@ import com.kfzs.duanduan.view.ListMore;
 import com.sheep.gamegroup.di.components.DaggerTaskListComponent;
 import com.sheep.gamegroup.di.modules.TaskListModule;
 import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.DialogEntity;
 import com.sheep.gamegroup.model.entity.RecyleObj;
 import com.sheep.gamegroup.model.entity.RecyleType;
 import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
 import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.model.entity.TaskReleaseEty;
 import com.sheep.gamegroup.model.entity.UploadResult;
+import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.presenter.TaskListContract;
 import com.sheep.gamegroup.presenter.TaskListPresenter;
+import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.gamegroup.view.adapter.TaskListItemAdp;
 import com.sheep.gamegroup.view.customview.RefreshLayout;
 import com.sheep.gamegroup.view.dialog.DialogShowLoading;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.base.AbsChooseImageActivity;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
@@ -54,13 +60,15 @@ import javax.inject.Inject;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import go.kfzssafe.Kfzssafe;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
 
 /**
  * 任务列表
  * Created by ljy on 2018/3/21.
  */
 
-public class TaskListAct extends BaseActivity implements TaskListContract.View, UpFileListener {
+public class TaskListAct extends AbsChooseImageActivity implements TaskListContract.View {
     @BindView(R.id.withdrawal_listview)
     ListView withdrawalListview;
     @BindView(R.id.swipe_container)
@@ -73,7 +81,6 @@ public class TaskListAct extends BaseActivity implements TaskListContract.View,
     private List<TaskAcceptedEty> etyList = new ArrayList<>();
 
     private TaskAcceptedEty taskEty;
-    private DialogShowLoading dialogShowLoading;
     /**
      * 上传进度
      */
@@ -138,6 +145,23 @@ public class TaskListAct extends BaseActivity implements TaskListContract.View,
             }
         });
 
+//        withdrawalListview.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+//            @Override
+//            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+//                TaskAcceptedEty acceptedEtys = etyList.get(position);
+//                if(acceptedEtys.getStatus() == 6) {//审核失败
+//                    Jump2View.getInstance()
+//                            .goNoticeAct(activity,
+//                                    new DialogEntity(
+//                                            "审核失败",
+//                                            acceptedEtys.getRemarks(),
+//                                            "重新提交",
+//                                            "取 消",
+//                                            EventTypes.TASK_AGAIN_UPLOAD_FILE));
+//                }
+//
+//            }
+//        });
     }
 
     @Override
@@ -182,13 +206,13 @@ public class TaskListAct extends BaseActivity implements TaskListContract.View,
 
     @Override
     public void taskStatusSuccess(BaseMessage baseMessage) {
-        dialogShowLoading.getTextView().setText("完成");
+        setLoaddingText("完成");
 //                            onGetNetImageUrl(data);
-        dialogShowLoading.getAlertDialog().dismiss();
+        dismissLoaddingDialog();
         G.showToast("提交成功，等待审核!");
-        initData();
-//        EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.ONFRESH_TRYMAKEMANY_PAGE));
+        EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.ONFRESH_TRYMAKEMANY_PAGE));
         UMConfigUtils.finishTask();
+//        finish();
 
     }
 
@@ -204,66 +228,49 @@ public class TaskListAct extends BaseActivity implements TaskListContract.View,
         updateError("失败");
     }
 
+
     @Override
-    public void Success(String msg, int index) {
-        String json;
-        if (TextUtils.isEmpty(msg)) {
-            updateError("失败");
-            return;
-        }
-        if (msg.startsWith("{")) {
-            json = msg;
-        } else {
-            try {
-                byte[] bytes = HexUtils.hexStr2Bytes(msg);
-                byte[] byteDecode = Kfzssafe.XByteDecode(bytes);
-                json = new String(byteDecode);
-            } catch (Exception e) {
-                e.printStackTrace();
-                updateError("失败");
-                return;
-            }
-        }
-        UploadResult uploadResult = JSON.parseObject(json, UploadResult.class);
-        if (uploadResult != null) {
-            final String data = uploadResult.getData().getUrl();
-            dialogShowLoading.getTextView().setText("提交中");
-            if(taskEty == null){
-                updateError("提交错误!");
-                return;
-            }
-            JSONObject jsonObject = new JSONObject();
-            jsonObject.put("id", taskEty.getId());
-            jsonObject.put("screenshots",data+"");
-            jsonObject.put("remark",taskEty.getRemarks()+"");
-            jsonObject.put("package_name",taskEty.getRelease_task().getTask().getPackage_names()+"");
-            jsonObject.put("status",7+"");
-            presenter.taskStatus(jsonObject);
-            taskEty.setScreenshots(data);
-        }
+    public void Failure(String err) {
+        G.showToast(err);
     }
 
-    private void updateError(String msg) {
-        dialogShowLoading.getTextView().setText(msg);
-//        onNotGetImage(msg);
-        dialogShowLoading.getAlertDialog().dismiss();
+    @Override
+    protected void onNotGetImage(String msg) {
+
     }
+
     @Override
-    public void Progress(String progress, int index) {
-        dialogShowLoading.getTextView().setText(progress);
-        dialogShowLoading.getTextView().append("%");
+    protected void onGetImage(String path) {
 
     }
 
     @Override
-    public void Failure(String err) {
-        G.showToast(err);
+    protected void onSetNetImageUrl(String url) {
+
+        setLoaddingText("提交中");
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("id", taskEty.getId());
+        jsonObject.put("screenshots",url+"");
+        jsonObject.put("remark",taskEty.getRemarks()+"");
+        jsonObject.put("package_name",taskEty.getRelease_task().getTask().getPackage_names()+"");
+        jsonObject.put("status",7+"");
+        presenter.taskStatus(jsonObject);
+        taskEty.setScreenshots(url);
+    }
+
+    @Override
+    protected void onGetNetImageUrl(String url) {
+
     }
 
     @Subscribe
     public void onEventMainThread(BigEvent event){
         switch (event.getEventTypes()){
             case TASK_AGAIN_UPLOAD_FILE:
+                showChooseDialog(false, true, DEFAULT_MAX_COUNT);
+                UMConfigUtils.onEvent(UMConfigUtils.Event.TASK_UPLOAD_PICTURE);
+                break;
+            case TASK_AGAIN_UPLOAD_FILE_DATA:
                 if(event.getData() instanceof TaskAcceptedEty)
                     taskEty = (TaskAcceptedEty) event.getData();
                 break;
@@ -273,23 +280,5 @@ public class TaskListAct extends BaseActivity implements TaskListContract.View,
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-
-        //获取图片路径
-        if(requestCode == 0 && resultCode == Activity.RESULT_OK){
-            adp.uploadImag(activity);
-        }else
-        if (requestCode == 1 && resultCode == Activity.RESULT_OK && data != null) {
-            Uri selectedImage = data.getData();
-            String[] filePathColumns = {MediaStore.Images.Media.DATA};
-            Cursor c = getContentResolver().query(selectedImage, filePathColumns, null, null, null);
-            c.moveToFirst();
-            int columnIndex = c.getColumnIndex(filePathColumns[0]);
-            String imagePath = c.getString(columnIndex);
-            if (isUpload) {
-                dialogShowLoading = DialogShowLoading.showDialog(activity);
-                UpFileUtils.upImage(new File(imagePath), TaskListAct.this);
-            }
-            c.close();
-        }
     }
 }

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

@@ -41,6 +41,7 @@ public class TryMakeMoneyact extends BaseActivity {
     @Override
     public void initView() {
         activity = this;
+        EventBus.getDefault().register(this);
         TitleBarUtils
                 .getInstance()
                 .setTitle(activity, "试玩赚钱")
@@ -87,6 +88,7 @@ public class TryMakeMoneyact extends BaseActivity {
     @Override
     protected void onDestroy() {
         super.onDestroy();
+        EventBus.getDefault().unregister(this);
     }
 
     @Override
@@ -105,4 +107,18 @@ public class TryMakeMoneyact extends BaseActivity {
             e.printStackTrace();
         }
     }
+    @Subscribe
+    public void onEventMainThread(BigEvent event){
+        switch (event.getEventTypes()){
+            case ONFRESH_TRYMAKEMANY_PAGE:
+                try{
+                    if(mAdapter != null){
+                        mAdapter.getItem(0).onResume();
+                    }
+                }catch (Exception e){
+                    e.printStackTrace();
+                }
+                break;
+        }
+    }
 }

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

@@ -89,7 +89,6 @@ public class TaskListItemAdp extends BaseAdapter {
         }
         holder.price_tv.setText(returnValue(ety));
         if(ety.getStatus() == 6){//审核失败
-            holder.detail_task_tv.setVisibility(View.VISIBLE);
             convertView.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
@@ -100,20 +99,22 @@ public class TaskListItemAdp extends BaseAdapter {
                                             ety.getRemarks(),
                                             "重新提交",
                                             "取 消",
-                                    EventTypes.TASK_AGAIN_UPLOAD_FILE));
+                                            EventTypes.TASK_AGAIN_UPLOAD_FILE));
+                EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.TASK_AGAIN_UPLOAD_FILE_DATA)
+                        .setData(ety));
                 }
             });
         }else {
             holder.detail_task_tv.setVisibility(View.GONE);
         }
-        holder.detail_task_tv.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                uploadImag(context);
-                EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.TASK_AGAIN_UPLOAD_FILE)
-                        .setData(ety));
-            }
-        });
+//        holder.detail_task_tv.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                uploadImag(context);
+//                EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.TASK_AGAIN_UPLOAD_FILE)
+//                        .setData(ety));
+//            }
+//        });
         Glide.with(context)
                 .load(ety.getRelease_task().getTask().getIcon())
                 .apply(new RequestOptions().placeholder(R.mipmap.x_ic_def_head))

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

@@ -194,20 +194,22 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                         detail_task_tv.setBackground(context.getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
                         detail_task_tv.setEnabled(false);
                         viewHolder.itemView.setEnabled(false);
+                        ((TextView)viewHolder.itemView.findViewById(R.id.item_date_tv)).setText(
+                                "开始时间:" + TimeUtil.getDate(TimeUtil.FORMAT, Long.valueOf(etyList.get(i).getOnline_time()))+"");
                         break;
                     default:
                         detail_task_tv.setText("领取任务");
                         detail_task_tv.setBackground(context.getResources().getDrawable(R.drawable.sp_bg_gradient_rectangle_blue));
                         detail_task_tv.setEnabled(true);
                         viewHolder.itemView.setEnabled(true);
+                        ((TextView)viewHolder.itemView.findViewById(R.id.item_date_tv)).setText(
+                                "截止时间:" + TimeUtil.getDate(TimeUtil.FORMAT, Long.valueOf(etyList.get(i).getDeadline()))+"");
                         break;
                 }
                 viewHolder.itemView.findViewById(R.id.cancel_task_tv).setVisibility(View.GONE);
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_anem_tv)).setText(etyList.get(i).getName()+"");
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_num_tv)).setText("剩余"+ etyList.get(i).getLast_num()+"份");
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_money)).setText("+"+ etyList.get(i).getBonus() +"元");
-                ((TextView)viewHolder.itemView.findViewById(R.id.item_date_tv)).setText(
-                        "截止时间:" + TimeUtil.getDate(TimeUtil.FORMAT, Long.valueOf(etyList.get(i).getDeadline()))+"");
 
                 ((TextView)viewHolder.itemView.findViewById(R.id.detail_task_tv)).setOnClickListener(new View.OnClickListener() {
                     @Override

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

@@ -0,0 +1,56 @@
+package com.sheep.gamegroup.view.customview;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapShader;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+
+import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
+import com.bumptech.glide.load.resource.bitmap.BitmapTransformation;
+
+import java.security.MessageDigest;
+
+/**
+ * Created by ljy on 2018/4/28.
+ */
+
+public class GlideCircleTransform extends BitmapTransformation {
+
+    public GlideCircleTransform(Context context) {
+        super(context);
+    }
+
+    @Override
+    protected Bitmap transform(BitmapPool pool, Bitmap toTransform, int outWidth, int outHeight) {
+        return circleCrop(pool, toTransform);
+    }
+
+    private static Bitmap circleCrop(BitmapPool pool, Bitmap source) {
+        if (source == null) return null;
+
+        int size = Math.min(source.getWidth(), source.getHeight());
+        int x = (source.getWidth() - size) / 2;
+        int y = (source.getHeight() - size) / 2;
+
+        Bitmap squared = Bitmap.createBitmap(source, x, y, size, size);
+
+        Bitmap result = pool.get(size, size, Bitmap.Config.ARGB_8888);
+        if (result == null) {
+            result = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
+        }
+
+        Canvas canvas = new Canvas(result);
+        Paint paint = new Paint();
+        paint.setShader(new BitmapShader(squared, BitmapShader.TileMode.CLAMP, BitmapShader.TileMode.CLAMP));
+        paint.setAntiAlias(true);
+        float r = size / 2f;
+        canvas.drawCircle(r, r, r, paint);
+        return result;
+    }
+
+    @Override
+    public void updateDiskCacheKey(MessageDigest messageDigest) {
+
+    }
+}

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <gradient
+        android:startColor="@color/transparent"
+        android:endColor="@color/dark"/>
+
+
+</shape>

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

@@ -91,11 +91,9 @@
 
         <ImageView
             android:id="@+id/dialog_close"
-            android:layout_width="22dp"
-            android:layout_height="22dp"
-            android:padding="2dp"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
             android:layout_alignParentEnd="true"
-            android:src="@mipmap/try_dialog_x"
-            android:background="@drawable/shape_black_ring"/>
+            android:src="@mipmap/try_dialog_x"/>/>
     </RelativeLayout>
 </FrameLayout>

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

@@ -36,7 +36,9 @@
                 android:id="@+id/recyclerview"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"/>
+                android:orientation="vertical"
+                android:paddingLeft="@dimen/content_padding_10"
+                android:paddingRight="@dimen/content_padding_10"/>
         </LinearLayout>
     </ScrollView>
     </android.support.v4.widget.SwipeRefreshLayout>

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

@@ -4,7 +4,9 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:background="@color/bg_gray"
-    android:padding="@dimen/content_padding_10">
+    android:paddingLeft="@dimen/content_padding_10"
+    android:paddingTop="@dimen/content_padding_10"
+    android:paddingRight="@dimen/content_padding_10">
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -31,13 +33,14 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="试玩赚钱"
-                        android:layout_centerVertical="true"/>
+                        android:layout_centerVertical="true"
+                        style="@style/nomal_txt_style"/>
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="下载应用领现金"
                         android:layout_centerVertical="true"
-                        style="@style/nomal_txt_style_12"/>
+                        style="@style/nomal_txt_style_11"/>
                 </LinearLayout>
                 <ImageView
                     android:layout_width="match_parent"
@@ -65,13 +68,14 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="邀请赚钱"
-                        android:layout_centerVertical="true"/>
+                        android:layout_centerVertical="true"
+                        style="@style/nomal_txt_style"/>
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="上不封顶月入过万"
                         android:layout_centerVertical="true"
-                        style="@style/nomal_txt_style_12"/>
+                        style="@style/nomal_txt_style_11"/>
                 </LinearLayout>
 
                 <ImageView
@@ -108,13 +112,14 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="躺着赚钱"
-                        android:layout_centerVertical="true"/>
+                        android:layout_centerVertical="true"
+                        style="@style/nomal_txt_style"/>
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="微信挂机领现金"
                         android:layout_centerVertical="true"
-                        style="@style/nomal_txt_style_12"/>
+                        style="@style/nomal_txt_style_11"/>
                 </LinearLayout>
                 <ImageView
                     android:layout_width="match_parent"
@@ -143,13 +148,14 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="办卡赚钱"
-                        android:layout_centerVertical="true"/>
+                        android:layout_centerVertical="true"
+                        style="@style/nomal_txt_style"/>
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="办信用卡拿现金"
                         android:layout_centerVertical="true"
-                        style="@style/nomal_txt_style_12"/>
+                        style="@style/nomal_txt_style_11"/>
                 </LinearLayout>
                 <ImageView
                     android:layout_width="match_parent"

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

@@ -3,7 +3,6 @@
     android:id="@+id/homepage_item_banner_layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="@dimen/content_padding_10"
     android:visibility="gone">
 
 
@@ -18,7 +17,8 @@
         android:layout_width="match_parent"
         android:layout_height="14dp"
         android:layout_alignParentBottom="true"
-        android:gravity="center"
+        android:gravity="center|right"
         android:orientation="horizontal"
+        android:layout_marginRight="@dimen/content_padding_small"
         android:paddingTop="4dp"></RadioGroup>
 </RelativeLayout>

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

@@ -122,7 +122,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/sp_rectangle_bg_gray_radius"
-        android:textSize="@dimen/text_size_12"
+        android:textSize="@dimen/text_size_10"
         android:textColor="@color/txt_black_8e8e8e"
         android:text="若1小时35分22秒后任务未完成，该任务自动取消，您可以重新接受该任务"
         android:padding="@dimen/content_padding_small"

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

@@ -15,6 +15,10 @@
         <item name="android:textSize">@dimen/text_size_12</item>
         <item name="android:textColor">@color/black_444444</item>
     </style>
+    <style name="nomal_txt_style_11">
+        <item name="android:textSize">@dimen/text_size_2</item>
+        <item name="android:textColor">@color/txt_black_9e9c9c</item>
+    </style>
     <style name="nomal_txt_style">
         <item name="android:textSize">@dimen/text_size_3</item>
         <item name="android:textColor">@color/black_444444</item>