添加发现详情中游戏任务与信用卡任务的功能；优化apk大小；修复几个bug

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

@@ -22,9 +22,6 @@ public enum EventTypes {
     ONFRESH_TRYMAKEMANY_PAGE , //刷新TryMakeMoneyact数据
     ONFRESH_GAMETASK_ORDER_LIST_PAGE , //订单记录
 
-    //Todo 遇得到的问题
-    INTENT_AMOUNT_VALUE,//提现传值用
-
     DIALOG_ACTIVITY_DOWNLOAD_FILE,//dialogActivity 下载通知
 
     TASK_AGAIN_UPLOAD_FILE,//任务审核上传图片 通知

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

@@ -148,8 +148,8 @@ public class FgtFindChild extends BaseCompatFragment {
                 if(item.isGame()){
                     find_item_download.setVisibility(View.VISIBLE);
                     find_item_pf_label.setVisibility(View.VISIBLE);
-                    find_item_pf_label.setText(Html.fromHtml(String.format(Locale.CHINA, "评分：<font color='%s'>%.1f</font>", "#29d6fd", item.getScore())));
                     FindApp findApp = item.getApplication();
+                    find_item_pf_label.setText(Html.fromHtml(String.format(Locale.CHINA, "评分：<font color='%s'>%.1f</font>分", "#29d6fd", findApp.getScore())));
                     updateView(activity, findApp, find_item_download);
                 } else {
                     find_item_download.setVisibility(View.GONE);

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

@@ -65,6 +65,7 @@ import com.sheep.gamegroup.presenter.TryMakeMoneyPresenter;
 import com.sheep.gamegroup.util.AppUtil;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.Conversion2;
+import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.ImageGlarryDrawable;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.ListUtil;
@@ -106,6 +107,8 @@ import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
 import rx.schedulers.Schedulers;
 
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.NEWBIE_TASK;
+
 public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContract.View, TryMakeMoneyContract.View {
 
     @BindView(R.id.upview1)
@@ -164,6 +167,8 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     LinearLayout home_list_gridview_layout;
     @BindView(R.id.check_net_ll)
     View check_net_ll;
+    @BindView(R.id.bg_newbie_task)
+    ImageView bg_newbie_task;
 
     @Inject
     SmallSheepPresenter pagePresenter;
@@ -219,6 +224,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         initListener();
         TestUtil.testChange(activity, (TextView) getViewById(R.id.test_change));
         TestUtil.testChangeUser(activity, (TextView) getViewById(R.id.test_change_user));
+        GlideImageLoader.setImage(bg_newbie_task, "http://cdngame.kuaifazs.com/bg_newbie_task.png");
     }
 
 
@@ -433,6 +439,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                 break;
             case R.id.newbie_task://新手任务
                 DialogNewbieTaskList.tryShowDialog(activity);
+                NEWBIE_TASK.onEvent();
                 break;
             case R.id.icon_layout://
                 if(TestUtil.isTest()) {

app/src/main/java/com/kfzs/duanduan/services/DownloadTaskService.java

@@ -9,12 +9,9 @@ import com.arialyy.aria.core.download.DownloadTarget;
 import com.kfzs.duanduan.KFZSApp;
 import com.kfzs.duanduan.datashare.DDProviderHelper;
 import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
-import com.kfzs.duanduan.event.BigEvent;
-import com.kfzs.duanduan.event.EventTypes;
-import com.sheep.gamegroup.model.api.ITask;
+import com.sheep.gamegroup.model.api.IDownload;
 import com.sheep.gamegroup.model.entity.DialogEntity;
 import com.sheep.gamegroup.model.entity.OrienteeringDetail;
-import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.NetUtil;
@@ -23,8 +20,6 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
-import org.greenrobot.eventbus.EventBus;
-
 import java.io.File;
 import java.util.List;
 
@@ -157,7 +152,7 @@ public class DownloadTaskService {
     }
 
 
-    public DownLoadInfo getDownloadTaskByUrl(ITask taskEty) {
+    public DownLoadInfo getDownloadTaskByUrl(IDownload taskEty) {
         DownLoadInfo downLoadInfo = getDownloadTaskByUrl(taskEty.getDownload_link());
         if(downLoadInfo == null){
             downLoadInfo = CommonUtil.getInstance()

app/src/main/java/com/sheep/gamegroup/model/api/ApiService.java

@@ -278,8 +278,6 @@ public interface ApiService {
     Observable<BaseMessage> releaseTaskCreditCard(@Body JSONObject jsonObject);
     @PUT("app/accepted_task/{id}/credit_card")
     Observable<BaseMessage> releaseTaskCreditCard(@Path("id") int id, @Body JSONObject jsonObject);
-    @GET("app/release_task/{id}/desc")
-    Observable<BaseMessage> getReleaseTaskCreditCardDesc(@Path("id") int id);
 
     /**
      * 首页轮播图
@@ -500,6 +498,11 @@ public interface ApiService {
     @GET("app/game_consumption/my_games")
     Observable<BaseMessage> getMyGames(@Query("page") int page, @Query("per_page") int per_page);
     /**
+     * 获取定向消费游戏列表
+     */
+    @GET("app/game_consumption/my_game/{id}")
+    Observable<BaseMessage> getMyGame(@Path("id") String third_task_id);
+    /**
      * 获取正在运行的游戏任务
      */
     @GET("app/accepted_task/run_game_task")

app/src/main/java/com/sheep/gamegroup/model/api/ITask.java

@@ -4,7 +4,7 @@ package com.sheep.gamegroup.model.api;
  * Created by realicing on 2018/6/29.
  * realicing@sina.com
  */
-public interface ITask {
+public interface IDownload {
     String getPackage_names();//任务的包名
 
     int getTask_type();//任务的类型

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

@@ -1,13 +1,13 @@
 package com.sheep.gamegroup.model.entity;
 
-import com.sheep.gamegroup.model.api.ITask;
+import com.sheep.gamegroup.model.api.IDownload;
 import com.sheep.gamegroup.util.FindAppHelper;
 
 /**
  * Created by realicing on 2018/6/28.
  * realicing@sina.com
  */
-public class FindApp implements ITask{
+public class FindApp implements IDownload {
     private int updated_at;
 
     private float score;//评分

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

@@ -35,8 +35,6 @@ public class FindItem {
 
     private int is_in_url;//是否外部链接 1：是 0：不是
 
-    private float score;
-
     private int release_task_id;//发布的任务ID （咨询和任务时）
 
     @JSONField(name ="abstract")
@@ -168,12 +166,6 @@ public class FindItem {
     public int getType(){
         return this.type;
     }
-    public void setScore(float score) {
-        this.score = score;
-    }
-    public float getScore() {
-        return score;
-    }
 
     public FindApp getApplication() {
         return application;

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

@@ -4,7 +4,7 @@ import android.text.TextUtils;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.sheep.gamegroup.model.api.ITask;
+import com.sheep.gamegroup.model.api.IDownload;
 import com.sheep.gamegroup.util.ListUtil;
 
 import java.io.Serializable;
@@ -15,7 +15,7 @@ import java.util.List;
  * Created by ljy on 2018/3/20.
  */
 
-public class TaskEty implements Serializable, ITask {
+public class TaskEty implements Serializable, IDownload {
     private String boot_address;//private String string",
     private String create_time;// 0,
     private String download_link;//private String string",
@@ -30,6 +30,7 @@ public class TaskEty implements Serializable, ITask {
     private String icon;
     private String package_size;
     private int release_task_id;
+    private String third_task_id;//第三方任务id
     private int acceptedTaskId;//接受任务id
     private String bonus;// 0,
     private String desc;// 任务详情介绍
@@ -247,6 +248,13 @@ public class TaskEty implements Serializable, ITask {
         this.ext = ext;
     }
 
+    public String getThird_task_id() {
+        return third_task_id;
+    }
+
+    public void setThird_task_id(String third_task_id) {
+        this.third_task_id = third_task_id;
+    }
 
     /**
      * 是否是应用自动审核完成的任务

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

@@ -4,6 +4,7 @@ import android.content.Context;
 import android.provider.Settings;
 import android.text.TextUtils;
 
+import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
 import java.util.Random;
@@ -24,6 +25,9 @@ public class DeviceUtil {
     }
 
     public static String getDeviceId(Context context) {
+        if(BuildConfig.DEBUG){//debug状态下可以任意接任务
+            return getInstance().getRandomId();
+        }
         String deviceId = Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID);
         if(TextUtils.isEmpty(deviceId)){
             try {
@@ -34,7 +38,7 @@ public class DeviceUtil {
         if(TextUtils.isEmpty(deviceId)){
             deviceId = SpUtils.getDeviceIds(context);
             if(TextUtils.isEmpty(deviceId)){
-                deviceId = deviceUtil.getRandomId();
+                deviceId = getInstance().getRandomId();
                 SpUtils.saveDeviceIds(context, deviceId);
             }
         }

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

@@ -0,0 +1,134 @@
+package com.sheep.gamegroup.util;
+
+import android.app.Activity;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.TextView;
+
+import com.arialyy.aria.core.Aria;
+import com.arialyy.aria.core.download.DownloadTarget;
+import com.arialyy.aria.core.inf.IEntity;
+import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
+import com.kfzs.duanduan.event.BigEvent;
+import com.kfzs.duanduan.event.EventTypes;
+import com.kfzs.duanduan.services.DownloadTaskService;
+import com.kfzs.duanduan.utils.ApkUtils;
+import com.sheep.gamegroup.model.api.IDownload;
+import com.sheep.gamegroup.view.activity.TaskDetailAct;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.utils.G;
+import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
+
+import org.greenrobot.eventbus.EventBus;
+
+import rx.functions.Action1;
+
+/**
+ * Created by realicing on 2018/7/3.
+ * realicing@sina.com
+ * 下载游戏辅助类
+ */
+public class DownloadHelper {
+    private int downLoadType;
+    /**
+     * 更新游戏下载与响应点击
+     * @param activity
+     * @param iTask
+     * @param down_tv
+     */
+    public void updateDownloadTaskView(final Activity activity, final IDownload iTask, final TextView down_tv) {
+        updateDownloadTaskView(activity, iTask, down_tv, null);
+    }
+    public void updateDownloadTaskView(final Activity activity, final IDownload iTask, final TextView down_tv, final Action1<Integer> callBack) {
+        if(mDownloadTaskService == null){
+            mDownloadTaskService = new DownloadTaskService(activity);
+        }
+        TaskDetailAct.setBtnStr(iTask, mDownloadTaskService, new Action1<Object>() {
+            @Override
+            public void call(Object o) {
+                if(o instanceof Integer){
+                    downLoadType = (int) o;
+                    if(callBack != null)
+                        callBack.call(downLoadType);
+                } else if( o instanceof String){
+                    down_tv.setText((String) o);
+                } else if( o instanceof Boolean){
+                    down_tv.setEnabled((Boolean) o);
+                }
+            }
+        });
+        down_tv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if(callBack != null)
+                    callBack.call(-1);
+                downloadApp(activity, iTask);
+            }
+        });
+    }
+
+    private DownloadTaskService mDownloadTaskService;
+    private DownloadTarget downloadTarget;
+    //下载应用
+    private void downloadApp(Activity activity, IDownload task) {
+        switch (downLoadType){
+            case DownloadTaskService.STATUS_INIT://可以下载
+                if(TextUtils.isEmpty(task.getDownload_link()) || !task.getDownload_link().contains("http")){
+                    G.showToast(R.string.error_download_link);
+                    return;
+                }
+                this.downloadTarget = Aria.download(activity).load(task.getDownload_link());
+                final DownLoadInfo downLoadInfo = mDownloadTaskService.getDownloadTaskByUrl(task);
+                if(this.downloadTarget != null) {
+                    if (this.downloadTarget.getTaskState() == IEntity.STATE_RUNNING) {
+                        this.downloadTarget.stop();
+                    } else if (this.downloadTarget.getTaskState() == IEntity.STATE_FAIL) {
+                        this.downloadTarget.cancel(true);
+                        this.downloadTarget.removeRecord();
+                    } else {
+                        mDownloadTaskService.start(downLoadInfo);
+                    }
+                    new Thread(new Runnable() {
+                        @Override
+                        public void run() {
+                            if(mDownloadTaskService.addDownloadTask(downLoadInfo)){//添加数据到数据库，可以在下载管理中看到
+                                //发送红点信息
+                                EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.TIPS_DOWN_ICON));
+                            }
+                        }
+                    }).start();
+                }
+                break;
+            case DownloadTaskService.STATUS_FINISH://已经下载完成，可以安装
+                String path = PackageUtil.isExistsFile(task.getPackage_names());
+                if(TextUtils.isEmpty(path)){//数据库保存有下载完成的状态，但是应用已经被删除，需要修复其下载状态
+                    if(TextUtils.isEmpty(task.getDownload_link()) || !task.getDownload_link().contains("http")){
+                        G.showToast(R.string.error_download_link);
+                        return;
+                    }
+                    this.downloadTarget = Aria.download(activity).load(task.getDownload_link());
+                    if(this.downloadTarget != null) {
+                        this.downloadTarget.cancel(true);
+                        this.downloadTarget.removeRecord();
+                        mDownloadTaskService.start(mDownloadTaskService.getDownloadTaskByUrl(task));
+                        mDownloadTaskService.setDownloadTaskStatus(task.getDownload_link(), DownloadTaskService.STATUS_INIT);
+                        downLoadType = DownloadTaskService.STATUS_INIT;
+                    }
+                } else {
+                    ApkUtils.installApk(activity, PackageUtil.isExistsFile(task.getPackage_names()));
+                }
+                break;
+            case DownloadTaskService.STATUS_INSTALLED://已经安装，可以试玩
+                PackageUtil.startApp(activity, task.getPackage_names());
+                break;
+        }
+    }
+
+    /**
+     * 更新下载状态
+     * @param status
+     */
+    public void updateState(int status) {
+        downLoadType = status;
+    }
+}

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

@@ -1,32 +1,19 @@
 package com.sheep.gamegroup.util;
 
 import android.app.Activity;
-import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.View;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
-import com.arialyy.aria.core.Aria;
-import com.arialyy.aria.core.download.DownloadTarget;
-import com.arialyy.aria.core.inf.IEntity;
-import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
-import com.kfzs.duanduan.event.BigEvent;
-import com.kfzs.duanduan.event.EventTypes;
 import com.kfzs.duanduan.services.DownloadTaskService;
-import com.kfzs.duanduan.utils.ApkUtils;
-import com.sheep.gamegroup.model.api.ITask;
+import com.sheep.gamegroup.model.api.IDownload;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.DialogConfig;
 import com.sheep.gamegroup.model.entity.FindApp;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
-import com.sheep.gamegroup.view.activity.TaskDetailAct;
-import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
-import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
-
-import org.greenrobot.eventbus.EventBus;
 
 import java.util.Locale;
 
@@ -40,101 +27,27 @@ import static com.sheep.gamegroup.util.UMConfigUtils.Event.FIND_APP;
  * Created by realicing on 2018/6/29.
  * realicing@sina.com
  */
-public class FindAppHelper {
+public class FindAppHelper{
+    private DownloadHelper downloadHelper = new DownloadHelper();
 
-    private int downLoadType;
-    /**
-     * 更新游戏下载与响应点击
-     * @param activity
-     * @param findApp
-     * @param down_tv
-     */
-    public void updateDownloadTaskView(final Activity activity, final FindApp findApp, final TextView down_tv) {
-        if(mDownloadTaskService == null){
-            mDownloadTaskService = new DownloadTaskService(activity);
-        }
-        TaskDetailAct.setBtnStr(findApp, mDownloadTaskService, new Action1<Object>() {
-            @Override
-            public void call(Object o) {
-                if(o instanceof Integer){
-                    downLoadType = (int) o;
-                } else if( o instanceof String){
-                    down_tv.setText((String) o);
-                } else if( o instanceof Boolean){
-                    down_tv.setEnabled((Boolean) o);
-                }
-            }
-        });
-        down_tv.setOnClickListener(new View.OnClickListener() {
+    public void updateState(int status) {
+        downloadHelper.updateState(status);
+    }
+    public void updateDownloadTaskView(final Activity activity, final IDownload iTask, final TextView down_tv) {
+        downloadHelper.updateDownloadTaskView(activity, iTask, down_tv, new Action1<Integer>() {
             @Override
-            public void onClick(View view) {
-                if(findApp.isCanRecord()){//可以记录
-                    recordAppDownloads(activity, findApp, down_tv);
+            public void call(Integer integer) {
+                if(DownloadTaskService.STATUS_INIT != integer){//-1 点击下载按钮的回调;其它状态直接回调不需要点击按钮
+                    if(iTask instanceof FindApp) {
+                        FindApp findApp = (FindApp) iTask;
+                        recordAppDownloads(activity, findApp, down_tv);
+                        FIND_APP.onEvent("application_id", findApp.getId(), "action", down_tv.getText());
+                    }
                 }
-                downloadApp(activity, findApp);
-                FIND_APP.onEvent("application_id", findApp.getId(), "action", down_tv.getText());
             }
         });
     }
 
-    private DownloadTaskService mDownloadTaskService;
-    private DownloadTarget downloadTarget;
-    //下载应用
-    private void downloadApp(Activity activity, ITask task) {
-        switch (downLoadType){
-            case DownloadTaskService.STATUS_INIT://可以下载
-                if(TextUtils.isEmpty(task.getDownload_link()) || !task.getDownload_link().contains("http")){
-                    G.showToast(R.string.error_download_link);
-                    return;
-                }
-                this.downloadTarget = Aria.download(activity).load(task.getDownload_link());
-                final DownLoadInfo downLoadInfo = mDownloadTaskService.getDownloadTaskByUrl(task);
-                if(this.downloadTarget != null) {
-                    if (this.downloadTarget.getTaskState() == IEntity.STATE_RUNNING) {
-                        this.downloadTarget.stop();
-                    } else if (this.downloadTarget.getTaskState() == IEntity.STATE_FAIL) {
-                        this.downloadTarget.cancel(true);
-                        this.downloadTarget.removeRecord();
-                    } else {
-                        mDownloadTaskService.start(downLoadInfo);
-                    }
-                    new Thread(new Runnable() {
-                        @Override
-                        public void run() {
-                            if(mDownloadTaskService.addDownloadTask(downLoadInfo)){//添加数据到数据库，可以在下载管理中看到
-                                //发送红点信息
-                                EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.TIPS_DOWN_ICON));
-                            }
-                        }
-                    }).start();
-                }
-                break;
-            case DownloadTaskService.STATUS_FINISH://已经下载完成，可以安装
-                String path = PackageUtil.isExistsFile(task.getPackage_names());
-                if(TextUtils.isEmpty(path)){//数据库保存有下载完成的状态，但是应用已经被删除，需要修复其下载状态
-                    if(TextUtils.isEmpty(task.getDownload_link()) || !task.getDownload_link().contains("http")){
-                        G.showToast(R.string.error_download_link);
-                        return;
-                    }
-                    this.downloadTarget = Aria.download(activity).load(task.getDownload_link());
-                    if(this.downloadTarget != null) {
-                        this.downloadTarget.cancel(true);
-                        this.downloadTarget.removeRecord();
-                        mDownloadTaskService.start(mDownloadTaskService.getDownloadTaskByUrl(task));
-                        mDownloadTaskService.setDownloadTaskStatus(task.getDownload_link(), DownloadTaskService.STATUS_INIT);
-                        downLoadType = DownloadTaskService.STATUS_INIT;
-                    }
-                } else {
-                    ApkUtils.installApk(activity, PackageUtil.isExistsFile(task.getPackage_names()));
-                }
-                break;
-            case DownloadTaskService.STATUS_INSTALLED://已经安装，可以试玩
-                PackageUtil.startApp(activity, task.getPackage_names());
-                break;
-        }
-    }
-
-
     /**
      * 更新预约下载状态与响应点击
      * @param activity
@@ -180,7 +93,7 @@ public class FindAppHelper {
                             textView.setEnabled(false);
                             textView.setText("已经预约");
                             ViewUtil.showMsgDialog(activity, new DialogConfig().setTitle("预约成功")
-                                    .setMsg(String.format(Locale.CHINA, "请在%s准时到小绵羊下载哦", TimeUtil.TimeStamp2Date(findApp.getDownload_at(), "yyyy年MM月dd日\tHH时mm分")))
+                                    .setMsg(String.format(Locale.CHINA, "请在%s准时到小绵羊下载哦", TimeUtil.TimeStamp2Date(findApp.getDownload_at(), "yyyy年MM月dd日HH时mm分")))
                                     .setMsgGravity(Gravity.START).setBtnLeftText("我知道了"));
                         }
                     }
@@ -195,12 +108,4 @@ public class FindAppHelper {
                     }
                 });
     }
-
-    /**
-     * 更新下载状态
-     * @param status
-     */
-    public void updateState(int status) {
-        downLoadType = status;
-    }
 }

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

@@ -283,9 +283,9 @@ public class Jump2View {
      * @param context
      * @param o
      */
-    public void goWithdrawalResultview(Context context, String o){
+    public void goWithdrawalResultview(Context context, float o){
         Intent intent = new Intent(context, WithdrawalResultAct.class);
-        intent.putExtra(" amount", o);
+        intent.putExtra(Float.class.getSimpleName(), o);
         context.startActivity(intent);
     }
 

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

@@ -11,7 +11,7 @@ import java.util.List;
  */
 public class ListUtil {
     public static <T> boolean hasIndex(List<T> list, int index) {
-        return !ListUtil.isEmpty(list) && list.size() > index;
+        return !ListUtil.isEmpty(list) && list.size() > index && index > -1;
     }
 
     public static <T> boolean isEmpty(List<T> list) {

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

@@ -1,8 +1,8 @@
 package com.sheep.gamegroup.util;
 
 import android.app.Activity;
-import android.text.Html;
 import android.text.TextUtils;
+import android.view.Gravity;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -10,6 +10,7 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 import com.kfzs.duanduan.utils.NumberFormatUtils;
 import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.OrienteeringDetail;
 import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
 import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.model.entity.TaskReleaseEty;
@@ -81,6 +82,26 @@ public class TaskHelper {
                     }
                 });
     }
+    private OrienteeringDetail orienteeringDetail;
+    private void initGameTask(final View itemView, String third_task_id) {
+        SheepApp.getInstance().getNetComponent().getApiService().getMyGame(third_task_id)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        LogUtil.println("baseMessage onNext "+JSON.toJSONString(baseMessage));
+                        orienteeringDetail = baseMessage.getData(OrienteeringDetail.class);
+                        loadTask(itemView);
+
+                    }
+
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        LogUtil.println("baseMessage onError "+JSON.toJSONString(baseMessage));
+                    }
+                });
+    }
 
     public boolean hasTask() {
         return taskReleaseEty != null && taskReleaseEty.getTask() != null;
@@ -89,48 +110,111 @@ public class TaskHelper {
     private RxjavaCountDownTimer timer;
     public void loadTask(final View itemView) {
         itemView.setVisibility(View.VISIBLE);
+        if(taskReleaseEty == null){
+            return;
+        }
         final TaskEty taskEty = taskReleaseEty.getTask();
+        if(taskEty == null){
+            return;
+        }
         ImageView find_information_game_icon = (ImageView)itemView.findViewById(R.id.find_information_game_icon);
         TextView find_information_game_name = (TextView)itemView.findViewById(R.id.find_information_game_name);
         TextView find_information_game_surplus = (TextView)itemView.findViewById(R.id.find_information_game_surplus);
         TextView find_information_game_time = (TextView)itemView.findViewById(R.id.find_information_game_time);
         TextView find_information_game_yuan = (TextView)itemView.findViewById(R.id.find_information_game_yuan);
+        TextView find_information_game_task0 = (TextView)itemView.findViewById(R.id.find_information_game_task0);
         TextView find_information_game_task = (TextView)itemView.findViewById(R.id.find_information_game_task);
         final TextView find_information_game_task_end_time = (TextView)itemView.findViewById(R.id.find_information_game_task_end_time);
-        ViewUtil.setImage(find_information_game_icon, taskEty.getIcon());
+        if(orienteeringDetail != null){//已经完成的游戏任务
+            find_information_game_task.setVisibility(View.VISIBLE);
+            find_information_game_task0.setVisibility(View.VISIBLE);
+            find_information_game_yuan.setVisibility(View.INVISIBLE);
+            find_information_game_surplus.setText(String.format(Locale.CHINA, "可定向消费:%.1f元", orienteeringDetail.getBalance()));
+            find_information_game_surplus.setTextColor(activity.getResources().getColor(R.color.red_fd2d54));
+            find_information_game_task.setText("去充值");
+            find_information_game_task.setEnabled(true);
+            downloadHelper.updateDownloadTaskView(activity, taskEty, find_information_game_task0);
+            find_information_game_task.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    ViewUtil.showGamePayAccount(activity, orienteeringDetail.getGame_id());
+                }
+            });
+            itemView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    reloadDataType = 1;//回来后将刷新界面数据 taskAcceptedEty
+                    Jump2View.getInstance().goGameTaskDetailView(activity,  release_task_id, orienteeringDetail.getGame_id(),1);
+                    UMConfigUtils.IdEvent.TASK.commit(release_task_id);
+                }
+            });
+            return;
+        }
+        GlideImageLoader.centerImage(find_information_game_icon, taskEty.getIcon());
         ViewUtil.setText(find_information_game_name, taskReleaseEty.getName());
         ViewUtil.setText(find_information_game_surplus, String.format(Locale.CHINA, "剩余%s份", taskReleaseEty.getLast_num()));
         ViewUtil.setText(find_information_game_time, String.format(Locale.CHINA, "截止日期：%s", taskReleaseEty.getDeadline().equals("永久") ? taskReleaseEty.getDeadline() : TimeUtil.TimeStamp2Date(NumberFormatUtils.parseLong(taskReleaseEty.getDeadline()), "yyyy/MM/dd HH:mm")));
         ViewUtil.setText(find_information_game_yuan, String.format(Locale.CHINA, "+%s元", taskReleaseEty.getBonus()));
+        find_information_game_task0.setVisibility(View.GONE);
         find_information_game_yuan.setVisibility(View.VISIBLE);
-        if(taskAcceptedEty != null){
-            switch (taskAcceptedEty.getStatus()) {
-                case 1://"已接受任务";
-                case 2:// "正在进行中";
-                    find_information_game_task_end_time.setVisibility(View.VISIBLE);
-                    if(!taskReleaseEty.getDeadline().equals("永久")){
-                        find_information_game_task_end_time.setText(TimeUtil.getHours(taskAcceptedEty.getEnd_time() * 1000));
-                        timer = RxjavaCountDownTimer.getInstance(taskAcceptedEty.getEnd_time())
-                                .setOnTickListener(new RxjavaCountDownTimer.OnTickListener() {
-                                    @Override
-                                    public void onFinish() {
-                                        find_information_game_task_end_time.setVisibility(View.GONE);
-                                        refreshTask();
-                                    }
-
-                                    @Override
-                                    public void onTicker(long time) {
-                                        find_information_game_task_end_time.setText(TimeUtil.getHours(time * 1000));
-                                    }
-                                }).start();
+        switch (taskEty.getTask_type()) {// 1时间试玩任务 2 信用卡任务 3应用下载 4h5业务 1001畅思 1000连续任务， 1002 1003游戏任务
+            case 2://信用卡任务
+                find_information_game_task.setVisibility(View.GONE);
+                find_information_game_task_end_time.setVisibility(View.GONE);
+                find_information_game_yuan.setGravity(Gravity.END);
+                String[] remarks = new String[0];
+                if(!TextUtils.isEmpty(taskEty.getRemarks())) {
+                    remarks = taskEty.getRemarks().split(";");
+                }
+                find_information_game_time.setText(remarks.length > 0 ? remarks[0] : "");
+                find_information_game_surplus.setText(remarks.length > 1 ? remarks[1] : "");
+                itemView.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        Jump2View.getInstance().goCreditCardTaskDetail(activity, taskReleaseEty.getId());
                     }
-                    find_information_game_task.setText("取消任务");
-                    find_information_game_task.setEnabled(true);
-                    find_information_game_task.setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(View view) {
-                            FIND_TASK.onEvent("release_task_id", release_task_id, "action", "取消任务");
-                            SheepApp.getInstance().getNetComponent().getApiService().giveUpTask(taskAcceptedEty.getId())
+                });
+                break;
+            case 1001:
+                break;
+            case 1://时间试玩任务
+            case 3://应用下载
+            case 4://h5业务
+            case 1000://连续任务
+            case 1002://游戏任务
+            case 1003://游戏任务
+            default:
+                find_information_game_yuan.setGravity(Gravity.CENTER);
+                if(taskAcceptedEty != null){
+                    switch (taskAcceptedEty.getStatus()) {
+                        case 1://"已接受任务";
+                        case 2:// "正在进行中";
+                            if(taskReleaseEty.getDeadline().equals("永久")){
+                                find_information_game_task_end_time.setVisibility(View.GONE);
+                            } else {
+                                find_information_game_task_end_time.setVisibility(View.VISIBLE);
+                                find_information_game_task_end_time.setText(TimeUtil.getHours(taskAcceptedEty.getEnd_time() * 1000));
+                                timer = RxjavaCountDownTimer.getInstance(taskAcceptedEty.getEnd_time())
+                                        .setOnTickListener(new RxjavaCountDownTimer.OnTickListener() {
+                                            @Override
+                                            public void onFinish() {
+                                                find_information_game_task_end_time.setVisibility(View.GONE);
+                                                refreshTask();
+                                            }
+
+                                            @Override
+                                            public void onTicker(long time) {
+                                                find_information_game_task_end_time.setText(TimeUtil.getHours(time * 1000));
+                                            }
+                                        }).start();
+                            }
+                            find_information_game_task.setText("取消任务");
+                            find_information_game_task.setEnabled(true);
+                            find_information_game_task.setOnClickListener(new View.OnClickListener() {
+                                @Override
+                                public void onClick(View view) {
+                                    FIND_TASK.onEvent("release_task_id", release_task_id, "action", "取消任务");
+                                    SheepApp.getInstance().getNetComponent().getApiService().giveUpTask(taskAcceptedEty.getId())
                                             .subscribeOn(Schedulers.io())
                                             .observeOn(AndroidSchedulers.mainThread())
                                             .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
@@ -146,76 +230,83 @@ public class TaskHelper {
                                                     G.showToast(baseMessage);
                                                 }
                                             });
-                            //暂停下载
-                            CommonUtil.getInstance().stopDownloadTask(activity, taskEty.getDownload_link());
-                        }
-                    });
-                    break;
-                case 6://审核失败
-                    find_information_game_task_end_time.setVisibility(View.GONE);
-                    find_information_game_task.setVisibility(View.VISIBLE);
-                    find_information_game_task.setText("审核失败");
-                    find_information_game_task.setEnabled(false);
-                    break;
-                //不可操作
-                case 7:// "提交审核";
+                                    //暂停下载
+                                    CommonUtil.getInstance().stopDownloadTask(activity, taskEty.getDownload_link());
+                                }
+                            });
+                            break;
+                        case 6://审核失败
+                            find_information_game_task_end_time.setVisibility(View.GONE);
+                            find_information_game_task.setVisibility(View.VISIBLE);
+                            find_information_game_task.setText("审核失败");
+                            find_information_game_task.setEnabled(false);
+                            break;
+                        //不可操作
+                        case 7:// "提交审核";
+                            find_information_game_task_end_time.setVisibility(View.GONE);
+                            find_information_game_task.setVisibility(View.VISIBLE);
+                            find_information_game_task.setText("正在审核");
+                            find_information_game_task.setEnabled(false);
+                            break;
+                        case 3://完成任务
+                            find_information_game_task_end_time.setVisibility(View.GONE);
+                            find_information_game_task.setVisibility(View.VISIBLE);
+                            find_information_game_task.setText("已经完成");
+                            find_information_game_task.setEnabled(false);
+                            if(taskEty.isGameTask()){
+                                initGameTask(itemView, taskEty.getThird_task_id());
+                            }
+                            break;
+                        case 8://任务已经下线
+                            find_information_game_task_end_time.setVisibility(View.GONE);
+                            find_information_game_task.setVisibility(View.VISIBLE);
+                            find_information_game_task.setText("已经下线");
+                            find_information_game_task.setEnabled(false);
+                            break;
+                        case 9:// "至少完成一个任务了";
+                        default:
+                            find_information_game_task_end_time.setVisibility(View.GONE);
+                            find_information_game_task.setVisibility(View.GONE);
+                            break;
+                    }
+                } else if(taskReleaseEty.isOffline()){//任务已经下线
                     find_information_game_task_end_time.setVisibility(View.GONE);
                     find_information_game_task.setVisibility(View.VISIBLE);
-                    find_information_game_task.setText("正在审核");
+                    find_information_game_task.setText("已经下线");
                     find_information_game_task.setEnabled(false);
-                    break;
-                case 3://完成任务
+                } else if("0".equals(taskReleaseEty.getLast_num())){
                     find_information_game_task_end_time.setVisibility(View.GONE);
                     find_information_game_task.setVisibility(View.VISIBLE);
-                    find_information_game_task.setText("已经完成");
+                    find_information_game_task.setText("任务已抢光");
                     find_information_game_task.setEnabled(false);
-                    break;
-                case 8://任务已经下线
+                } else {
                     find_information_game_task_end_time.setVisibility(View.GONE);
                     find_information_game_task.setVisibility(View.VISIBLE);
-                    find_information_game_task.setText("已经下线");
-                    find_information_game_task.setEnabled(false);
-                    break;
-                case 9:// "至少完成一个任务了";
-                default:
-                    find_information_game_task_end_time.setVisibility(View.GONE);
-                    find_information_game_task.setVisibility(View.GONE);
-                    break;
-            }
-        } else if(taskReleaseEty.isOffline()){//任务已经下线
-            find_information_game_task_end_time.setVisibility(View.GONE);
-            find_information_game_task.setVisibility(View.VISIBLE);
-            find_information_game_task.setText("已经下线");
-            find_information_game_task.setEnabled(false);
-        } else if("0".equals(taskReleaseEty.getLast_num())){
-            find_information_game_task_end_time.setVisibility(View.GONE);
-            find_information_game_task.setVisibility(View.VISIBLE);
-            find_information_game_task.setText("任务已抢光");
-            find_information_game_task.setEnabled(false);
-        } else {
-            find_information_game_task_end_time.setVisibility(View.GONE);
-            find_information_game_task.setVisibility(View.VISIBLE);
-            find_information_game_task.setText("领取任务");
-            find_information_game_task.setEnabled(true);
-            find_information_game_task.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View view) {
-                    taskEty.setRunTask(0);
-                    taskEty.setRelease_task_id(taskReleaseEty.getId());
-                    taskEty.setName(taskReleaseEty.getName());
-                    taskEty.setAcceptedTaskId(taskReleaseEty.getAccepted_task_id());
-                    Jump2View.getInstance().goDialogActivityView(activity, taskEty);
-                    FIND_TASK.onEvent("release_task_id", release_task_id, "action", "领取任务");
+                    find_information_game_task.setText("领取任务");
+                    find_information_game_task.setEnabled(true);
+                    find_information_game_task.setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View view) {
+                            taskEty.setRunTask(0);
+                            taskEty.setRelease_task_id(taskReleaseEty.getId());
+                            taskEty.setName(taskReleaseEty.getName());
+                            taskEty.setAcceptedTaskId(taskReleaseEty.getAccepted_task_id());
+                            Jump2View.getInstance().goDialogActivityView(activity, taskEty);
+                            FIND_TASK.onEvent("release_task_id", release_task_id, "action", "领取任务");
+                        }
+                    });
                 }
-            });
+                itemView.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        reloadDataType = 1;//回来后将刷新界面数据 taskAcceptedEty
+                        Jump2View.getInstance().goTaskDetailView(activity, release_task_id);
+                    }
+                });
+                break;
         }
-        itemView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Jump2View.getInstance().goTaskDetailView(activity, release_task_id);
-            }
-        });
     }
+
     //刷新界面
     public void refreshTask() {
         clear();
@@ -223,7 +314,14 @@ public class TaskHelper {
         taskReleaseEty = null;
         initAcceptedTask(activity, release_task_id);
     }
-
+    private int reloadDataType;//0 不刷新数据 1刷新 taskAcceptedEty
+    public void onResume() {
+        switch (reloadDataType){
+            case 1:
+                refreshTask();
+                break;
+        }
+    }
     /**
      * 清理计时器
      */
@@ -232,4 +330,23 @@ public class TaskHelper {
             timer.clear();
         timer = null;
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+    private DownloadHelper downloadHelper = new DownloadHelper();
+
+    public void updateState(int status) {
+        downloadHelper.updateState(status);
+    }
+
 }

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

@@ -93,6 +93,7 @@ public class UMConfigUtils {
         FIND_SCORE           ,//评分或者重新评分 5062 需要传发现app的id到substring中，如：{"application_id": 1}
         USER_FIND_APP_ORDER           ,//点击个人中心中的游戏预约 5063
         MY_MONEY_TAB           ,//点击我的资产中的tab 5064 需要传点击的tab对应的名字：充值记录、提现记录、收支明细，如:{"tab_name": "充值记录"}或{"tab_name": "提现记录"}或{"tab_name": "收支明细"}
+        NEWBIE_TASK           ,//点击新手任务图标 5065
         ;
         private String key;
         Event(String key){

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

@@ -106,7 +106,6 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
             @Override
             public void onRefresh() {
                 initData();
-                refresh.setRefreshing(false);
             }
         });
 
@@ -155,7 +154,9 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
 
     }
     private TaskHelper taskHelper = new TaskHelper(this);
+    private ViewGroup bottomViewGroup;
     private void loadBottom(ViewGroup viewGroup) {
+        bottomViewGroup = viewGroup;
         if(taskHelper.hasTask()) {
             taskHelper.loadTask(viewGroup.getChildAt(0));
         } else {
@@ -218,7 +219,6 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
                 }
             }
         });
-        taskHelper.clear();
         SheepApp.getInstance().getNetComponent().getApiService().getFindDetail(id)
                         .subscribeOn(Schedulers.io())
                         .observeOn(AndroidSchedulers.mainThread())
@@ -227,7 +227,8 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
                             public void onNext(BaseMessage baseMessage) {
                                 LogUtil.println("baseMessage onNext "+ JSON.toJSONString(baseMessage));
                                 FindItem data = baseMessage.getData(FindItem.class);
-                                if(data != null){
+                                if(data != null && !TextUtils.equals(JSON.toJSONString(findItem), JSON.toJSONString(data))){
+                                    taskHelper.clear();
                                     findItem = data;
                                     list.clear();
                                     list.add("top");
@@ -239,12 +240,15 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
                                     if(findItem.getApplication_id() != 0){//包含游戏
                                         initFindApp(findItem.getApplication_id());
                                     }
+                                } else {
+                                    refresh.setRefreshing(false);
                                 }
                             }
 
                             @Override
                             public void onError(BaseMessage baseMessage) {
                                 LogUtil.println("baseMessage onError "+JSON.toJSONString(baseMessage));
+                                taskHelper.clear();
                                 notifyDataSetChanged();
                             }
                         });
@@ -267,6 +271,7 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
                             public void onError(BaseMessage baseMessage) {
                                 LogUtil.println("baseMessage onError "+JSON.toJSONString(baseMessage));
                                 G.showToast(baseMessage);
+                                refresh.setRefreshing(false);
                             }
                         });
     }
@@ -403,6 +408,13 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
             }
         }
     }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        taskHelper.onResume();
+    }
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
@@ -413,8 +425,8 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
     @Override
     public void call(Integer integer) {
         switch (integer){
-            case 1://刷新界面
-                notifyDataSetChanged();
+            case 1://刷新底部
+                loadBottom(bottomViewGroup);
                 break;
         }
     }

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

@@ -2,12 +2,14 @@ package com.sheep.gamegroup.view.activity;
 
 import android.app.Activity;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.NewbieTaskRecord;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
+import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.RxjavaCountDownTimer;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
@@ -32,6 +34,16 @@ public class ActUnderstandSheep extends BaseActivity {
 
     @BindView(R.id.i_understand_tv)
     TextView i_understand_tv;
+    @BindView(R.id.understand_sheep_01)
+    ImageView understand_sheep_01;
+    @BindView(R.id.understand_sheep_02)
+    ImageView understand_sheep_02;
+    @BindView(R.id.understand_sheep_03)
+    ImageView understand_sheep_03;
+    @BindView(R.id.understand_sheep_04)
+    ImageView understand_sheep_04;
+    @BindView(R.id.understand_sheep_05)
+    ImageView understand_sheep_05;
 
     private RxjavaCountDownTimer timer;
     @Override
@@ -51,6 +63,11 @@ public class ActUnderstandSheep extends BaseActivity {
                 setDontShowNewbieTaskDialog();
             }
         });
+        GlideImageLoader.setImage(understand_sheep_01, "http://cdngame.kuaifazs.com/understand_sheep_01.png");
+        GlideImageLoader.setImage(understand_sheep_02, "http://cdngame.kuaifazs.com/understand_sheep_02.png");
+        GlideImageLoader.setImage(understand_sheep_03, "http://cdngame.kuaifazs.com/understand_sheep_03.png");
+        GlideImageLoader.setImage(understand_sheep_04, "http://cdngame.kuaifazs.com/understand_sheep_04.png");
+        GlideImageLoader.setImage(understand_sheep_05, "http://cdngame.kuaifazs.com/understand_sheep_05.png");
         newbie_task_record = (NewbieTaskRecord) getIntent().getSerializableExtra(NewbieTaskRecord.class.getSimpleName());
         final int count = BuildConfig.DEBUG ? 10 : 15;
         timer = RxjavaCountDownTimer.getInstance(count)

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

@@ -5,6 +5,7 @@ import android.support.v7.widget.AppCompatEditText;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
@@ -19,6 +20,7 @@ import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.presenter.PhoneContract;
 import com.sheep.gamegroup.presenter.PhonePresenter;
 import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.SelfCountDownTimer;
@@ -64,6 +66,8 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
     TextView phoneSureTv;
     @BindView(R.id.change_phone_layout)
     LinearLayout changePhoneLayout;
+    @BindView(R.id.no_bind_tel_img)
+    ImageView no_bind_tel_img;
 
     @Inject
     PhonePresenter presenter;
@@ -92,12 +96,13 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
 
     @Override
     protected int getLayoutId() {
-        return R.layout.changge_tel_layout;
+        return R.layout.change_tel_layout;
     }
 
     @Override
     public void initView() {
         activity = this;
+        GlideImageLoader.setImage(no_bind_tel_img, "http://cdngame.kuaifazs.com/no_bind_tel_img.png");
         DaggerChangePhoneComponent.builder()
                 .netComponent(SheepApp.get(activity).getNetComponent())
                 .phoneModule(new PhoneModule(this))
@@ -127,7 +132,7 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
             oldOrNew = 1;
             showChangeLayout.setVisibility(View.VISIBLE);
             changePhoneLayout.setVisibility(View.GONE);
-            telTv.setText(mobiles+"");
+            telTv.setText(mobiles);
             return;
         }
         refreshData();

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

@@ -1,8 +1,10 @@
 package com.sheep.gamegroup.view.activity;
 
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.sheep.gamegroup.absBase.BaseActivity;
+import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.jiuyan.samllsheep.R;
@@ -20,6 +22,8 @@ public class ChangeWxOrTelAct extends BaseActivity {
     public static final int TYPE_NORMAL = 0;//正常情况下
     @BindView(R.id.change_sure_tv)
     TextView sureTv;
+    @BindView(R.id.no_bind_img)
+    ImageView no_bind_img;
 
     @Override
     protected int getLayoutId() {
@@ -32,6 +36,7 @@ public class ChangeWxOrTelAct extends BaseActivity {
                 .setTitle(this,"绑定微信号")
                 .setTitleFinish(this);
         from = getIntent().getIntExtra("from", TYPE_NORMAL);
+        GlideImageLoader.setImage(no_bind_img, "http://cdngame.kuaifazs.com/no_bind_img.png");
     }
 
     @Override

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

@@ -12,6 +12,7 @@ import com.sheep.gamegroup.di.modules.LoginModule;
 import com.sheep.gamegroup.presenter.LoginContract;
 import com.sheep.gamegroup.presenter.LoginPresenter;
 import com.sheep.gamegroup.util.ChannelContent;
+import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.jiuyan.samllsheep.R;
@@ -38,6 +39,10 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
 
     @Inject
     LoginPresenter mPresenter;
+
+    @BindView(R.id.login_bg_img)
+    ImageView login_bg_img;
+
     @BindView(R.id.tel_login_tv)
     TextView telLoginTv;
     @BindView(R.id.iv_wx)
@@ -63,6 +68,7 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
                 .loginModule(new LoginModule(this))
                 .build()
                 .inject(this);
+        GlideImageLoader.setImage(login_bg_img, "http://cdngame.kuaifazs.com/login_bg_img.png");
         TestUtil.testChange(this, (TextView) findViewById(R.id.test_change));
         TestUtil.testChangeUser(this, (TextView) findViewById(R.id.test_change_user));
 

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

@@ -7,6 +7,7 @@ import android.text.TextUtils;
 
 import com.alibaba.fastjson.JSONObject;
 import com.kfzs.duanduan.react.MainTab;
+import com.kfzs.duanduan.utils.NumberFormatUtils;
 import com.sheep.gamegroup.model.entity.JPushMessage;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.TestUtil;
@@ -115,7 +116,7 @@ public class MiddleAct extends Activity {
                             Jump2View.getInstance().tryGoWithdrawal(activity, null);
                             break;
                         case 621://提现结果页面
-                            Jump2View.getInstance().goWithdrawalResultview(activity, msg.getMsg());
+                            Jump2View.getInstance().goWithdrawalResultview(activity, NumberFormatUtils.parseFloat(msg.getMsg()));
                             break;
                         case 63://充值Q币
                             Jump2View.getInstance().goRechargeQAct(activity,null);

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

@@ -26,6 +26,7 @@ import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.model.entity.Advertising;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
+import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.RxjavaCountDownTimer;
@@ -130,6 +131,8 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
         return R.layout.splash_activity;
     }
 
+    @BindView(R.id.login_bg_img)
+    ImageView login_bg_img;
     @Override
     public void initView() {
         activity = this;
@@ -138,6 +141,7 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
         if(object instanceof Advertising){
             Glide.with(activity).load(((Advertising) object).getDisplay_src()).into(splash_bg);
         }
+        GlideImageLoader.setImage(login_bg_img, "http://cdngame.kuaifazs.com/login_bg_img.png");
     }
 
     @Override

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

@@ -34,8 +34,7 @@ import com.kfzs.duanduan.utils.ApkUtils;
 import com.sheep.gamegroup.absBase.AbsChooseImageActivity;
 import com.sheep.gamegroup.di.components.DaggerTaskDetailComponent;
 import com.sheep.gamegroup.di.modules.TaskDetailModule;
-import com.sheep.gamegroup.model.api.ITask;
-import com.sheep.gamegroup.model.entity.AppRecord;
+import com.sheep.gamegroup.model.api.IDownload;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.DialogEntity;
 import com.sheep.gamegroup.model.entity.Ext;
@@ -68,10 +67,8 @@ import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
-import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
-import org.afinal.simplecache.ACache;
 import org.greenrobot.eventbus.EventBus;
 
 import java.util.ArrayList;
@@ -207,6 +204,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         taskId = getIntent().getIntExtra("task_id", -1);
         game_id = getIntent().getIntExtra("game_id", -1);
         game_type = getIntent().getIntExtra("game_type", -1);
+        LogUtil.println("TaskDetailAct", "btn_show =", btn_show, "isFromTaskList =", isFromTaskList, "taskId =", taskId, "game_id =", game_id, "game_type =", game_type);
         DaggerTaskDetailComponent.builder()
                 .netComponent(SheepApp.get(activity).getNetComponent())
                 .taskDetailModule(new TaskDetailModule(this))
@@ -432,7 +430,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
 
     }
 
-    public static void setBtnStr(ITask taskEty, DownloadTaskService mDownloadTaskService, Action1<Object> action1) {
+    public static void setBtnStr(IDownload taskEty, DownloadTaskService mDownloadTaskService, Action1<Object> action1) {
         boolean isInstalled = PackageUtil.isAppInstalled(SheepApp.getInstance(), taskEty.getPackage_names());
         boolean isExistApk = !TextUtils.isEmpty(PackageUtil.isExistsFile(taskEty.getPackage_names()));
         String buttonStr;

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

@@ -199,7 +199,7 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
 
     private void getDetail(){
 
-        SheepApp.getInstance().getNetComponent().getApiService().getReleaseTaskCreditCardDesc(id)
+        SheepApp.getInstance().getNetComponent().getApiService().taskDesc(id)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new SheepSubscriber<BaseMessage>(activity) {

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

@@ -13,6 +13,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.kfzs.duanduan.event.BigEvent;
 import com.kfzs.duanduan.event.EventTypes;
+import com.kfzs.duanduan.utils.NumberFormatUtils;
 import com.kfzs.duanduan.utils.dlg.FormatAny;
 import com.sheep.gamegroup.di.components.DaggerWithdrawalComponent;
 import com.sheep.gamegroup.di.modules.WithdrawalModule;
@@ -216,10 +217,7 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
     public void updateView(Object o) {
         hideProgress();
         EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.ONFRESH_FGT_FAMLLSHEEP));
-//        BaseMessage baseMessage = (BaseMessage) o;
-        SpUtils.saveWithdral(activity, amount);
-        EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.INTENT_AMOUNT_VALUE));
-        Jump2View.getInstance().goWithdrawalResultview(activity, amount);
+        Jump2View.getInstance().goWithdrawalResultview(activity, NumberFormatUtils.parseFloat(amount));
     }
 
     @Override

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

@@ -5,20 +5,18 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.kfzs.duanduan.event.BigEvent;
+import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.di.components.DaggerWithdrawalResultComponent;
 import com.sheep.gamegroup.di.modules.WithdrawalResultModule;
 import com.sheep.gamegroup.presenter.WithdrawalResultContract;
 import com.sheep.gamegroup.presenter.WithdrawalResultPresenter;
 import com.sheep.gamegroup.util.ActivityManager;
+import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.gamegroup.absBase.BaseActivity;
-import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
+import java.util.Locale;
 
 import javax.inject.Inject;
 
@@ -42,19 +40,19 @@ public class WithdrawalResultAct extends BaseActivity implements WithdrawalResul
     @BindView(R.id.withdrawal_success_money_tv)
     TextView withdrawalSuccessMoneyTv;
 
-    private String amount;
+    private float amount;
 
     @Override
     protected int getLayoutId() {
-        return R.layout.withdrawal_success_layotu;
+        return R.layout.withdrawal_success_layout;
     }
 
     @Override
     public void initView() {
-        EventBus.getDefault().register(this);
+        GlideImageLoader.setImage(withdrawal_image_iv, "http://cdngame.kuaifazs.com/yellow_yang.png");
         activity = this;
-        amount = getIntent().getStringExtra("amount");
-        withdrawalSuccessMoneyTv.setText("+"+ SpUtils.getWithdral(activity) +"元");
+        amount = getIntent().getFloatExtra(Float.class.getSimpleName(), 0);
+        withdrawalSuccessMoneyTv.setText(String.format(Locale.CHINA, "+%.1f元", amount));
         TitleBarUtils.getInstance()
                 .setTitle(activity, "提现审核中")
                 .setTitleFinish(activity);
@@ -72,7 +70,6 @@ public class WithdrawalResultAct extends BaseActivity implements WithdrawalResul
 
     @Override
     public void initData() {
-//        withdrawalSuccessMoneyTv.setText("+"+amount+"元");
     }
 
     @OnClick({R.id.withdrawal_success_sure_tv})
@@ -89,17 +86,6 @@ public class WithdrawalResultAct extends BaseActivity implements WithdrawalResul
     protected void onDestroy() {
         super.onDestroy();
         ActivityManager.getInstance().endActivity(WithdrawalAct.class);
-        EventBus.getDefault().unregister(this);
-        SpUtils.saveWithdral(activity,"");
     }
 
-    @Subscribe
-    public void onEventMainThread(BigEvent event) {
-        switch (event.getEventTypes()) {
-            case INTENT_AMOUNT_VALUE:
-                amount = event.getOthers() +"";
-//                withdrawalSuccessMoneyTv.setText("+"+amount+"元");
-                break;
-        }
-    }
 }

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

@@ -452,7 +452,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 detail_task_tv.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        if(!ListUtil.hasIndex(etyList, i)){
+                        if(ListUtil.getIndex(etyList, i) == null){
                             G.showToast(R.string.loading_data);
                             return;
                         }

app/src/main/java/com/sheep/jiuyan/samllsheep/utils/SpUtils.java

@@ -61,18 +61,6 @@ public class SpUtils {
         return user.getString("apptoken", "");
 
     }
-    public static void saveWithdral(Context context, String vaule) {
-        SharedPreferences user = context.getSharedPreferences("withdral", Context.MODE_PRIVATE);
-        SharedPreferences.Editor editor = user.edit();
-        editor.putString("withdral_price", vaule);
-        editor.apply();
-    }
-
-
-    public static String getWithdral(Context context) {
-        SharedPreferences user = context.getSharedPreferences("withdral", Context.MODE_PRIVATE);
-        return user.getString("withdral_price", "");
-    }
     public static void savePhone(Context context, String vaule) {
         SharedPreferences user = context.getSharedPreferences("phone", Context.MODE_PRIVATE);
         SharedPreferences.Editor editor = user.edit();

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

@@ -11,14 +11,13 @@
         android:layout_height="wrap_content"
         android:background="@mipmap/home_blue_bg"
         android:paddingBottom="52dp"
-        android:paddingTop="@dimen/status_bar_height"
-        android:paddingEnd="@dimen/content_padding_20"
-        android:paddingStart="@dimen/content_padding_20">
+        android:paddingTop="@dimen/status_bar_height">
 
         <ImageView
             android:id="@+id/img_baseactivity_title"
             android:layout_width="wrap_content"
             android:layout_height="?attr/actionBarSize"
+            android:paddingStart="@dimen/content_padding_20"
             android:paddingEnd="@dimen/content_padding_20"
             android:gravity="center_vertical"
             android:scaleType="centerInside"
@@ -47,6 +46,7 @@
             android:text="@string/total_money_lable"
             android:textSize="15sp"
             android:textColor="@color/white"
+            android:layout_marginStart="@dimen/content_padding_20"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/img_baseactivity_title" />
         <LinearLayout
@@ -54,6 +54,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="vertical"
+            android:layout_marginEnd="@dimen/content_padding_20"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/img_baseactivity_title" >
             <TextView
@@ -114,6 +115,7 @@
             android:textColor="@color/white"
             android:textSize="12sp"
             android:text="@string/available_amount"
+            android:layout_marginStart="@dimen/content_padding_20"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintBottom_toBottomOf="@+id/my_money_ll" />
         <TextView
@@ -124,6 +126,7 @@
             android:layout_marginBottom="@dimen/content_padding_10"
             android:textSize="25sp"
             android:textColor="@color/white"
+            android:layout_marginStart="@dimen/content_padding_20"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintBottom_toTopOf="@+id/my_money_available_amount" />
 

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

@@ -103,8 +103,7 @@
                     android:layout_marginTop="10dp"
                     android:layout_below="@+id/understand_sheep_center_lz"
                     android:adjustViewBounds="true"
-                    android:scaleType="fitXY"
-                    android:src="@mipmap/understand_sheep_01" />
+                    android:scaleType="fitXY" />
 
                 <ImageView
                     android:id="@+id/understand_sheep_02"
@@ -115,8 +114,7 @@
                     android:layout_marginTop="30dp"
                     android:layout_below="@+id/understand_sheep_01"
                     android:adjustViewBounds="true"
-                    android:scaleType="fitXY"
-                    android:src="@mipmap/understand_sheep_02" />
+                    android:scaleType="fitXY" />
 
                 <ImageView
                     android:id="@+id/understand_sheep_03"
@@ -127,8 +125,7 @@
                     android:layout_marginTop="30dp"
                     android:layout_below="@+id/understand_sheep_02"
                     android:adjustViewBounds="true"
-                    android:scaleType="fitXY"
-                    android:src="@mipmap/understand_sheep_03" />
+                    android:scaleType="fitXY" />
 
                 <ImageView
                     android:id="@+id/understand_sheep_04"
@@ -139,8 +136,7 @@
                     android:layout_marginTop="30dp"
                     android:layout_below="@+id/understand_sheep_03"
                     android:adjustViewBounds="true"
-                    android:scaleType="fitXY"
-                    android:src="@mipmap/understand_sheep_04" />
+                    android:scaleType="fitXY" />
 
                 <ImageView
                     android:id="@+id/understand_sheep_05"
@@ -151,8 +147,7 @@
                     android:layout_marginTop="30dp"
                     android:layout_below="@+id/understand_sheep_04"
                     android:adjustViewBounds="true"
-                    android:scaleType="fitXY"
-                    android:src="@mipmap/understand_sheep_05" />
+                    android:scaleType="fitXY" />
 
 
                 <View

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

@@ -24,12 +24,12 @@
                 android:visibility="gone">
 
                 <ImageView
+                    android:id="@+id/no_bind_tel_img"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
                     android:layout_marginLeft="@dimen/content_padding_100"
                     android:layout_marginRight="@dimen/content_padding_100"
-                    android:src="@mipmap/no_bind_tel_img"
                     android:layout_marginTop="@dimen/content_padding_35"
                     android:layout_marginBottom="5dp"/>
 
@@ -95,24 +95,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:visibility="gone">
-                    <ImageView
-                        android:id="@+id/phone_iv"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:minWidth="@dimen/content_padding_140"
-                        android:minHeight="@dimen/content_padding_140"
-                        android:layout_gravity="center_horizontal"
-                        android:layout_marginLeft="100dp"
-                        android:layout_marginRight="100dp"
-                        android:src="@mipmap/no_bind_phone"
-                        android:layout_marginTop="35dp"
-                        android:layout_marginBottom="5dp"/>
-                </LinearLayout>
 
                 <TextView
                     android:id="@+id/phone_tip_tv"

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

@@ -18,13 +18,12 @@
             android:orientation="vertical">
 
             <ImageView
-                android:id="@+id/phone_iv"
+                android:id="@+id/no_bind_img"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:layout_marginLeft="@dimen/content_padding_100"
                 android:layout_marginRight="@dimen/content_padding_100"
-                android:src="@mipmap/no_bind_img"
                 android:layout_marginTop="@dimen/content_padding_35"
                 android:layout_marginBottom="5dp"/>
 

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

@@ -49,17 +49,25 @@
 
     <TextView
         android:id="@+id/find_information_game_yuan"
-        android:layout_width="wrap_content"
+        android:layout_width="@dimen/find_bt_with"
         android:layout_height="wrap_content"
         android:text="@string/app_name"
         android:textColor="@color/red"
         android:textSize="17sp"
+        android:gravity="center"
         app:layout_constraintBottom_toTopOf="@+id/find_information_game_task"
-        app:layout_constraintEnd_toEndOf="@+id/find_information_game_task"
-        app:layout_constraintStart_toStartOf="@+id/find_information_game_task"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@+id/find_information_game_icon" />
 
     <TextView
+        android:id="@+id/find_information_game_task0"
+        style="@style/style_button_find"
+        android:text="接受任务"
+        android:visibility="gone"
+        app:layout_constraintBottom_toTopOf="@+id/find_information_game_task"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/find_information_game_icon" />
+    <TextView
         android:id="@+id/find_information_game_task"
         style="@style/style_button_find"
         android:text="接受任务"

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

@@ -70,11 +70,11 @@
         android:gravity="center"
         android:visibility="gone">
         <ImageView
+            android:id="@+id/bg_newbie_task"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:scaleType="fitXY"
-            android:adjustViewBounds="true"
-            android:src="@mipmap/bg_newbie_task"/>
+            android:adjustViewBounds="true"/>
     </com.kfzs.duanduan.view.DragRelativeLayout>
     <TextView
         android:id="@+id/test_change_user"

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

@@ -7,10 +7,13 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@mipmap/login_bg_img"
         style="@style/login_layout"
         android:layout_marginTop="@dimen/content_padding_80">
-
+        <ImageView
+            android:id="@+id/login_bg_img"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="centerCrop"/>
         <LinearLayout
             android:id="@+id/tel_agreement_ll"
             android:layout_width="match_parent"

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

@@ -5,6 +5,11 @@
     android:background="@android:color/black"
     android:orientation="vertical">
 
+    <ImageView
+        android:id="@+id/login_bg_img"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:alpha="0"/>
     <VideoView
         android:id="@+id/splash_video_view"
         android:layout_width="match_parent"

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

@@ -11,7 +11,6 @@
         android:id="@+id/withdrawal_image_iv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@mipmap/yellow_yang"
         android:layout_gravity="center_horizontal"/>
 
     <TextView

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

@@ -28,8 +28,8 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:background">@drawable/selector_button_full_main</item>
         <item name="android:gravity">center</item>
-        <item name="android:paddingBottom">5dp</item>
-        <item name="android:paddingTop">5dp</item>
+        <item name="android:paddingBottom">4dp</item>
+        <item name="android:paddingTop">4dp</item>
         <item name="android:textColor">@color/btn_color_main</item>
         <item name="android:textSize">@dimen/text_size_15</item>
     </style>
@@ -38,8 +38,8 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:background">@drawable/selector_button_full_main2</item>
         <item name="android:gravity">center</item>
-        <item name="android:paddingBottom">5dp</item>
-        <item name="android:paddingTop">5dp</item>
+        <item name="android:paddingBottom">4dp</item>
+        <item name="android:paddingTop">4dp</item>
         <item name="android:textColor">@color/selector_color_main_tab2</item>
         <item name="android:textSize">@dimen/text_size_15</item>
     </style>