添加预约任务流程；修复身份认证界面中不兼容问题；添加部分统计

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

@@ -155,17 +155,11 @@ public abstract class AbsFgtMyMoney extends BaseFragment {
                                 list.clear();
                             ListUtil.addAll(list, newList);
                             notifyDataSetChanged();
-                            if (BuildConfig.DEBUG)
-                                System.out.println("baseMessage onNext " + JSON.toJSONString(baseMessage));
                         }
-                        if(BuildConfig.DEBUG)
-                            System.out.println("baseMessage onNext "+ JSON.toJSONString(baseMessage));
                     }
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        if(BuildConfig.DEBUG)
-                            System.out.println("baseMessage onError "+JSON.toJSONString(baseMessage));
                         notifyDataSetChanged();
                     }
                 });

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

@@ -71,15 +71,10 @@ public class FgtCreditCardProgressQuery extends BaseFragment {
                         List<CreditCardProgressQuery> newList = baseMessage.getDatas(CreditCardProgressQuery.class);
                         list.addAll(newList);
                         notifyDataSetChanged();
-                        if(BuildConfig.DEBUG)
-                            System.out.println("baseMessage onNext "+ JSON.toJSONString(baseMessage));
                     }
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        if(BuildConfig.DEBUG)
-                            System.out.println("baseMessage onError "+JSON.toJSONString(baseMessage));
-//                        G.showToast(baseMessage);
                         notifyDataSetChanged();
                     }
                 });

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

@@ -90,15 +90,10 @@ public class FgtCreditCardTaskList extends BaseFragment {
                                 List<TaskReleaseEty> newList = baseMessage.getDatas(TaskReleaseEty.class);
                                 list.addAll(newList);
                                 notifyDataSetChanged();
-                                if(BuildConfig.DEBUG)
-                                    System.out.println("baseMessage onNext "+ JSON.toJSONString(baseMessage));
                             }
 
                             @Override
                             public void onError(BaseMessage baseMessage) {
-                                if(BuildConfig.DEBUG)
-                                    System.out.println("baseMessage onError "+JSON.toJSONString(baseMessage));
-//                                G.showToast(baseMessage);
                                 notifyDataSetChanged();
                             }
                         });

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

@@ -54,7 +54,6 @@ public class FgtFind extends BaseCompatFragment {
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onNext "+JSON.toJSONString(baseMessage));
                         List<FindTag> newList = baseMessage.getDatas(FindTag.class);
                         if(!ListUtil.isEmpty(newList)){
                             list.clear();
@@ -65,7 +64,6 @@ public class FgtFind extends BaseCompatFragment {
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onError "+ JSON.toJSONString(baseMessage));
                         G.showToast(baseMessage);
                     }
                 });

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

@@ -214,12 +214,10 @@ public class FgtFindChild extends BaseCompatFragment {
                         .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
                             @Override
                             public void onNext(BaseMessage baseMessage) {
-                                LogUtil.println("baseMessage onNext "+JSON.toJSONString(baseMessage));
                             }
 
                             @Override
                             public void onError(BaseMessage baseMessage) {
-                                LogUtil.println("baseMessage onError "+JSON.toJSONString(baseMessage));
                             }
                         });
         }
@@ -236,7 +234,6 @@ public class FgtFindChild extends BaseCompatFragment {
                         .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
                             @Override
                             public void onNext(BaseMessage baseMessage) {
-                                LogUtil.println("baseMessage onNext "+JSON.toJSONString(baseMessage));
                                 HomeListEntity homeListEntity = baseMessage.getData(HomeListEntity.class);
                                 if(homeListEntity == null){
                                     G.showToast(R.string.error_data);
@@ -247,7 +244,6 @@ public class FgtFindChild extends BaseCompatFragment {
 
                             @Override
                             public void onError(BaseMessage baseMessage) {
-                                LogUtil.println("baseMessage onError "+JSON.toJSONString(baseMessage));
                                 G.showToast(baseMessage);
                             }
                         });
@@ -292,7 +288,6 @@ public class FgtFindChild extends BaseCompatFragment {
                         .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
                             @Override
                             public void onNext(BaseMessage baseMessage) {
-                                LogUtil.println("baseMessage onNext "+ JSON.toJSONString(baseMessage));
                                 List<FindItem> newList = baseMessage.getDatas(FindItem.class);
                                 if(!ListUtil.isEmpty(newList)){
                                     list.clear();
@@ -305,7 +300,6 @@ public class FgtFindChild extends BaseCompatFragment {
 
                             @Override
                             public void onError(BaseMessage baseMessage) {
-                                LogUtil.println("baseMessage onError "+JSON.toJSONString(baseMessage));
                                 notifyDataSetChanged();
                             }
                         });

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

@@ -97,16 +97,12 @@ public class FgtFriendExtractPage extends BaseFragment {
                             }
                             list.addAll(friendList);
                             notifyDataSetChanged();
-                            if (BuildConfig.DEBUG)
-                                System.out.println("baseMessage onNext " + JSON.toJSONString(baseMessage));
                             isLoadding = false;
                         }
                     }
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        if(BuildConfig.DEBUG)
-                            System.out.println("baseMessage onError "+JSON.toJSONString(baseMessage));
                         G.showToast(baseMessage);
                         isLoadding = false;
                     }

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

@@ -106,13 +106,11 @@ public class FgtPersonalCenter extends BaseCompatFragment {
                         .subscribe(new SheepSubscriber<BaseMessage>(getContext()) {
                             @Override
                             public void onNext(BaseMessage baseMessage) {
-                                LogUtil.println("baseMessage onNext " + JSON.toJSONString(baseMessage));
                                 updateData(baseMessage);
                             }
 
                             @Override
                             public void onError(BaseMessage baseMessage) {
-                                LogUtil.println("baseMessage onError " + JSON.toJSONString(baseMessage));
                             }
                         });
             }

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

@@ -489,11 +489,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             e.printStackTrace();
         }
         mHanderl.sendEmptyMessage(0);
-        //PersionInfoAct.java与AskGetMoneyAct.java中分享二维码时的图片预下载
-        Glide.with(this)
-                .load(AppUtil.getQRLink(userEntity.getShare_link(), 800))
-                .apply(new RequestOptions().diskCacheStrategy(DiskCacheStrategy.RESOURCE))
-                .preload(800, 800);
         Jump2View.getInstance().tryShowNewbieTask(activity, userEntity, newbie_task);
     }
 

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

@@ -87,7 +87,6 @@ public class FindAppHelper{
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onNext "+ JSON.toJSONString(baseMessage));
                         findApp.setRecord(2);//设置为不可记录
                         if(findApp.isCanDonload()){
                             //提交下载成功
@@ -103,7 +102,6 @@ public class FindAppHelper{
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onError "+JSON.toJSONString(baseMessage));
                         if(!findApp.isCanDonload()){
                             G.showToast("预约失败");
                         }

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

@@ -57,14 +57,12 @@ public class TaskHelper {
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onNext "+ JSON.toJSONString(baseMessage));
                         taskAcceptedEty = baseMessage.getData(TaskAcceptedEty.class);
                         initTask(release_task_id);
                     }
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onError "+JSON.toJSONString(baseMessage));
                         initTask(release_task_id);
                     }
                 });
@@ -77,7 +75,6 @@ public class TaskHelper {
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onNext "+JSON.toJSONString(baseMessage));
                         taskReleaseEty = baseMessage.getData(TaskReleaseEty.class);
                         if(action1 != null)
                             action1.call(1);//刷新界面
@@ -86,7 +83,6 @@ public class TaskHelper {
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onError "+JSON.toJSONString(baseMessage));
                     }
                 });
     }
@@ -98,7 +94,6 @@ public class TaskHelper {
                 .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);
 
@@ -106,7 +101,6 @@ public class TaskHelper {
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onError "+JSON.toJSONString(baseMessage));
                     }
                 });
     }
@@ -228,13 +222,11 @@ public class TaskHelper {
                                             .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
                                                 @Override
                                                 public void onNext(BaseMessage baseMessage) {
-                                                    LogUtil.println("baseMessage onNext "+JSON.toJSONString(baseMessage));
                                                     refreshTask();
                                                 }
 
                                                 @Override
                                                 public void onError(BaseMessage baseMessage) {
-                                                    LogUtil.println("baseMessage onError "+JSON.toJSONString(baseMessage));
                                                     G.showToast(baseMessage);
                                                 }
                                             });

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

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.kfzs.appstore.utils.string.HexUtils;
 import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.util.LogUtil;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -22,9 +23,10 @@ public class BaseMessageConverter implements Converter<ResponseBody, BaseMessage
 
     @Override
     public BaseMessage convert(ResponseBody value) throws IOException {
-        String json = decrypt(value.string());
-//        String json = value.string();
+        String string = value.string();
+        String json = decrypt(string);
         BaseMessage baseMessage = JSONObject.parseObject(json, BaseMessage.class);
+        LogUtil.println("sheepApi", "解密", string, baseMessage);
         return baseMessage;
     }
 

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

@@ -36,6 +36,9 @@ public class TaskEty implements Serializable, IDownload {
     private String desc;// 任务详情介绍
     private String ext;// 对应的信用卡配置的id
     private List<TaskChild> child;
+    private int is_reservation;//是否预约任务 0不是 1是
+    private boolean can_download;//是否可以下载
+    private int appointment_time;//预约时间
 
     /**
      * desc 另外的可能情况
@@ -256,6 +259,43 @@ public class TaskEty implements Serializable, IDownload {
         this.third_task_id = third_task_id;
     }
 
+    public int getIs_reservation() {
+        return is_reservation;
+    }
+
+    public void setIs_reservation(int is_reservation) {
+        this.is_reservation = is_reservation;
+    }
+
+    public int getAppointment_time() {
+        return appointment_time;
+    }
+
+    public void setAppointment_time(int appointment_time) {
+        this.appointment_time = appointment_time;
+    }
+
+    public boolean isCan_download() {
+        return can_download;
+    }
+
+    public void setCan_download(boolean can_download) {
+        this.can_download = can_download;
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     /**
      * 是否是应用自动审核完成的任务
      * @return
@@ -312,6 +352,10 @@ public class TaskEty implements Serializable, IDownload {
         }
     }
 
+    /**
+     * 是否是老任务--任务详情中显示不一样
+     * @return
+     */
     public boolean isOldTask(){
         if(task_type == 1000){
             if(!ListUtil.isEmpty(child)){
@@ -324,7 +368,33 @@ public class TaskEty implements Serializable, IDownload {
         return false;
     }
 
+    /**
+     * 是否是游戏任务
+     * @return
+     */
     public boolean isGameTask() {
         return task_type == 1002 || task_type == 1003;
     }
+
+
+
+
+
+    /**
+     * 是否是游戏任务中的预约任务
+     * @return
+     */
+    public boolean isGameReservation() {
+        return is_reservation == 1;//是否预约任务 0不是 1是
+    }
+    /**
+     * 是否游戏任务中的预约任务还不可以下载
+     * @return
+     */
+    public boolean isGameReservationCantDownload() {
+        return isGameTask() && isGameReservation() && !can_download;
+    }
+
+
+
 }

app/src/main/java/com/sheep/gamegroup/model/util/AddPuplicParameIntercept.java

@@ -49,6 +49,7 @@ public class AddPuplicParameIntercept implements Interceptor {
                 .newBuilder();
         String method = oldRequest.method();
         RequestBody body = oldRequest.body();
+        LogUtil.println("sheepApi", "request", oldRequest);
         if (BuildConfig.XXTEA_ENCRYPT && (method.equals("POST") || method.equals("PUT"))) {
             RequestBody requestBody = oldRequest.body();
             if (requestBody instanceof FormBody) {
@@ -62,7 +63,7 @@ public class AddPuplicParameIntercept implements Interceptor {
                 }
                 String oldParamsJson = buffer.readUtf8();
                 String newJsonParams = BaseMessageConverter.encrypt(oldParamsJson);
-                LogUtil.println("加密", oldRequest, oldParamsJson, newJsonParams);
+                LogUtil.println("sheepApi", "加密", oldRequest, oldParamsJson, newJsonParams);
                 if(!TextUtils.isEmpty(newJsonParams))
                     body = RequestBody.create(requestBody.contentType(), newJsonParams);
             }

app/src/main/java/com/sheep/gamegroup/model/util/AutoTaskListUtil.java

@@ -77,14 +77,11 @@ public class AutoTaskListUtil {
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onError "+ JSON.toJSONString(baseMessage));
                         loadding = false;
                     }
 
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onError "+JSON.toJSONString(baseMessage));
-
                         List<TaskAcceptedEty> list = baseMessage.getDatas(TaskAcceptedEty.class);
                         loadList(list);
                         loadding = false;

app/src/main/java/com/sheep/gamegroup/model/util/SheepSubscriber.java

@@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.sheep.gamegroup.model.api.BaseMessageConverter;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.NetUtil;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.jiuyan.samllsheep.SheepApp;
@@ -81,6 +82,7 @@ public abstract class SheepSubscriber<T> extends Subscriber<T> {
 
                 if(baseMessage.getCode() == 0)
                     baseMessage.setCode(throwable.code);
+                LogUtil.println("sheepApi", "onError", e.getMessage(), throwable.message, baseMessage);
                 onError(baseMessage);
             }else {
                 BaseMessage baseMessage = new BaseMessage();

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

@@ -27,11 +27,13 @@ import com.kfzs.duanduan.event.EventTypes;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.alipay.PayResult;
 import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.DialogConfig;
 import com.sheep.gamegroup.model.entity.HomeListEntity;
 import com.sheep.gamegroup.model.entity.RequestParameEty;
 import com.sheep.gamegroup.model.entity.TaskChild;
 import com.sheep.gamegroup.model.entity.TaskDescEntity;
 import com.sheep.gamegroup.model.entity.TaskEty;
+import com.sheep.gamegroup.model.entity.TaskReleaseEty;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.entity.WithdrawalEty;
 import com.sheep.gamegroup.model.util.AutoTaskListUtil;
@@ -61,6 +63,7 @@ import java.net.URL;
 import java.security.MessageDigest;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
@@ -1038,4 +1041,35 @@ public class CommonUtil {
         }
         return false;
     }
+
+
+    //对---游戏任务中的预约任务----进行---预约操作
+    public void reservationGameTask(final Context context, final TaskReleaseEty taskReleaseEty, final Action1<Integer> action1) {
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("device_id", DeviceUtil.getDeviceId(context));
+        jsonObject.put("release_task_id", taskReleaseEty.getId());
+        SheepApp.getInstance().getNetComponent().getApiService().acceptedTask(jsonObject)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        if(baseMessage.getCode() == 200) {
+                            if(action1 != null)
+                                action1.call(1);
+                            ViewUtil.showMsgDialog(context, new DialogConfig().setTitle("预约成功")
+                                    .setMsg(String.format(Locale.CHINA, "恭喜您获得%s元绵羊币\n注意%s准时开放下载", taskReleaseEty.getTask().getBonus(),
+                                            TimeUtil.TimeStamp2Date(taskReleaseEty.getTask().getAppointment_time(), "yyyy-MM-dd\u0020HH:mm")))
+                                    .setBtnLeftText("收入钱包"));
+                        } else {
+                            G.showToast(baseMessage);
+                        }
+                    }
+
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        G.showToast(baseMessage);
+                    }
+                });
+    }
 }

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

@@ -7,6 +7,14 @@ import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.bumptech.glide.request.RequestOptions;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
+import com.zhy.http.okhttp.OkHttpUtils;
+import com.zhy.http.okhttp.callback.FileCallBack;
+
+import java.io.File;
+
+import okhttp3.Call;
+import rx.functions.Action1;
 
 /**
  * Created by realicing on 2018/3/26.
@@ -15,45 +23,78 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 
 public class GlideImageLoader {
 
-    public static void setImage(ImageView imageView, String url){
+    public static void setImage(ImageView imageView, String url) {
         Glide.with(SheepApp.getInstance())
                 .load(url)
                 .into(imageView);
     }
-    public static void centerImage(ImageView imageView, String url, int id){
+
+    public static void centerImage(ImageView imageView, String url, int id) {
         Glide.with(SheepApp.getInstance())
                 .load(url)
                 .apply(new RequestOptions().centerCrop().placeholder(id))
                 .into(imageView);
     }
-    public static void centerImage(ImageView imageView, String path){
+
+    public static void centerImage(ImageView imageView, String path) {
         Glide.with(SheepApp.getInstance())
                 .load(path)
                 .apply(new RequestOptions().centerCrop().placeholder(R.drawable.loading_01))
                 .into(imageView);
     }
-    public static void circleImage(ImageView imageView, String url, int id){
+
+    public static void circleImage(ImageView imageView, String url, int id) {
         Glide.with(SheepApp.getInstance())
                 .load(url)
                 .apply(new RequestOptions().circleCrop().placeholder(id))
                 .into(imageView);
     }
-    public static void circleImage(ImageView imageView, String url){
+
+    public static void circleImage(ImageView imageView, String url) {
         Glide.with(SheepApp.getInstance())
                 .load(url)
                 .apply(new RequestOptions().circleCrop().placeholder(R.drawable.loading_01))
                 .into(imageView);
     }
-    public static void roundedCornersImage(ImageView imageView, String url, int radius, int id){
+
+    public static void roundedCornersImage(ImageView imageView, String url, int radius, int id) {
         Glide.with(SheepApp.getInstance())
                 .load(url)
                 .apply(new RequestOptions().transform(new RoundedCorners(radius)).placeholder(id))
                 .into(imageView);
     }
-    public static void roundedCornersImage(ImageView imageView, String url, int radius){
+
+    public static void roundedCornersImage(ImageView imageView, String url, int radius) {
         Glide.with(SheepApp.getInstance())
                 .load(url)
                 .apply(new RequestOptions().transform(new RoundedCorners(radius)).placeholder(R.drawable.loading_01))
                 .into(imageView);
     }
+
+    public static void downLoadImage(String name, String link, final Action1<File> action1) {
+        String fileName = name + ".png";
+        final File file = new File(ClassFileHelper.DIR, fileName);
+        if(file.exists()){
+            if(action1 != null){
+                action1.call(file);
+            }
+            return;
+        }
+        OkHttpUtils.get().url(link).build().execute(new FileCallBack(ClassFileHelper.DIR, fileName) {
+            @Override
+            public void onError(Call call, Exception e, int id) {
+                if(action1 != null){
+                    action1.call(null);
+                }
+            }
+
+            @Override
+            public void onResponse(File response, int id) {
+                if(response.exists())
+                    if(action1 != null){
+                        action1.call(response);
+                    }
+            }
+        });
+    }
 }

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

@@ -15,6 +15,9 @@ import android.view.View;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.bumptech.glide.request.RequestOptions;
 import com.kfzs.duanduan.ActMain;
 import com.kfzs.duanduan.bean.KFIntentKeys;
 import com.sheep.gamegroup.absBase.BaseActivity;
@@ -243,6 +246,15 @@ public class Jump2View {
                     CommonUtil.getInstance().updateUserInfo(new Action1<UserEntity>() {
                         @Override
                         public void call(UserEntity userEntity) {
+                            if(userEntity != null && !TextUtils.isEmpty(userEntity.getShare_link())) {
+//                                GlideImageLoader.downLoadImage(userEntity.getShare_link().hashCode(), AppUtil.getQRLink(userEntity.getShare_link(), 800), null);
+//                                //PersionInfoAct.java与AskGetMoneyAct.java中分享二维码时的图片预下载
+                                Glide.with(activity)
+                                        .load(AppUtil.getQRLink(userEntity.getShare_link(), 800))
+                                        .apply(new RequestOptions().diskCacheStrategy(DiskCacheStrategy.RESOURCE))
+                                        .preload(800, 800);
+                            }
+
                             if(userEntity != null && userEntity.canBindMobile() && !hasShowBindPhone(userEntity)){//老用户没有绑定手机号，且没有展示过绑定手机号界面
                                 Jump2View.getInstance().goBindPhone(activity, 1);
                                 return;
@@ -380,8 +392,6 @@ public class Jump2View {
                         if(context instanceof BaseActivity){
                             ((BaseActivity) context).hideProgress();
                         }
-                        if (BuildConfig.DEBUG)
-                            System.out.println("baseMessage onNext " + JSON.toJSONString(baseMessage));
                         Boolean wechatIsOpen;
                         if (baseMessage.getData() instanceof Boolean)
                             wechatIsOpen = (Boolean) baseMessage.getData();
@@ -399,8 +409,6 @@ public class Jump2View {
                         if(context instanceof BaseActivity){
                             ((BaseActivity) context).hideProgress();
                         }
-                        if (BuildConfig.DEBUG)
-                            System.out.println("baseMessage onError " + JSON.toJSONString(baseMessage));
                         G.showToast(R.string.coming_soon);
                     }
                 });
@@ -423,8 +431,6 @@ public class Jump2View {
                         if(context instanceof BaseActivity){
                             ((BaseActivity) context).hideProgress();
                         }
-                        if(BuildConfig.DEBUG)
-                            System.out.println("baseMessage onNext "+JSON.toJSONString(baseMessage));
                         Jump2View.getInstance().goWeb(context, baseMessage.getData().toString(), "微信二维码辅助好友注册任务");
                     }
 
@@ -433,8 +439,6 @@ public class Jump2View {
                         if(context instanceof BaseActivity){
                             ((BaseActivity) context).hideProgress();
                         }
-                        if(BuildConfig.DEBUG)
-                            System.out.println("baseMessage onError "+JSON.toJSONString(baseMessage));
                         G.showToast(baseMessage);
                     }
                 });
@@ -550,6 +554,7 @@ public class Jump2View {
             intent.putExtra("is_from_task_list", true);
             activity.startActivityForResult(intent, ViewUtil.REQUEST_CODE_TASK_LIST);
     }
+
     public synchronized void goTaskDetailView(Context context, Object o, Object b){
         Intent intent = new Intent(context, TaskDetailAct.class);
         if(o instanceof Integer){
@@ -771,16 +776,12 @@ public class Jump2View {
                         }
 
 
-                        if(BuildConfig.DEBUG)
-                            System.out.println("baseMessage onNext "+JSON.toJSONString(baseMessage));
                         if(action1 != null)
                             action1.call(null);
                     }
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        if(BuildConfig.DEBUG)
-                            System.out.println("baseMessage onError "+JSON.toJSONString(baseMessage));
                         if(action1 != null)
                             action1.call(baseMessage.getErrorMsg());
                     }
@@ -980,7 +981,6 @@ public class Jump2View {
                 .subscribe(new SheepSubscriber<BaseMessage>(activity) {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onNext "+ JSON.toJSONString(baseMessage));
                         List<Agreement> agreementList = baseMessage.getDatas(Agreement.class);
                         if(agreementList.isEmpty()){
                             if(action1 != null)
@@ -995,7 +995,6 @@ public class Jump2View {
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onError "+JSON.toJSONString(baseMessage));
                         if(action1 != null){
                             String msg = baseMessage.getCode() == 404 ? "404" : baseMessage.getErrorMsg();
                             action1.call(msg);
@@ -1074,7 +1073,6 @@ public class Jump2View {
                         @Override
                         public void onError(BaseMessage baseMessage) {
                             newbie_task.setVisibility(View.GONE);
-                            System.out.println("baseMessage onError " + JSON.toJSONString(baseMessage));
                         }
                     });
         }
@@ -1174,14 +1172,12 @@ public class Jump2View {
                 .subscribe(new SheepSubscriber<BaseMessage>(activity) {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onNext " + JSON.toJSONString(baseMessage));
                         Advertising advertising = baseMessage.getData(Advertising.class);
                         ViewUtil.showHalfScreenAd(activity, advertising, container);
                     }
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onError " + JSON.toJSONString(baseMessage));
                         tryShowReservation(activity);
                     }
                 });
@@ -1193,7 +1189,6 @@ public class Jump2View {
                 .subscribe(new SheepSubscriber<BaseMessage>(activity) {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onNext " + JSON.toJSONString(baseMessage));
                         if(baseMessage.getData() instanceof Integer){
                             if((int)baseMessage.getData() > 0){//该提示在弹窗广告后显示，且必须有可下载的游戏，弹出弹窗
                                 ViewUtil.showMsgDialog(activity, new DialogConfig().setTitle("预约下载提示")
@@ -1210,7 +1205,6 @@ public class Jump2View {
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onError " + JSON.toJSONString(baseMessage));
                     }
                 });
     }
@@ -1222,7 +1216,6 @@ public class Jump2View {
                 .subscribe(new SheepSubscriber<BaseMessage>(activity) {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onNext "+JSON.toJSONString(baseMessage));
                         VersionInfo newVersionInfo = baseMessage.getData(VersionInfo.class);
                         if(newVersionInfo != null && !TextUtils.isEmpty(newVersionInfo.getVersion_content())) {
                             goLoadH5(activity, "新功能介绍", newVersionInfo.getVersion_content());
@@ -1232,7 +1225,6 @@ public class Jump2View {
                     }
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onError "+JSON.toJSONString(baseMessage));
                         G.showToast(baseMessage);
                     }
                 });
@@ -1251,7 +1243,6 @@ public class Jump2View {
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onNext "+ JSON.toJSONString(baseMessage));
                         CheckUserLabel checkLabel = baseMessage.getData(CheckUserLabel.class);
                         if(
 //                                BuildConfig.DEBUG ||
@@ -1264,7 +1255,6 @@ public class Jump2View {
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onError "+JSON.toJSONString(baseMessage));
                         if(action1 != null) {
                             action1.call(baseMessage);
                         }
@@ -1322,9 +1312,6 @@ public class Jump2View {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
                         final XianWanEntity xianWanEntity = baseMessage.getData(XianWanEntity.class);
-//                        Jump2View.getInstance().goXianwanWeb(context, xianWanEntity, null);
-                        if(BuildConfig.DEBUG)
-                            System.out.println("baseMessage onNext "+JSON.toJSONString(baseMessage));
                         if(action1 != null)
                             action1.call(null);
 

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

@@ -396,7 +396,6 @@ public class SysAppUtil {
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onNext " + JSON.toJSONString(baseMessage));
                         final Version version = baseMessage.getData(Version.class);
                         if(version == null){
                             if(ignoreMd5 == null)
@@ -511,7 +510,6 @@ public class SysAppUtil {
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onError " + JSON.toJSONString(baseMessage));
                         if(ignoreMd5 == null)
                             G.showToast(baseMessage);
                         if(action1 != null)

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

@@ -249,7 +249,6 @@ public class TestUtil {
                     .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
                         @Override
                         public void onNext(BaseMessage baseMessage) {
-                            LogUtil.println("baseMessage onNext " + JSON.toJSONString(baseMessage));
                             UserEntity userEntity = baseMessage.getData(UserEntity.class);
                             LoginEntity loginEntity = new LoginEntity();
                             loginEntity.setToken(token);
@@ -259,7 +258,6 @@ public class TestUtil {
 
                         @Override
                         public void onError(BaseMessage baseMessage) {
-                            LogUtil.println("baseMessage onError " + JSON.toJSONString(baseMessage));
                             G.showToast(baseMessage);
                         }
                     });

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

@@ -94,6 +94,11 @@ public class UMConfigUtils {
         USER_FIND_APP_ORDER           ,//点击个人中心中的游戏预约 5063
         MY_MONEY_TAB           ,//点击我的资产中的tab 5064 需要传点击的tab对应的名字：充值记录、提现记录、收支明细，如:{"tab_name": "充值记录"}或{"tab_name": "提现记录"}或{"tab_name": "收支明细"}
         NEWBIE_TASK           ,//点击新手任务图标 5065
+        AD_SPLASH           ,//点击开屏广告 5066 需要传点击的广告对应的id，如:{"ad_id": 1}
+        AD_TOAST           ,//点击弹窗广告 5067 需要传点击的广告对应的id，如:{"ad_id": 1}
+        LOGIN_PHONE         ,//点击登录界面中的手机号登录 5068
+        LOGIN_QQ        ,//点击登录界面中的QQ登录 5069
+        LOGIN_WX        ,//点击登录界面中的微信登录 5070
         ;
         private String key;
         Event(String key){
@@ -159,12 +164,10 @@ public class UMConfigUtils {
                             .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
                                 @Override
                                 public void onNext(BaseMessage baseMessage) {
-                                    LogUtil.println("baseMessage onNext "+JSON.toJSONString(baseMessage));
                                 }
 
                                 @Override
                                 public void onError(BaseMessage baseMessage) {
-                                    LogUtil.println("baseMessage onError "+JSON.toJSONString(baseMessage));
                                 }
                             });
         }

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

@@ -83,6 +83,13 @@ public class ViewUtil {
                 .load(AppUtil.getQRLink(link, 800))
                 .apply(new RequestOptions().override(800, 800))
                 .into(iv_qr);
+//        GlideImageLoader.downLoadImage(link.hashCode() + "", AppUtil.getQRLink(link, 800), new Action1<File>() {
+//            @Override
+//            public void call(File file) {
+//                if(file != null)
+//                    Glide.with(SheepApp.getInstance()).load(file).into(iv_qr);
+//            }
+//        });
         Glide.with(activity)
                 .load(R.drawable.icon)
                 .apply(new RequestOptions().override(G.WIDTH / 8))

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

@@ -207,7 +207,6 @@ public class ActFindGame extends BaseActivity {
                 .subscribe(new SheepSubscriber<BaseMessage>(this) {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onNext " + JSON.toJSONString(baseMessage));
                         FindApp findApp = baseMessage.getData(FindApp.class);
                         if (findApp != null) {
                             loadData(findApp);
@@ -221,7 +220,6 @@ public class ActFindGame extends BaseActivity {
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onNext " + JSON.toJSONString(baseMessage));
                         G.showToast(baseMessage);
                         resetData();
                         hideProgress();
@@ -246,7 +244,6 @@ public class ActFindGame extends BaseActivity {
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onNext " + JSON.toJSONString(baseMessage));
                         List<FindAppScore> findAppScoreList = baseMessage.getDataList(FindAppScore.class);
                         if (ListUtil.isEmpty(findAppScoreList))
                             resetAppScoreNum();
@@ -256,7 +253,6 @@ public class ActFindGame extends BaseActivity {
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onError " + JSON.toJSONString(baseMessage));
                         G.showToast(baseMessage);
                     }
                 });
@@ -269,7 +265,6 @@ public class ActFindGame extends BaseActivity {
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onNext " + JSON.toJSONString(baseMessage));
                         MyFindAppCore myFindAppCore = baseMessage.getData(MyFindAppCore.class);
                         if (myFindAppCore == null)
                             resetMyAppScore();
@@ -279,7 +274,6 @@ public class ActFindGame extends BaseActivity {
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onError " + JSON.toJSONString(baseMessage));
                     }
                 });
     }
@@ -455,7 +449,6 @@ public class ActFindGame extends BaseActivity {
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onNext " + JSON.toJSONString(baseMessage));
                         find_game_user_commit_tv.setText("重新评分");
                         G.showToast(baseMessage);
                         //更新评分与我的评分
@@ -465,7 +458,6 @@ public class ActFindGame extends BaseActivity {
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onError " + JSON.toJSONString(baseMessage));
                         G.showToast(baseMessage);
                     }
                 });

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

@@ -218,7 +218,6 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
                         .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
                             @Override
                             public void onNext(BaseMessage baseMessage) {
-                                LogUtil.println("baseMessage onNext "+ JSON.toJSONString(baseMessage));
                                 FindItem data = baseMessage.getData(FindItem.class);
                                 if(data != null && !TextUtils.equals(JSON.toJSONString(findItem), JSON.toJSONString(data))){
                                     taskHelper.clear();
@@ -240,7 +239,6 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
 
                             @Override
                             public void onError(BaseMessage baseMessage) {
-                                LogUtil.println("baseMessage onError "+JSON.toJSONString(baseMessage));
                                 taskHelper.clear();
                                 notifyDataSetChanged();
                             }
@@ -255,14 +253,12 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
                         .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
                             @Override
                             public void onNext(BaseMessage baseMessage) {
-                                LogUtil.println("baseMessage onNext "+JSON.toJSONString(baseMessage));
                                 findApp = baseMessage.getData(FindApp.class);
                                 notifyDataSetChanged();
                             }
 
                             @Override
                             public void onError(BaseMessage baseMessage) {
-                                LogUtil.println("baseMessage onError "+JSON.toJSONString(baseMessage));
                                 G.showToast(baseMessage);
                                 refresh.setRefreshing(false);
                             }

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

@@ -157,8 +157,6 @@ public class ActMyMoney extends BaseActivity {
                         .subscribe(new SheepSubscriber<BaseMessage>(this) {
                             @Override
                             public void onNext(BaseMessage baseMessage) {
-                                if(BuildConfig.DEBUG)
-                                    System.out.println("baseMessage onNext "+ JSON.toJSONString(baseMessage));
                                 UserAssets userAssets = baseMessage.getData(UserAssets.class);
                                 loadData(userAssets);
                                 hideProgress();
@@ -166,8 +164,6 @@ public class ActMyMoney extends BaseActivity {
 
                             @Override
                             public void onError(BaseMessage baseMessage) {
-                                if(BuildConfig.DEBUG)
-                                    System.out.println("baseMessage onError "+JSON.toJSONString(baseMessage));
                                 G.showToast(baseMessage);
                                 resetData();
                                 hideProgress();

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

@@ -103,7 +103,6 @@ public class ActNewAboutUs extends BaseActivity {
                         .subscribe(new SheepSubscriber<BaseMessage>(this) {
                             @Override
                             public void onNext(BaseMessage baseMessage) {
-                                LogUtil.println("baseMessage onNext "+JSON.toJSONString(baseMessage));
                                 NewAboutUs newAboutUs = baseMessage.getData(NewAboutUs.class);
                                 if(newAboutUs != null){
                                     loadData(newAboutUs);
@@ -115,7 +114,6 @@ public class ActNewAboutUs extends BaseActivity {
 
                             @Override
                             public void onError(BaseMessage baseMessage) {
-                                LogUtil.println("baseMessage onNext "+JSON.toJSONString(baseMessage));
                                 G.showToast(baseMessage);
                                 resetData();
                                 hideProgress();

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

@@ -81,8 +81,6 @@ public class ActNewbieTaskList extends BaseActivity {
                 .subscribe(new SheepSubscriber<BaseMessage>(activity) {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        if(BuildConfig.DEBUG)
-                            System.out.println("baseMessage onNext "+ JSON.toJSONString(baseMessage));
                         swipe_container.setRefreshing(false);
                         newbieTaskList = baseMessage.getDatas(NewbieTask.class);
                         etyList.addAll(newbieTaskList);
@@ -91,8 +89,6 @@ public class ActNewbieTaskList extends BaseActivity {
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        if(BuildConfig.DEBUG)
-                            System.out.println("baseMessage onError "+JSON.toJSONString(baseMessage));
                         swipe_container.setRefreshing(false);
                         etyList.addAll(newbieTaskList);
                         adp.notifyDataSetChanged();

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

@@ -179,7 +179,6 @@ public class ActReservation extends BaseActivity {
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onNext "+JSON.toJSONString(baseMessage));
                         find_information_game_bt2.setEnabled(true);
                         find_information_game_bt2.setText("取消预约");
                         item.setCancel(false);
@@ -188,7 +187,6 @@ public class ActReservation extends BaseActivity {
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onError "+JSON.toJSONString(baseMessage));
                         G.showToast("预约失败");
                         find_information_game_bt2.setEnabled(true);
                     }
@@ -202,7 +200,6 @@ public class ActReservation extends BaseActivity {
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onNext "+JSON.toJSONString(baseMessage));
                         find_information_game_bt2.setEnabled(true);
                         find_information_game_bt2.setText("立即预约");
                         item.setCancel(true);
@@ -211,7 +208,6 @@ public class ActReservation extends BaseActivity {
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onError "+JSON.toJSONString(baseMessage));
                         G.showToast("取消预约失败");
                         find_information_game_bt2.setEnabled(true);
                     }
@@ -245,7 +241,6 @@ public class ActReservation extends BaseActivity {
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onNext " + JSON.toJSONString(baseMessage));
                         List<FindAppReservation> newList = baseMessage.getDataList(FindAppReservation.class);
                         list.clear();
                         ListUtil.addAll(list, newList);
@@ -256,7 +251,6 @@ public class ActReservation extends BaseActivity {
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onError " + JSON.toJSONString(baseMessage));
                         list.clear();
                         notifyDataSetChanged();
                     }

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

@@ -104,15 +104,11 @@ public class ActUnderstandSheep extends BaseActivity {
                                 .subscribe(new SheepSubscriber<BaseMessage>(activity) {
                                     @Override
                                     public void onNext(BaseMessage baseMessage) {
-                                        if(BuildConfig.DEBUG)
-                                            System.out.println("baseMessage onNext "+ JSON.toJSONString(baseMessage));
                                         finish();
                                     }
 
                                     @Override
                                     public void onError(BaseMessage baseMessage) {
-                                        if(BuildConfig.DEBUG)
-                                            System.out.println("baseMessage onError "+JSON.toJSONString(baseMessage));
                                         G.showToast(baseMessage);
                                     }
                                 });

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

@@ -70,7 +70,6 @@ public class ActUserLabelList extends BaseActivity {
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onNext " + JSON.toJSONString(baseMessage));
                         List<UserLabelList> checkLabelList = baseMessage.getDatas(UserLabelList.class);
                         if (!ListUtil.isEmpty(checkLabelList)) {
                             loadData(checkLabelList);
@@ -79,7 +78,6 @@ public class ActUserLabelList extends BaseActivity {
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onError " + JSON.toJSONString(baseMessage));
                         G.showToast(baseMessage);
                     }
                 });
@@ -161,14 +159,12 @@ public class ActUserLabelList extends BaseActivity {
                         .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
                             @Override
                             public void onNext(BaseMessage baseMessage) {
-                                LogUtil.println("baseMessage onNext "+JSON.toJSONString(baseMessage));
                                 Jump2View.getInstance().goHomePageView(ActUserLabelList.this, null);
                                 finish();
                             }
 
                             @Override
                             public void onError(BaseMessage baseMessage) {
-                                LogUtil.println("baseMessage onError "+JSON.toJSONString(baseMessage));
                                 G.showToast(baseMessage);
                                 if(BuildConfig.DEBUG){
                                     Jump2View.getInstance().goHomePageView(ActUserLabelList.this, null);

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

@@ -465,19 +465,12 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
                     .subscribe(new SheepSubscriber<BaseMessage>(activity) {
                         @Override
                         public void onNext(BaseMessage baseMessage) {
-
-                            //暂停下载---这么改就不能暂停了
-//                            CommonUtil.getInstance().stopDownloadTask(activity, task_accepted_entity.getRelease_task().getTask().getDownload_link());
-                            if(BuildConfig.DEBUG)
-                                System.out.println("baseMessage onNext "+ JSON.toJSONString(baseMessage));
                             acceptedTask();
                             CommonUtil.getInstance().setTAskEnty(null);
                         }
 
                         @Override
                         public void onError(BaseMessage baseMessage) {
-                            if(BuildConfig.DEBUG)
-                                System.out.println("baseMessage onError "+JSON.toJSONString(baseMessage));
                             G.showToast(baseMessage);
                         }
                     });

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

@@ -46,6 +46,8 @@ import pub.devrel.easypermissions.EasyPermissions;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
 
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.AD_SPLASH;
+
 /**
  * Created by ljy on 2018/3/9.
  */
@@ -162,7 +164,6 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
                 .subscribe(new SheepSubscriber<BaseMessage>(activity) {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onNext " + JSON.toJSONString(baseMessage));
                         advertising = baseMessage.getData(Advertising.class);
                         isLoaddingData = false;
                         if(advertising == null || TextUtils.isEmpty(advertising.getDisplay_src())){
@@ -178,7 +179,6 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onError " + JSON.toJSONString(baseMessage));
                         isLoaddingData = false;
                         sendHandlerMessages();
                     }
@@ -319,6 +319,7 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
             case R.id.splash_click_view:
                 if(advertising != null) {
                     goAdLink(activity, advertising);
+                    AD_SPLASH.onEvent("ad_id", advertising.getId());
                 }else {
                     gotoNext();
                 }

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

@@ -273,6 +273,10 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     setBottomState();
                     break;
             }
+        } else if(taskEty.isGameReservationCantDownload()){//游戏任务中还不可以下载的预约任务
+            btnUpImag.setText("预约下载");
+            btnTaskItem.setVisibility(View.GONE);
+            btnUpImag.setVisibility(View.VISIBLE);
         } else {
             type = -1;
             btnTaskItem.setText(CommonUtil.GET_TASK);
@@ -333,6 +337,12 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                         break;
                     }
             }
+            if(taskEty.isGameReservationCantDownload()) {//游戏任务中还不可以下载的预约任务
+                btnUpImag.setText("即将开放");
+                btnUpImag.setEnabled(false);
+                btnUpImag.setVisibility(View.VISIBLE);
+                btnTaskItem.setVisibility(View.GONE);
+            }
         }
     }
     //设置底部按钮状态
@@ -572,7 +582,11 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                             return;
                         }
                     }else if(taskEty.getTask_type() == 1002 ||taskEty.getTask_type() == 1003){
-                        accepteReceiveAward();
+                        if(taskEty.isGameReservationCantDownload()){
+                            CommonUtil.getInstance().reservationGameTask(activity, taskReleaseEty, null);
+                        } else {
+                            accepteReceiveAward();
+                        }
                     }else if(taskEty.getInspect_type() == 3) {//应用自动审核任务
                         try {
                             checkAndCommitTask();
@@ -807,7 +821,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         showProgress(true);
         JSONObject object = new JSONObject();
         object.put("device_id", DeviceUtil.getDeviceId(activity));
-        object.put("release_task_id", Integer.valueOf(taskReleaseEty.getId() + ""));
+        object.put("release_task_id", taskReleaseEty.getId());
         SheepApp.getInstance()
                 .getNetComponent()
                 .getApiService()

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

@@ -179,8 +179,6 @@ public class TaskDetailAddQQAct extends AbsChooseImageActivity {
                     .subscribe(new SheepSubscriber<BaseMessage>(getApplicationContext()) {
                         @Override
                         public void onNext(BaseMessage baseMessage) {
-                            if (BuildConfig.DEBUG)
-                                System.out.println("baseMessage onNext " + JSON.toJSONString(baseMessage));
                             setLoaddingText("完成");
                             onGetNetImageUrl(url);
                             G.showToast("提交成功，等待审核!");
@@ -190,8 +188,6 @@ public class TaskDetailAddQQAct extends AbsChooseImageActivity {
 
                         @Override
                         public void onError(BaseMessage baseMessage) {
-                            if (BuildConfig.DEBUG)
-                                System.out.println("baseMessage onError " + JSON.toJSONString(baseMessage));
                             updateError(baseMessage.getErrorMsg());
                         }
                     });
@@ -203,8 +199,6 @@ public class TaskDetailAddQQAct extends AbsChooseImageActivity {
                     .subscribe(new SheepSubscriber<BaseMessage>(getApplicationContext()) {
                         @Override
                         public void onNext(BaseMessage baseMessage) {
-                            if (BuildConfig.DEBUG)
-                                System.out.println("baseMessage onNext " + JSON.toJSONString(baseMessage));
                             setLoaddingText("完成");
                             onGetNetImageUrl(url);
                             G.showToast("提交成功，等待审核!");
@@ -214,8 +208,6 @@ public class TaskDetailAddQQAct extends AbsChooseImageActivity {
 
                         @Override
                         public void onError(BaseMessage baseMessage) {
-                            if (BuildConfig.DEBUG)
-                                System.out.println("baseMessage onError " + JSON.toJSONString(baseMessage));
                             updateError(TextUtils.isEmpty(baseMessage.getMsg()) ? "服务器错误，请稍候再试" : baseMessage.getMsg());
                         }
                     });

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

@@ -205,8 +205,6 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
                 .subscribe(new SheepSubscriber<BaseMessage>(activity) {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        if (BuildConfig.DEBUG)
-                            System.out.println("baseMessage onNext " + JSON.toJSONString(baseMessage));
                         taskReleaseEty = baseMessage.getData(TaskReleaseEty.class);
                         if(taskReleaseEty == null){
                             baseMessage.setMsg("暂无数据");
@@ -221,8 +219,6 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        if (BuildConfig.DEBUG)
-                            System.out.println("baseMessage onError " + JSON.toJSONString(baseMessage));
                         hideProgress();
                         G.showToast(baseMessage.getMsg() + "");
                     }
@@ -277,8 +273,6 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
                 .subscribe(new SheepSubscriber<BaseMessage>(getApplicationContext()) {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        if (BuildConfig.DEBUG)
-                            System.out.println("baseMessage onNext " + JSON.toJSONString(baseMessage));
                         goWeb();
                     }
 
@@ -287,8 +281,6 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
                         if (baseMessage.getCode() == 1001) {//已经接受过该任务
                             onNext(baseMessage);
                         } else {
-                            if (BuildConfig.DEBUG)
-                                System.out.println("baseMessage onError " + JSON.toJSONString(baseMessage));
                             G.showToast(baseMessage);
                             hideProgress();
                         }

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

@@ -23,6 +23,8 @@ 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.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.DialogConfig;
 import com.sheep.gamegroup.model.entity.OrienteeringDetail;
 import com.sheep.gamegroup.model.entity.RecyleObj;
 import com.sheep.gamegroup.model.entity.RecyleType;
@@ -49,6 +51,7 @@ import org.greenrobot.eventbus.EventBus;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
@@ -344,21 +347,43 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
 
             @Override
             public void onBindViewHolder(RecyclerView.ViewHolder viewHolder, final int i) {
-                if(etyList.get(i) == null || etyList.get(i).getTask() == null){
+                final TaskReleaseEty taskReleaseEty = ListUtil.getIndex(etyList, i);
+                final TaskEty taskEty;
+                if (taskReleaseEty == null || (taskEty = taskReleaseEty.getTask()) == null) {
                     return;
                 }
-                    viewHolder.itemView.setTag(TAG_ID_TEMP, etyList.get(i).getId());
-                    TextView detail_task_tv = viewHolder.itemView.findViewById(R.id.detail_task_tv);
-                if(i == 0){
+                viewHolder.itemView.setTag(TAG_ID_TEMP, etyList.get(i).getId());
+                ((TextView) viewHolder.itemView.findViewById(R.id.item_anem_tv)).setText(taskReleaseEty.getName() + "");
+                ((TextView) viewHolder.itemView.findViewById(R.id.item_num_tv)).setText("剩余" + taskReleaseEty.getLast_num() + "份");
+                ((TextView) viewHolder.itemView.findViewById(R.id.item_money)).setText("+" + taskReleaseEty.getBonus() + "元");
+                Glide.with(context)
+                        .load(taskEty.getIcon() + "")
+                        .apply(new RequestOptions().placeholder(R.mipmap.x_ic_def_head))
+                        .into((ImageView) viewHolder.itemView.findViewById(R.id.item_icon_iv));
+
+                if (isBegin == 1 || type == 2) {//即将开始
+                    viewHolder.itemView.setEnabled(false);
+                    ((TextView) viewHolder.itemView.findViewById(R.id.item_date_tv)).setText(
+                            "开始时间:" + TimeUtil.getDate(TimeUtil.FORMAT_DD, Long.valueOf(taskReleaseEty.getOnline_time())) + "");
+                } else {
+                    if (!taskReleaseEty.getDeadline().equals("永久")) {
+                        ((TextView) viewHolder.itemView.findViewById(R.id.item_date_tv)).setText(
+                                "截止时间:" + TimeUtil.getDate(TimeUtil.FORMAT_DD, Long.valueOf(taskReleaseEty.getDeadline())) + "");
+                    } else {
+                        ((TextView) viewHolder.itemView.findViewById(R.id.item_date_tv)).setText(
+                                "截止时间:" + taskReleaseEty.getDeadline());
+                    }
+                }
+                if (i == 0) {
                     viewHolder.itemView.findViewById(R.id.item_title_tv).setVisibility(View.VISIBLE);
                     viewHolder.itemView.findViewById(R.id.item_title_iv).setVisibility(View.GONE);
                     String titleStr;
                     int resourceId = R.mipmap.task_hot_icon;
-                    if(isBegin == 1){
+                    if (isBegin == 1) {
 
                         titleStr = "即将开始";
-                    }else {
-                        switch (type){
+                    } else {
+                        switch (type) {
                             case 0:
                                 titleStr = "可接取";
                                 break;
@@ -379,121 +404,85 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                         }
                     }
 
-                    ((TextView)viewHolder.itemView.findViewById(R.id.item_title_tv)).setText(titleStr+"");
+                    ((TextView) viewHolder.itemView.findViewById(R.id.item_title_tv)).setText(titleStr + "");
 
-                }else{
+                } else {
                     viewHolder.itemView.findViewById(R.id.item_title_tv).setVisibility(View.GONE);
                     viewHolder.itemView.findViewById(R.id.item_title_iv).setVisibility(View.GONE);
                 }
-                if(i == getItemCount()-1){
+                if (i == getItemCount() - 1) {
                     viewHolder.itemView.findViewById(R.id.line_tv).setVisibility(View.GONE);
-                }else {
+                } else {
                     viewHolder.itemView.findViewById(R.id.line_tv).setVisibility(View.VISIBLE);
                 }
-                if("0".equals(etyList.get(i).getLast_num())){
+                TestUtil.setDebugDownLoad(context, viewHolder.itemView, taskEty);
+                viewHolder.itemView.findViewById(R.id.cancel_task_tv).setVisibility(View.GONE);
+                TextView detail_task_tv = viewHolder.itemView.findViewById(R.id.detail_task_tv);
+
+
+                if("0".equals(taskReleaseEty.getLast_num())){
                     detail_task_tv.setText("任务已抢光");
                     detail_task_tv.setBackground(context.getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
                     detail_task_tv.setEnabled(false);
                     viewHolder.itemView.setEnabled(false);
-                    if(!etyList.get(i).getDeadline().equals("永久")){
-                        ((TextView)viewHolder.itemView.findViewById(R.id.item_date_tv)).setText(
-                                "截止时间:" + TimeUtil.getDate(TimeUtil.FORMAT_DD, Long.valueOf(etyList.get(i).getDeadline()))+"");
-                    }else {
-                        ((TextView)viewHolder.itemView.findViewById(R.id.item_date_tv)).setText(
-                                "截止时间:" + etyList.get(i).getDeadline());
-                    }
                 }else {
                     if(isBegin == 1 || type == 2){//即将开始
                         detail_task_tv.setText("即将开始");
                         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_DD, Long.valueOf(etyList.get(i).getOnline_time()))+"");
-                    }else {
-
+                    } else if(taskEty.isGameReservationCantDownload()){//游戏任务中的预约任务，且不能下载情况下
+                        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);
+                    } else {
                         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);
-                        if(!etyList.get(i).getDeadline().equals("永久")){
-                            ((TextView)viewHolder.itemView.findViewById(R.id.item_date_tv)).setText(
-                                    "截止时间:" + TimeUtil.getDate(TimeUtil.FORMAT_DD, Long.valueOf(etyList.get(i).getDeadline()))+"");
-                        }else {
-                            ((TextView)viewHolder.itemView.findViewById(R.id.item_date_tv)).setText(
-                                    "截止时间:" + etyList.get(i).getDeadline());
-                        }
                     }
-
                 }
 
-                viewHolder.itemView.findViewById(R.id.cancel_task_tv).setVisibility(View.GONE);
-
-                //CommonUtil.getInstance().getCharSequence(context, etyList.get(i).getName(), "")
-                ((TextView)viewHolder.itemView.findViewById(R.id.item_anem_tv)).setText(etyList.get(i).getName()+"");
-                TextView task_type_tv = viewHolder.itemView.findViewById(R.id.task_type_tv);
-                //设置标签颜色task_type_tv
-                //Todo 2.6又不需要了
-//                if(!TextUtils.isEmpty(etyList.get(i).getChild_task_name())){
-//                    task_type_tv.setVisibility(View.VISIBLE);
-//                    task_type_tv.setText(etyList.get(i).getChild_task_name() + "");
-//                    CommonUtil.getInstance()
-//                            .setViewBackground(
-//                                    task_type_tv,
-//                                    etyList.get(i).getLabel_color()+"");
-//                }else {
-//                    task_type_tv.setVisibility(View.INVISIBLE);
-//                }
-
-
-                ((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() +"元");
 
                 detail_task_tv.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        if(ListUtil.getIndex(etyList, i) == null){
-                            G.showToast(R.string.loading_data);
-                            return;
-                        }
-                        TaskEty taskEty = etyList.get(i).getTask();
-                        if(taskEty == null){
-                            G.showToast(R.string.loading_data);
+                        if(taskEty.isGameReservationCantDownload()) {//游戏任务中的预约任务，且不能下载情况下
+                            CommonUtil.getInstance().reservationGameTask(context, taskReleaseEty, new Action1<Integer>(){
+                                @Override
+                                public void call(Integer type) {
+                                    switch (type){
+                                        case 1:
+                                            Jump2View.getInstance().goGameMakeMoney(context, 1);
+                                            break;
+                                    }
+                                }
+                            });
                             return;
                         }
                         taskEty.setRunTask(0);
-                        taskEty.setRelease_task_id(etyList.get(i).getId());
-                        taskEty.setName(etyList.get(i).getName());
-                        taskEty.setAcceptedTaskId(etyList.get(i).getAccepted_task_id());
+                        taskEty.setRelease_task_id(taskReleaseEty.getId());
+                        taskEty.setName(taskReleaseEty.getName());
+                        taskEty.setAcceptedTaskId(taskReleaseEty.getAccepted_task_id());
                         Jump2View.getInstance().goDialogActivityView(context, taskEty);
                     }
                 });
-                Glide.with(context)
-                        .load(etyList.get(i).getTask().getIcon()+"")
-                        .apply(new RequestOptions().placeholder(R.mipmap.x_ic_def_head))
-                        .into((ImageView) viewHolder.itemView.findViewById(R.id.item_icon_iv));
                 viewHolder.itemView.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        TaskReleaseEty item = ListUtil.getIndex(etyList, i);
-                        if(item == null){
-                            return;
-                        }
-                        UMConfigUtils.IdEvent.TASK.commit(item.getId());
-
-                        TaskEty taskEty = etyList.get(i).getTask();
+                        UMConfigUtils.IdEvent.TASK.commit(taskReleaseEty.getId());
                         taskEty.setRunTask(0);
-                        taskEty.setBonus(etyList.get(i).getBonus());
-                        taskEty.setRelease_task_id(etyList.get(i).getId());
-                        taskEty.setName(etyList.get(i).getName());
-                        if("0".equals(etyList.get(i).getLast_num())){
-                            Jump2View.getInstance().goTaskDetailView(context,  etyList.get(i).getId(), true);
+                        taskEty.setBonus(taskReleaseEty.getBonus());
+                        taskEty.setRelease_task_id(taskReleaseEty.getId());
+                        taskEty.setName(taskReleaseEty.getName());
+                        if("0".equals(taskReleaseEty.getLast_num())){
+                            Jump2View.getInstance().goTaskDetailView(context,  taskReleaseEty.getId(), true);
                             return;
                         }
-                        Jump2View.getInstance().goTaskDetailView(context,  etyList.get(i).getId());
+                        Jump2View.getInstance().goTaskDetailView(context,  taskReleaseEty.getId());
                     }
                 });
-                TestUtil.setDebugDownLoad(context, viewHolder.itemView, etyList.get(i).getTask());
 
             }
 

app/src/main/java/com/sheep/gamegroup/view/dialog/DialogAgreement.java

@@ -111,13 +111,11 @@ public class DialogAgreement {
                                 .subscribe(new SheepSubscriber<BaseMessage>(activity) {
                                     @Override
                                     public void onNext(BaseMessage baseMessage) {
-                                        LogUtil.println("baseMessage onNext "+ JSON.toJSONString(baseMessage));
                                         action1.call(null);
                                     }
 
                                     @Override
                                     public void onError(BaseMessage baseMessage) {
-                                        LogUtil.println("baseMessage onError "+JSON.toJSONString(baseMessage));
                                         action1.call(baseMessage.getErrorMsg());
                                     }
                                 });

app/src/main/java/com/sheep/gamegroup/view/dialog/DialogOrienteeringDetails.java

@@ -164,7 +164,6 @@ public class DialogOrienteeringDetails {
                         .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
                             @Override
                             public void onNext(BaseMessage baseMessage) {
-                                LogUtil.println("baseMessage onNext "+ JSON.toJSONString(baseMessage));
                                 List<OrienteeringDetail> newList = baseMessage.getDatas(OrienteeringDetail.class);
                                 ListUtil.addAll(list, newList);
                                 if(ListUtil.isEmpty(list)){
@@ -182,7 +181,6 @@ public class DialogOrienteeringDetails {
 
                             @Override
                             public void onError(BaseMessage baseMessage) {
-                                LogUtil.println("baseMessage onError "+JSON.toJSONString(baseMessage));
                                 G.showToast(baseMessage);
                                 noDatanotify();
                             }

app/src/main/java/com/sheep/gamegroup/view/dialog/DialogPayAccount.java

@@ -107,14 +107,12 @@ public class DialogPayAccount {
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onNext "+ JSON.toJSONString(baseMessage));
                         List<OrienteeringDetail> newList = baseMessage.getDatas(OrienteeringDetail.class);
 
                     }
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onError "+JSON.toJSONString(baseMessage));
                         G.showToast(baseMessage);
                     }
                 });

app/src/main/java/com/sheep/gamegroup/view/dialog/DialogPayGame.java

@@ -133,7 +133,6 @@ public class DialogPayGame {
                     public void onNext(BaseMessage baseMessage) {
                         ViewUtil.newInstance()
                                 .hideProgress(activity);
-                        LogUtil.println("baseMessage onNext "+ JSON.toJSONString(baseMessage));
                         try{
                             String balances = baseMessage.getData() +"";
                             balance = TextUtils.isEmpty(balances) ? "0" : balances;
@@ -151,7 +150,6 @@ public class DialogPayGame {
                     public void onError(BaseMessage baseMessage) {
                         ViewUtil.newInstance()
                                 .hideProgress(activity);
-                        LogUtil.println("baseMessage onError "+JSON.toJSONString(baseMessage));
                         G.showToast(baseMessage);
                     }
                 });

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtMyGame.java

@@ -132,7 +132,6 @@ public class FgtMyGame extends BaseFragment {
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onNext "+ JSON.toJSONString(baseMessage));
                         List<OrienteeringDetail> newList = baseMessage.getDatas(OrienteeringDetail.class);
                         if(newList != null && newList.size()>0){
                             list.addAll(newList);
@@ -142,7 +141,6 @@ public class FgtMyGame extends BaseFragment {
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        LogUtil.println("baseMessage onError "+JSON.toJSONString(baseMessage));
                         G.showToast(baseMessage);
                         notifyDataSetChanged();
                     }

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

@@ -85,37 +85,35 @@
             android:layout_marginRight="15dp"
             android:background="@color/white_bg_line" />
 
-        <RelativeLayout
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="15dp">
+            android:padding="15dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
 
             <TextView
                 style="@style/txt_style_15"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_marginLeft="5dp"
-                android:layout_toRightOf="@id/iv_phone"
+                android:layout_marginStart="5dp"
+                android:layout_marginEnd="5dp"
                 android:text="银行卡" />
 
             <EditText
                 android:id="@+id/et_bank"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:layout_marginLeft="5dp"
                 android:background="@null"
                 android:drawablePadding="10dp"
-                android:gravity="right"
+                android:gravity="end"
                 android:lines="1"
                 android:hint="请填写银行卡"
                 android:inputType="number"
                 android:maxLength="19"
                 android:textColor="@color/txt_black_9e9c9c"
                 android:textSize="@dimen/text_size_2" />
-        </RelativeLayout>
+        </LinearLayout>
 
         <View
             android:layout_width="match_parent"
@@ -124,37 +122,35 @@
             android:layout_marginRight="15dp"
             android:background="@color/white_bg_line" />
 
-        <RelativeLayout
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="15dp">
+            android:padding="15dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
 
             <TextView
                 style="@style/txt_style_15"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_marginLeft="5dp"
-                android:layout_toRightOf="@id/iv_phone"
+                android:layout_marginStart="5dp"
+                android:layout_marginEnd="5dp"
                 android:text="手机号" />
 
             <EditText
                 android:id="@+id/et_bank_mobile"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:layout_marginLeft="5dp"
                 android:background="@null"
                 android:drawablePadding="10dp"
-                android:gravity="right"
+                android:gravity="end"
                 android:lines="1"
                 android:hint="请填写银行卡预留手机号"
                 android:inputType="number"
                 android:maxLength="19"
                 android:textColor="@color/txt_black_9e9c9c"
                 android:textSize="@dimen/text_size_2" />
-        </RelativeLayout>
+        </LinearLayout>
 
 
         <View
@@ -164,38 +160,36 @@
             android:layout_marginRight="15dp"
             android:background="@color/white_bg_line" />
 
-        <RelativeLayout
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="15dp">
+            android:padding="15dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
 
 
             <TextView
                 style="@style/txt_style_15"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_marginLeft="5dp"
-                android:layout_toRightOf="@id/iv_phone"
+                android:layout_marginStart="5dp"
+                android:layout_marginEnd="5dp"
                 android:text="身份证" />
 
 
             <EditText
                 android:id="@+id/et_id_card"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:layout_marginLeft="5dp"
                 android:background="@null"
                 android:drawablePadding="10dp"
-                android:gravity="right"
+                android:gravity="end"
                 android:lines="1"
                 android:hint="请填写身份证号"
                 android:maxLength="18"
                 android:textColor="@color/txt_black_9e9c9c"
                 android:textSize="@dimen/text_size_2" />
-        </RelativeLayout>
+        </LinearLayout>
 
     </LinearLayout>