Merge remote-tracking branch 'origin/sheep_develop' into sheep_develop

app/src/main/AndroidManifest.xml

@@ -563,7 +563,8 @@
         <activity android:name="com.sheep.gamegroup.view.activity.ActFindGame"
             android:screenOrientation="portrait"/>
         <activity android:name="com.sheep.gamegroup.view.activity.ActFindInformation"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="portrait"
+            android:configChanges="orientation|screenSize|keyboardHidden"/>
         <activity android:name="com.sheep.gamegroup.view.activity.ActReservation"
             android:screenOrientation="portrait"/>
         <activity android:name="com.sheep.gamegroup.view.activity.ActGameAgencyRecharge"

app/src/main/java/com/kfzs/duanduan/ActDownloadMgr.java

@@ -29,6 +29,7 @@ import com.kfzs.duanduan.utils.dlg.HelperUtils;
 import com.kfzs.duanduan.utils.dlg.TitleBarUtils;
 import com.kfzs.duanduan.view.DialogStorageLow;
 import com.kfzs.duanduan.view.KFProgressButton;
+import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
 
@@ -56,7 +57,7 @@ public class ActDownloadMgr extends BaseCompatActivity {
     ListView lvDownloadMgr;
 
     @BindView(R.id.empty_view)
-    View tvEmptyView;
+    View empty_view;
 
     /**
      * Download manager list view data's adapter
@@ -409,7 +410,7 @@ public class ActDownloadMgr extends BaseCompatActivity {
     }
 
     private void showDownloadTaskList(boolean isShow) {
-        tvEmptyView.setVisibility(isShow ? View.GONE : View.VISIBLE);
+        CommonUtil.getInstance().updateEmptyView(empty_view, !isShow);
         lvDownloadMgr.setVisibility(!isShow ? View.GONE : View.VISIBLE);
     }
     @Download.onPre void onPre(DownloadTask task) {

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

@@ -1,11 +1,14 @@
 package com.kfzs.duanduan.fragment;
 
+import android.app.ActionBar;
 import android.app.Activity;
 import android.graphics.Color;
+import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -14,8 +17,11 @@ import android.widget.PopupWindow;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import com.alibaba.fastjson.JSONObject;
+import com.google.gson.Gson;
 import com.kfzs.duanduan.BaseCompatFragment;
 import com.kfzs.duanduan.utils.ApkUtils;
+import com.sheep.gamegroup.model.api.RedPackageMoney;
 import com.sheep.gamegroup.model.entity.AgentEntity;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.DialogConfig;
@@ -25,6 +31,7 @@ import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.SysAppUtil;
 import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.gamegroup.util.ViewUtil;
@@ -51,6 +58,8 @@ import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_AGENT;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_FAQ;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_SHARE;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_UPGRADE;
+import static com.sheep.gamegroup.util.ViewUtil.backgroundAlpha;
+import static com.sheep.gamegroup.util.ViewUtil.measureHeight;
 
 /**
  * 个人中心
@@ -74,23 +83,27 @@ public class FgtPersonalCenter extends BaseCompatFragment {
     TextView version_item_tv;
     @BindView(R.id.personal_center_version_new)
     View personal_center_version_new;
+    @BindView(R.id.iv_redpackage)
+    ImageView ivRedpackage;
     Unbinder unbinder;
 
-    private UserEntity userEntity;
+    public UserEntity userEntity;
     private String faqUrl;
     private String agentUrl;
 
     private Activity activity;
+
     @Override
     protected void initView(Bundle savedInstanceState) {
         setContentView(R.layout.fgt_personalcenter_layout);
         activity = getActivity();
-        mContentView.findViewById(R.id.ibtn_baseactivity_right).setOnClickListener( new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        Jump2View.getInstance().goSetting(activity, null);
-                    }
-                });
+        mContentView.findViewById(R.id.ibtn_baseactivity_right).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Jump2View.getInstance().goSetting(activity, null);
+            }
+        });
+
         if (activity instanceof PersonalCenterAct) {
             mContentView.findViewById(R.id.txt_baseactivity_title).setVisibility(View.VISIBLE);
             mContentView.findViewById(R.id.img_baseactivity_title).setVisibility(View.VISIBLE);
@@ -111,17 +124,17 @@ public class FgtPersonalCenter extends BaseCompatFragment {
         CommonUtil.getInstance().getAgencyState(activity, new Action1<BaseMessage>() {
             @Override
             public void call(BaseMessage baseMessage) {
-                try{
-                    if (baseMessage != null){
+                try {
+                    if (baseMessage != null) {
                         AgentEntity agentEntity = baseMessage.getData(AgentEntity.class);
-                        if(agentEntity != null && agentEntity.getIs_banned() == 0){
+                        if (agentEntity != null && agentEntity.getIs_banned() == 0) {
                             //设置是否显示代理服务
                             proxy_service_layout_line.setVisibility(View.VISIBLE);
                             proxy_service_layout.setVisibility(View.VISIBLE);
                         }
 
                     }
-                }catch (Exception e){
+                } catch (Exception e) {
                     e.printStackTrace();
                 }
             }
@@ -161,33 +174,112 @@ public class FgtPersonalCenter extends BaseCompatFragment {
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
+        isShowRedPackage();
     }
 
+
     /**
-     * 领取红包
+     * @return 是否显示红包
+     */
+    private void isShowRedPackage() {
+        if (userEntity == null) {
+            userEntity = DataUtil.getInstance().getUserEntity();
+        }
+        if (((userEntity.getNewbie_task_status() & (1 << 4)) == 0) && (userEntity.getParent_code().equals("")) && (userEntity.getIs_new() == 1)) {
+            ivRedpackage.setVisibility(View.VISIBLE);
+        } else {
+            ivRedpackage.setVisibility(View.GONE);
+        }
+    }
+
+    /**
+     * 兑换红包
      *
-     * @param code 邀请码
+     * @param code ,邀请码
      */
     public void getRedPackage(String code, final PopupWindow popupWindow) {
-        SheepApp.getInstance().getNetComponent().getApiService().getInfo()
+        JSONObject j = new JSONObject();
+        j.put("invitation_code", code);
+        SheepApp.getInstance().getNetComponent().getApiService().exchangeRedPackage(j)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        LogUtil.logI("0------"+new Gson().toJson(baseMessage));
+                        G.showToast(baseMessage.getMsg());
+                    }
+
                     @Override
                     public void onNext(BaseMessage baseMessage) {
+                        showRedPackageAfterInvitation(getActivity(), getView(),baseMessage);
                         popupWindow.dismiss();
-                        ViewUtil.showRedPackageAfterInvitation(getActivity(),getView());
+                        ivRedpackage.setVisibility(View.GONE);
                     }
+                });
+    }
+
 
+    /**
+     * 邀请成功后在个人资料显示领红包弹窗
+     *
+     * @param mActivity 当前Activity
+     */
+    public  void showRedPackageAfterInvitation(final Activity mActivity, View viewAnchor, BaseMessage baseMessage) {
+        View view = LayoutInflater.from(mActivity).inflate(R.layout.dialog_redpackage_after_invitation, null, false);
+        TextView tvGetRedPackage = view.findViewById(R.id.tv_get_redpackage);
+        TextView tvMoney = view.findViewById(R.id.tv_money);
+        final PopupWindow popupWindow = new PopupWindow(mActivity);
+        popupWindow.setContentView(view);
+        popupWindow.setAnimationStyle(R.style.Rising);
+        popupWindow.setWidth(ActionBar.LayoutParams.WRAP_CONTENT);
+        popupWindow.setHeight(measureHeight(mActivity) / 3);
+        popupWindow.setTouchable(true);
+        popupWindow.setFocusable(true);
+        popupWindow.setBackgroundDrawable(new BitmapDrawable());
+        backgroundAlpha(0.7f, mActivity);
+        popupWindow.showAtLocation(viewAnchor, Gravity.CENTER, 0, 0);
+        popupWindow.setOnDismissListener(new ViewUtil.PopDismissListener(mActivity));
+        RedPackageMoney redPackageMoney = baseMessage.getData(RedPackageMoney.class);
+        tvMoney.setText("" + redPackageMoney.getData());
+        tvGetRedPackage.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                CommonUtil.getInstance().updateUserInfo(null);
+                updateUserInfo(null);
+                popupWindow.dismiss();
+            }
+        });
+
+    }
+    public void updateUserInfo(final Action1<UserEntity> action1) {
+        SheepApp.get(SheepApp.getInstance())
+                .getNetComponent()
+                .getApiService()
+                .getInfo()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        ViewUtil.showRedPackageAfterInvitation(getActivity(),getView());
-                        G.showToast(baseMessage);
+                        if (action1 != null)
+                            action1.call(null);
+
+                    }
+
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        UserEntity userEntity = baseMessage.getData(UserEntity.class);
+                        if (userEntity != null) {
+                            DataUtil.getInstance().setUserEntity(userEntity);
+                        }
+                        initUserInfo();
+                        if (action1 != null)
+                            action1.call(userEntity);
                     }
                 });
     }
 
-
     @Override
     public void onDestroyView() {
         super.onDestroyView();
@@ -203,7 +295,7 @@ public class FgtPersonalCenter extends BaseCompatFragment {
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.iv_redpackage://邀请成功后有可领红包
-                ViewUtil.changeRedPackage(getActivity(),getView(),FgtPersonalCenter.this);
+                ViewUtil.changeRedPackage(getActivity(), getView(), FgtPersonalCenter.this);
                 break;
             case R.id.icon_img_iv://图片
                 if (TestUtil.isTest()) {
@@ -221,7 +313,7 @@ public class FgtPersonalCenter extends BaseCompatFragment {
                 Jump2View.getInstance().goAuditTastList(activity, null);
                 break;
             case R.id.proxy_service_layout://代理
-                CommonUtil.getInstance().initUrlConfigByNet("agenturl", new Action1<String>(){
+                CommonUtil.getInstance().initUrlConfigByNet("agenturl", new Action1<String>() {
                     @Override
                     public void call(String url) {
                         agentUrl = url;
@@ -234,7 +326,7 @@ public class FgtPersonalCenter extends BaseCompatFragment {
                 USER_AGENT.onEvent();
                 break;
             case R.id.faq_layout://FAQ帮助
-                CommonUtil.getInstance().initUrlConfigByNet("faqurl", new Action1<String>(){
+                CommonUtil.getInstance().initUrlConfigByNet("faqurl", new Action1<String>() {
                     @Override
                     public void call(String url) {
                         faqUrl = url;

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

@@ -629,8 +629,10 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             BaseMessage baseMessage = (BaseMessage) object;
             allTaskAcceptedTaskList = baseMessage.getDataList(TaskAcceptedEty.class);
             AutoTaskListUtil.getInstance().loadList(allTaskAcceptedTaskList);
-            mHanderl.sendEmptyMessage(1);
+        } else {
+            allTaskAcceptedTaskList.clear();
         }
+        mHanderl.sendEmptyMessage(1);
     }
 
     @Override
@@ -650,6 +652,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             e.printStackTrace();
             G.showToast(" 网络错误！");
         }
+        allTaskAcceptedTaskList.clear();
         mHanderl.sendEmptyMessage(1);
     }
 

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

@@ -44,13 +44,15 @@ import static com.sheep.gamegroup.util.UMConfigUtils.Event.FIND_TASK;
  */
 public class TaskHelper {
     private Action1<Integer> action1;
-    public TaskHelper(Action1<Integer> action1){
+
+    public TaskHelper(Action1<Integer> action1) {
         this.action1 = action1;
     }
 
     private TaskAcceptedEty taskAcceptedEty;
     private int release_task_id;
     private Activity activity;
+
     public void initAcceptedTask(Activity activity, final int release_task_id) {
         this.activity = activity;
         this.release_task_id = release_task_id;
@@ -71,7 +73,9 @@ public class TaskHelper {
                     }
                 });
     }
+
     private TaskReleaseEty taskReleaseEty;
+
     private void initTask(int release_task_id) {
         SheepApp.getInstance().getNetComponent().getApiService().taskDesc(release_task_id)
                 .subscribeOn(Schedulers.io())
@@ -80,7 +84,7 @@ public class TaskHelper {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
                         taskReleaseEty = baseMessage.getData(TaskReleaseEty.class);
-                        if(action1 != null)
+                        if (action1 != null)
                             action1.call(1);//刷新界面
 
                     }
@@ -90,7 +94,9 @@ 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())
@@ -114,25 +120,26 @@ public class TaskHelper {
     }
 
     private RxjavaCountDownTimer timer;
+
     public void loadTask(final View itemView) {
         itemView.setVisibility(View.VISIBLE);
-        if(taskReleaseEty == null){
+        if (taskReleaseEty == null) {
             return;
         }
         final TaskEty taskEty = taskReleaseEty.getTask();
-        if(taskEty == null){
+        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_surplus1 = (TextView)itemView.findViewById(R.id.find_information_game_surplus1);
-        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_task_top);
-        TextView find_information_game_task = (TextView)itemView.findViewById(R.id.find_information_game_task_bottom);
-        final TextView find_information_game_task_end_time = (TextView)itemView.findViewById(R.id.find_information_game_task_end_time);
-        if(orienteeringDetail != null){//已经完成的游戏任务
+        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_surplus1 = (TextView) itemView.findViewById(R.id.find_information_game_surplus1);
+        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_task_top);
+        TextView find_information_game_task = (TextView) itemView.findViewById(R.id.find_information_game_task_bottom);
+        final TextView find_information_game_task_end_time = (TextView) itemView.findViewById(R.id.find_information_game_task_end_time);
+        if (orienteeringDetail != null) {//已经完成的游戏任务
             find_information_game_task.setVisibility(View.VISIBLE);
             find_information_game_task0.setVisibility(View.VISIBLE);
             find_information_game_yuan.setVisibility(View.INVISIBLE);
@@ -145,14 +152,14 @@ public class TaskHelper {
             find_information_game_task.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
-                    ViewUtil.showGamePayAccount(activity, orienteeringDetail.getGame_id(),orienteeringDetail.getName());
+                    ViewUtil.showGamePayAccount(activity, orienteeringDetail.getGame_id(), orienteeringDetail.getName());
                 }
             });
             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);
+                    Jump2View.getInstance().goGameTaskDetailView(activity, release_task_id, orienteeringDetail.getGame_id(), 1);
                     UMConfigUtils.IdEvent.TASK.commit(release_task_id);
                 }
             });
@@ -173,7 +180,7 @@ public class TaskHelper {
                 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())) {
+                if (!TextUtils.isEmpty(taskEty.getRemarks())) {
                     remarks = taskEty.getRemarks().split(";");
                 }
                 find_information_game_time.setText(remarks.length > 0 ? remarks[0] : "");
@@ -195,11 +202,11 @@ public class TaskHelper {
             case 1003://游戏任务
             default:
                 find_information_game_yuan.setGravity(Gravity.CENTER);
-                if(taskAcceptedEty != null){
+                if (taskAcceptedEty != null) {
                     switch (taskAcceptedEty.getStatus()) {
                         case 1://"已接受任务";
                         case 2:// "正在进行中";
-                            if(taskReleaseEty.getDeadline().equals("永久")){
+                            if (taskReleaseEty.getDeadline().equals("永久")) {
                                 find_information_game_task_end_time.setVisibility(View.GONE);
                             } else {
                                 find_information_game_task_end_time.setVisibility(View.VISIBLE);
@@ -263,7 +270,7 @@ public class TaskHelper {
                             find_information_game_task.setVisibility(View.VISIBLE);
                             find_information_game_task.setText("已经完成");
                             find_information_game_task.setEnabled(false);
-                            if(taskEty.isGameTask()){
+                            if (taskEty.isGameTask()) {
                                 initGameTask(itemView, taskEty.getThird_task_id());
                             }
                             break;
@@ -279,12 +286,12 @@ public class TaskHelper {
                             find_information_game_task.setVisibility(View.GONE);
                             break;
                     }
-                } else if(taskReleaseEty.isOffline()){//任务已经下线
+                } 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())){
+                } 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("任务已抢光");
@@ -325,33 +332,42 @@ public class TaskHelper {
         taskReleaseEty = null;
         initTask(release_task_id);
     }
+
     private int reloadDataType;//0 不刷新数据 1刷新 taskAcceptedEty
+
     public void onResume() {
-        switch (reloadDataType){
+        switch (reloadDataType) {
             case 1:
                 refreshTask();
                 break;
         }
     }
+
     /**
      * 清理计时器
      */
     public void clear() {
-        if(timer != null)
+        if (timer != null)
             timer.clear();
         timer = null;
+        action1 = null;
+    }
+    /**
+     * 退出
+     */
+    public void onDestroy() {
+        clear();
+        action1 = null;
+        activity = null;
     }
 
-
-
-
-
-
-
-
-
-
-
+    public void destroy() {
+        if (timer != null)
+            timer.clear();
+        timer = null;
+        action1 = null;
+        activity = null;
+    }
 
 
     private DownloadHelper downloadHelper = new DownloadHelper();
@@ -363,6 +379,7 @@ public class TaskHelper {
 
     /**
      * 设置剩余份数文本
+     *
      * @param textView
      * @param taskReleaseEty
      */
@@ -370,8 +387,10 @@ public class TaskHelper {
         textView.setVisibility(View.VISIBLE);
         ViewUtil.setText(textView, String.format(Locale.CHINA, "剩余%s份", taskReleaseEty.getLast_num()));
     }
+
     /**
      * 设置游戏类型文本
+     *
      * @param textView
      * @param taskReleaseEty
      */
@@ -382,10 +401,12 @@ public class TaskHelper {
         textView.setBackgroundResource(R.drawable.shape_blue_stroke_rectangle_no_lb);
         textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 9);
         int padding = textView.getContext().getResources().getDimensionPixelSize(R.dimen.content_padding_2);
-        textView.setPadding(4*padding, padding, 4*padding, padding);
+        textView.setPadding(4 * padding, padding, 4 * padding, padding);
     }
+
     /**
      * 设置游戏标识文本，如：现金，福利
+     *
      * @param textView
      * @param taskReleaseEty
      */
@@ -395,11 +416,12 @@ public class TaskHelper {
         textView.setBackgroundResource(R.drawable.shape_red_stroke_rectangle_no_lb);
         textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 9);
         int padding = textView.getContext().getResources().getDimensionPixelSize(R.dimen.content_padding_2);
-        textView.setPadding(4*padding, padding, 4*padding, padding);
+        textView.setPadding(4 * padding, padding, 4 * padding, padding);
     }
+
     //    private int task_type = 1;// 1时间试玩任务 2 信用卡任务 3应用下载 4h5业务 1001畅思 1000连续任务， 1002 1003游戏任务 1002平台游戏，1003 腾讯游戏，1004 小米游戏
     private static String[] getTaskTypeTextColor(TaskEty task) {
-        switch (task.getTask_type()){
+        switch (task.getTask_type()) {
             case 1002:
             case 1003:
             case 1004:
@@ -413,22 +435,24 @@ public class TaskHelper {
 
     /**
      * 设置当前子任务为选中状态
-     1、 任务未开启时——即将开启
-     2、 任务未领取时——可领取
-     3、 任务已领取待完成时——进行中
-     4、 任务已提交待审核——待审核
-     5、 任务审核通过——已完成
-     6、 任务审核失败——审核失败
-     7、任务已过期未完成——已过期
+     * 1、 任务未开启时——即将开启
+     * 2、 任务未领取时——可领取
+     * 3、 任务已领取待完成时——进行中
+     * 4、 任务已提交待审核——待审核
+     * 5、 任务审核通过——已完成
+     * 6、 任务审核失败——审核失败
+     * 7、任务已过期未完成——已过期
+     *
      * @param taskEty
      */
     public static void setSelectFlag(TaskEty taskEty) {
         List<TaskChild> taskChildList;
-        if(taskEty == null || ListUtil.isEmpty(taskChildList = taskEty.getChild()))
+        if (taskEty == null || ListUtil.isEmpty(taskChildList = taskEty.getChild()))
             return;
         TaskChild selectTaskChild = null;
-        outFor: for (TaskChild taskChild : taskChildList) {
-            switch (taskChild.getStatus()){
+        outFor:
+        for (TaskChild taskChild : taskChildList) {
+            switch (taskChild.getStatus()) {
                 case 2:
                 case 3:
                 case 6://找到可领取或者进行中或者审核失败则直接退出循环
@@ -438,12 +462,12 @@ public class TaskHelper {
                 case 1:
                 case 4:
                 case 5:
-                    if(selectTaskChild == null)
+                    if (selectTaskChild == null)
                         selectTaskChild = taskChild;
                     break;
             }
         }
-        if(selectTaskChild != null)
+        if (selectTaskChild != null)
             selectTaskChild.setSelectFlag(true);
     }
 }

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

@@ -190,10 +190,21 @@ public interface ApiService {
     Observable<BaseMessage> giveTaskStatue(@Path("id") int id);
 
 
+    /**
+     * @param jsonObject
+     * @return
+     */
     @PUT("app/user/change_base_info")
     Observable<BaseMessage> changeBaseInfo(@Body com.alibaba.fastjson.JSONObject jsonObject);
 
     /**
+     * @param jsonObject
+     * @return   领红包
+     */
+    @POST("app/user/receive_red_packet")
+    Observable<BaseMessage> exchangeRedPackage(@Body JSONObject jsonObject);
+
+    /**
      * 更换手机号
      */
     @POST("app/user/switch_phone")

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

@@ -0,0 +1,22 @@
+package com.sheep.gamegroup.model.api;
+
+/**
+ * created on：2018/8/20 on 19:03
+ * created by: Administrator
+ * 描述:
+ */
+public class RedPackageMoney {
+
+    /**
+     * 领取红包的钱数
+     */
+    private float data;
+
+    public float getData() {
+        return data;
+    }
+
+    public void setData(float data) {
+        this.data = data;
+    }
+}

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

@@ -573,4 +573,20 @@ public class TaskEty implements Serializable, IDownload {
         TaskChild taskChild = ListUtil.getLast(child);
         return taskChild == null || taskChild.getAlready_accepted_task_id() == lastCommitId;
     }
+
+
+    /**
+     * 不是连续任务返回true
+     * 是连续任务时，子任务中第一个处理接受任务状态时返回true
+     * @return
+     */
+    public boolean canCancelTask() {
+       switch (task_type){
+           case 1000:
+               TaskChild taskChild = ListUtil.getItem(child, 0);
+               return taskChild == null || taskChild.getStatus() == 3;
+           default:
+               return true;
+       }
+    }
 }

app/src/main/java/com/sheep/gamegroup/presenter/LoginPresenter.java

@@ -9,6 +9,7 @@ import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.ChannelContent;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.FastJsonUtils;
+import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.PreferenceUtils;
 import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
@@ -85,6 +86,7 @@ public class LoginPresenter implements LoginContract.Presenter {
             loginEty =FastJsonUtils.toBean( JSONObject.toJSONString(baseMessage.getData()),LoginEntity.class);
             SpUtils.saveToken(SheepApp.mContext, loginEty.getToken());
             DataUtil.getInstance().setUserEntity(loginEty.getUser());
+            LogUtil.logI("token--------"+loginEty.getToken());
         }
         view.NetSuccess(1,"登录成功", EntityUtils.getUserCode(loginEty));
         TestUtil.saveUser(loginEty);

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

@@ -7,6 +7,7 @@ import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
 
@@ -1178,6 +1179,7 @@ public class Jump2View {
     }
     public void gotoMain(Activity activity) {
         String openId = SpUtils.getToken(SheepApp.getInstance());
+        LogUtil.logI("GOTOMIAN_____TOKEN----"+openId);
         if (!TextUtils.isEmpty(openId)) {
             checkOrGoHomePage(activity);
         } else {

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

@@ -153,6 +153,17 @@ public class MyDbManager {
         AppUsage appUsage = getAppUsage(packageName);
         return appUsage == null ? 0 : appUsage.getTotalTimeInForeground();
     }
+
+    /**
+     * @param packageName  ,
+     *                     不出意外的话，把时间设置为0
+     */
+    public void retAppUsageTime(String packageName){
+        AppUsage appUsage = getAppUsage(packageName);
+        if (appUsage != null){
+            appUsage.setTotalTimeInForeground(0);
+        }
+    }
     public AppUsage getAppUsage(String packageName){
         try{
             return db.selector(AppUsage.class)

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

@@ -45,6 +45,7 @@ import com.google.gson.Gson;
 import com.kfzs.duanduan.fragment.FgtPersonalCenter;
 import com.sheep.gamegroup.dateview.DatePickerDialog;
 import com.sheep.gamegroup.dateview.DateUtil;
+import com.sheep.gamegroup.model.api.RedPackageMoney;
 import com.sheep.gamegroup.model.entity.Advertising;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.Container;
@@ -52,6 +53,9 @@ import com.sheep.gamegroup.model.entity.DialogConfig;
 import com.sheep.gamegroup.model.entity.GameAccountEntity;
 import com.sheep.gamegroup.model.entity.PayEntity;
 import com.sheep.gamegroup.model.entity.RobTask;
+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.util.SheepSubscriber;
 import com.sheep.gamegroup.util.glide.RoundedCornersTransformation;
 import com.sheep.gamegroup.view.activity.PersonalInfoAct;
@@ -68,6 +72,7 @@ import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
 import com.sheep.jiuyan.samllsheep.utils.G;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
 import org.afinal.simplecache.ACache;
 
@@ -162,8 +167,8 @@ public class ViewUtil {
      * @param context   Activity的上下文
      * @param mTextView 显示日期的TextView
      */
-    public static void showDateDialog(final PersonalInfoAct context, final TextView mTextView) {
-        List<Integer> date = DateUtil.getDateForString("1990-01-01");//从1990-01-01开始显示
+    public static void showDateDialog(final PersonalInfoAct context, final TextView mTextView, String time) {
+        List<Integer> date = DateUtil.getDateForString(TextUtils.isEmpty(time)?"1990-01-01":time);//从1990-01-01开始显示}
         DatePickerDialog.Builder builder = new DatePickerDialog.Builder(context);
         builder.setOnDateSelectedListener(new DatePickerDialog.OnDateSelectedListener() {
             @Override
@@ -189,7 +194,8 @@ public class ViewUtil {
      * @return , TaskEty对象
      */
     public static RobTask getTask(final ImageView ivIcon, final TextView tvTitel, final TextView tvDutyMoney) {
-        SheepApp.getInstance().getNetComponent().getApiService().getNewTask(0)
+        LogUtil.logI(SpUtils.getOrder("order") + "开始的order");
+        SheepApp.getInstance().getNetComponent().getApiService().getNewTask(SpUtils.getOrder("order"))
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
@@ -197,6 +203,8 @@ public class ViewUtil {
                     public void onNext(BaseMessage baseMessage) {
                         try {
                             mRobTask = baseMessage.getData(RobTask.class);
+                            LogUtil.logI(SpUtils.getOrder("order") + "保存后的order");
+                            SpUtils.saveOrder("order", mRobTask.getOrder());
                             LogUtil.logI("---mRobTask" + new Gson().toJson(mRobTask));
                             LogUtil.logI("---" + new Gson().toJson(baseMessage));
                             tvDutyMoney.setText(mRobTask.getM().getBonus() + "元");//设置任务奖励金额
@@ -248,7 +256,7 @@ public class ViewUtil {
             @Override
             public void onClick(View v) {
                 mRobTask = getTask(ivIcon, tvTitel, tvDutyMoney);
-                G.showToast("更换任务");
+
             }
         });
         //立即去做，跳转到任务详情去
@@ -272,33 +280,8 @@ public class ViewUtil {
 
     }
 
-    /**
-     * 邀请成功后在个人资料显示领红包弹窗
-     *
-     * @param mActivity 当前Activity，
-     */
-    public static void showRedPackageAfterInvitation(final Activity mActivity, View viewAnchor) {
-        View view = LayoutInflater.from(mActivity).inflate(R.layout.dialog_redpackage_after_invitation, null, false);
-        TextView tvGetRedPackage = view.findViewById(R.id.tv_get_redpackage);
-        final PopupWindow popupWindow = new PopupWindow(mActivity);
-        popupWindow.setContentView(view);
-        popupWindow.setAnimationStyle(R.style.Rising);
-        popupWindow.setWidth(ActionBar.LayoutParams.WRAP_CONTENT);
-        popupWindow.setHeight(measureHeight(mActivity) / 3);
-        popupWindow.setTouchable(true);
-        popupWindow.setFocusable(true);
-        popupWindow.setBackgroundDrawable(new BitmapDrawable());
-        backgroundAlpha(0.7f, mActivity);
-        popupWindow.showAtLocation(viewAnchor, Gravity.CENTER, 0, 0);
-        popupWindow.setOnDismissListener(new PopDismissListener(mActivity));
-        tvGetRedPackage.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                popupWindow.dismiss();
-            }
-        });
 
-    }
+
 
     /**
      * 兑换红包弹窗
@@ -308,10 +291,10 @@ public class ViewUtil {
     public static void changeRedPackage(final Activity mActivity, View viewAnchor, final FgtPersonalCenter fgtPersonalCenter) {
         View view = LayoutInflater.from(mActivity).inflate(R.layout.pop_get_redpackage, null);
         final EditText edInvitationCode = view.findViewById(R.id.ed_invitation_code);
-        TextView tvGetRedPackage = view.findViewById(R.id.tv_get_redpackage);
+        final TextView tvGetRedPackage = view.findViewById(R.id.tv_get_redpackage);
         final PopupWindow popupWindow = new PopupWindow(mActivity);
         popupWindow.setContentView(view);
-        popupWindow.setWidth(measureWidth(mActivity) * 6 / 10);
+        popupWindow.setWidth(measureWidth(mActivity) * 4 / 5);
         popupWindow.setHeight(ActionBar.LayoutParams.WRAP_CONTENT);
         popupWindow.setTouchable(true);
         popupWindow.setFocusable(true);
@@ -322,11 +305,7 @@ public class ViewUtil {
         tvGetRedPackage.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (TextUtils.isEmpty(edInvitationCode.getText())) {
-                    G.showToast("邀请码不能为空");
-                } else {
-                    fgtPersonalCenter.getRedPackage(edInvitationCode.getText().toString(), popupWindow);
-                }
+                fgtPersonalCenter.getRedPackage(edInvitationCode.getText().toString(), popupWindow);
             }
         });
 
@@ -352,7 +331,7 @@ public class ViewUtil {
      * @param mActivity ,
      * @return 屏幕的宽
      */
-    private static int measureHeight(Activity mActivity) {
+    public static int measureHeight(Activity mActivity) {
         WindowManager manager = (WindowManager) mActivity.getSystemService(Context.WINDOW_SERVICE);
         Display defaultDisplay = manager.getDefaultDisplay();
         DisplayMetrics outMetrics = new DisplayMetrics();
@@ -416,7 +395,7 @@ public class ViewUtil {
     /**
      * popwindow消失监听类，消失恢复window透明度
      */
-    static class PopDismissListener implements PopupWindow.OnDismissListener {
+   public   static class PopDismissListener implements PopupWindow.OnDismissListener {
         Activity mActivity;
 
         public PopDismissListener(Activity activity) {

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

@@ -1,15 +1,25 @@
 package com.sheep.gamegroup.view.activity;
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.graphics.PixelFormat;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.webkit.WebChromeClient;
+import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -28,6 +38,7 @@ import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.ListUtil;
+import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.SysAppUtil;
 import com.sheep.gamegroup.helper.TaskHelper;
 import com.sheep.gamegroup.util.TimeUtil;
@@ -44,7 +55,6 @@ import org.afinal.simplecache.ApiKey;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
-import java.lang.reflect.InvocationTargetException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -63,7 +73,7 @@ import static com.sheep.gamegroup.util.UMConfigUtils.Event.FIND_SHARE;
  * Created by realicing on 2018/5/10.
  * realicing@sina.com
  */
-public class ActFindInformation extends BaseActivity implements Action1<Integer>{
+public class ActFindInformation extends BaseActivity implements Action1<Integer> {
     @Override
     protected int getLayoutId() {
         return R.layout.net_empty_fresh_list;
@@ -71,6 +81,19 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
 
     private int id;
 
+    private int k;
+    int width;
+    /**
+     * 视频全屏参数
+     */
+
+
+    protected final FrameLayout.LayoutParams COVER_SCREEN_PARAMS = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
+    private View customView;
+    private FrameLayout fullscreenContainer;
+    private WebChromeClient.CustomViewCallback customViewCallback;
+
+
     @BindView(R.id.refresh)
     SwipeRefreshLayout refresh;
     @BindView(R.id.empty_view)
@@ -79,7 +102,8 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
     View check_net_ll;
     @BindView(R.id.view_list)
     RecyclerView view_list;
-    WebView find_information_content_wb;
+    WebView webView;
+
     @Override
     public void initView() {
         id = getIntent().getIntExtra("id", 0);
@@ -92,7 +116,7 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
                     @Override
                     public void onClick(View view) {
                         FIND_SHARE.onEvent("find_id", id);
-                        Jump2View.getInstance().tryShare(ActFindInformation.this,"find_share_url", "find_id", id);
+                        Jump2View.getInstance().tryShare(ActFindInformation.this, "find_share_url", "find_id", id);
                     }
                 });
 
@@ -107,16 +131,17 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
         });
 
         view_list.setLayoutManager(new LinearLayoutManager(SheepApp.getInstance()));
-        view_list.setAdapter(new AdbCommonRecycler<String>(SheepApp.getInstance(), list){
+        view_list.setAdapter(new AdbCommonRecycler<String>(SheepApp.getInstance(), list) {
 
             @Override
             public int getItemViewType(int position) {
                 return position;
             }
+
             @Override
             public int getViewIdByType(int type) {//type来源于 getItemViewType 返回的值
                 String item = list.get(type);
-                switch (item){
+                switch (item) {
                     case "top":
                         return R.layout.find_information_top;
                     case "bottom":
@@ -127,7 +152,7 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
 
             @Override
             public void convert(ViewHolder holder, final String item) {
-                switch (item){
+                switch (item) {
                     case "top":
                         loadTop(holder.itemView);
                         break;
@@ -135,39 +160,188 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
                         loadBottom((ViewGroup) holder.itemView);
                         break;
                 }
-            }});
+            }
+        });
+    }
+
+
+    public void initWebView() {
+        WebChromeClient wvcc = new WebChromeClient();
+        WebSettings webSettings = webView.getSettings();
+        webSettings.setJavaScriptEnabled(true);
+        webSettings.setUseWideViewPort(true); // 关键点
+        webSettings.setAllowFileAccess(true); // 允许访问文件
+        webSettings.setSupportZoom(true); // 支持缩放
+        webSettings.setLoadWithOverviewMode(true);//是否支持全屏
+        webSettings.setDomStorageEnabled(true);
+        webSettings.setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK); // 加载缓存内容
+        getWindow().setFormat(PixelFormat.TRANSLUCENT);
+        webView.setWebChromeClient(wvcc);
+        WebViewClient wvc = new WebViewClient() {
+            @Override
+            public boolean shouldOverrideUrlLoading(WebView view, String url) {
+                // webView.loadUrl(url);
+                Jump2View.getInstance().goWeb(ActFindInformation.this, url);
+                return true;
+            }
+        };
+        webView.setWebChromeClient(new WebChromeClient() {
+
+            /**视频播放相关的方法*
+             *
+             */
+
+
+            @Override
+            public View getVideoLoadingProgressView() {
+                FrameLayout frameLayout = new FrameLayout(ActFindInformation.this);
+                frameLayout.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+                return frameLayout;
+            }
+
+            @Override
+            public void onShowCustomView(View view, CustomViewCallback callback) {
+                showCustomView(view, callback);
+                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);//设置横屏
+            }
+
+            @Override
+            public void onHideCustomView() {
+                hideCustomView();
+                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);//设置竖屏
+            }
+        });
+        webView.setWebViewClient(wvc);
+    }
+
+    /**
+     * 视频播放全屏
+     */
+
+    private void showCustomView(View view, WebChromeClient.CustomViewCallback callback) {
+        // if a view already exists then immediately terminate the new one
+        if (customView != null) {
+            callback.onCustomViewHidden();
+            return;
+        }
+
+        ActFindInformation.this.getWindow().getDecorView();
+
+        FrameLayout decor = (FrameLayout) getWindow().getDecorView();
+        fullscreenContainer = new FullscreenHolder(ActFindInformation.this);
+        fullscreenContainer.addView(view, COVER_SCREEN_PARAMS);
+        decor.addView(fullscreenContainer, COVER_SCREEN_PARAMS);
+        customView = view;
+        setStatusBarVisibility(false);
+        customViewCallback = callback;
+    }
+
+    /**
+     * 隐藏视频全屏
+     */
+
+
+    private void hideCustomView() {
+        if (customView == null) {
+            return;
+        }
+
+        setStatusBarVisibility(true);
+        FrameLayout decor = (FrameLayout) getWindow().getDecorView();
+        decor.removeView(fullscreenContainer);
+        fullscreenContainer = null;
+        customView = null;
+        customViewCallback.onCustomViewHidden();
+        webView.setVisibility(View.VISIBLE);
+    }
+
+    /**
+     * 全屏容器界面
+     */
+
+
+    class FullscreenHolder extends FrameLayout {
+
+        public FullscreenHolder(Context ctx) {
+            super(ctx);
+            setBackgroundColor(ctx.getResources().getColor(android.R.color.black));
+        }
+
+        @Override
+        public boolean onTouchEvent(MotionEvent evt) {
+            switch (evt.getAction()) {
+                case MotionEvent.ACTION_POINTER_UP:
+                    break;
+            }
+            return true;
+        }
+    }
+
+    private void setStatusBarVisibility(boolean visible) {
+        int flag = visible ? 0 : WindowManager.LayoutParams.FLAG_FULLSCREEN;
+        getWindow().setFlags(flag, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+        Log.i("bar------", visible + "");
+    }
+
+    @Override
+    public boolean onKeyUp(int keyCode, KeyEvent event) {
+        switch (keyCode) {
+            case KeyEvent.KEYCODE_BACK:
+/**回退键 事件处理 优先级:
+ 视频播放全屏 - 网页回退 - 关闭页面*/
+
+                if (customView != null) {
+                    hideCustomView();
+                } else if (webView.canGoBack()) {
+                    webView.goBack();
+                } else {
+                    finish();
+                }
+                return true;
+            default:
+                return super.onKeyUp(keyCode, event);
+        }
     }
 
+
     private void loadTop(View itemView) {
-        TextView find_information_name = (TextView)itemView.findViewById(R.id.find_information_name);
-        TextView find_information_time = (TextView)itemView.findViewById(R.id.find_information_time);
-        TextView find_information_look = (TextView)itemView.findViewById(R.id.find_information_look);
+        TextView find_information_name = (TextView) itemView.findViewById(R.id.find_information_name);
+        TextView find_information_time = (TextView) itemView.findViewById(R.id.find_information_time);
+        TextView find_information_look = (TextView) itemView.findViewById(R.id.find_information_look);
         ViewUtil.setText(find_information_name, findItem.getTitle());
         ViewUtil.setText(find_information_time, String.format(Locale.CHINA, "发布时间：%s", TimeUtil.TimeStamp2Date(findItem.getCreated_at(), "yyyy-MM-dd HH:mm")));
         ViewUtil.setText(find_information_look, findItem.getClicks());
 
-        find_information_content_wb = itemView.findViewById(R.id.find_information_content_wb);
-        ViewUtil.loadDataWithBaseURL(find_information_content_wb, findItem.getContent());
-        find_information_content_wb.setWebViewClient(new WebViewClient() {
+        webView = itemView.findViewById(R.id.find_information_content_wb);
+        initWebView();
+
+
+        ViewUtil.loadDataWithBaseURL(webView, findItem.getContent());
+        LogUtil.logI("结果为——-----" + findItem.getContent());
+       /* webView.setWebViewClient(new WebViewClient() {
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
                 Jump2View.getInstance().goWeb(ActFindInformation.this, url);
                 return true;
             }
-        });
+        });*/
+
 
     }
+
+
     private TaskHelper taskHelper = new TaskHelper(this);
     private ViewGroup bottomViewGroup;
+
     private void loadBottom(ViewGroup viewGroup) {
         bottomViewGroup = viewGroup;
-        if(taskHelper.hasTask()) {
+        if (taskHelper.hasTask()) {
             taskHelper.loadTask(viewGroup.getChildAt(0));
         } else {
             viewGroup.getChildAt(0).setVisibility(View.GONE);
         }
         viewGroup.getChildAt(1).setVisibility(taskHelper.hasTask() && findApp != null ? View.VISIBLE : View.GONE);
-        if(findApp != null) {
+        if (findApp != null) {
             loadGame(viewGroup.getChildAt(2));
         } else {
             viewGroup.getChildAt(2).setVisibility(View.GONE);
@@ -176,22 +350,22 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
 
     private void loadGame(View itemView) {
         itemView.setVisibility(View.VISIBLE);
-        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_task_center = (TextView)itemView.findViewById(R.id.find_information_game_task_center);
+        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_task_center = (TextView) itemView.findViewById(R.id.find_information_game_task_center);
         GlideImageLoader.setGameImage(find_information_game_icon, findApp.getIcon());
         ViewUtil.setText(find_information_game_name, findApp.getName());
         final boolean isNeedReservation = !findApp.isCanDonload();//这里认为只有两种状态：可下载与预约下载
         ViewUtil.setText(find_information_game_surplus);
-        if(isNeedReservation)
+        if (isNeedReservation)
             ViewUtil.setText(find_information_game_time, String.format(Locale.CHINA, "开放时间：%s", TimeUtil.TimeStamp2Date(findApp.getDownload_at(), "yyyy-MM-dd\u0020HH:mm")));
         else
-            ViewUtil.setText(find_information_game_time, String.format(Locale.CHINA, "厂商：%s\u0020包体大小：%sM", findApp.getManufacturer(),findApp.getPackage_size()));
+            ViewUtil.setText(find_information_game_time, String.format(Locale.CHINA, "厂商：%s\u0020包体大小：%sM", findApp.getManufacturer(), findApp.getPackage_size()));
         find_information_game_task_center.setVisibility(View.VISIBLE);
 
-        updateView(this,findApp, find_information_game_task_center);
+        updateView(this, findApp, find_information_game_task_center);
 
         itemView.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -207,23 +381,24 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
     }
 
     private List<String> list = ListUtil.emptyList();
+
     @Override
     public void initData() {
         empty_view.setVisibility(View.INVISIBLE);
         SysAppUtil.checkNet(new Action1<Integer>() {
             @Override
             public void call(Integer result) {
-                if(result != 0){//无网络
-                    if(check_net_ll != null)
+                if (result != 0) {//无网络
+                    if (check_net_ll != null)
                         check_net_ll.setVisibility(View.VISIBLE);
                 } else {
-                    if(check_net_ll != null)
+                    if (check_net_ll != null)
                         check_net_ll.setVisibility(View.GONE);
                 }
             }
         });
         FindItem data = DataUtil.getInstance().getCacheResult(ApiKey.articlesItem(id), FindItem.class);
-        if(data != null){
+        if (data != null) {
             loadFindItem(data);
         }
         SheepApp.getInstance().getNetComponent().getApiService().getFindDetail(id)
@@ -233,7 +408,7 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
                     @Override
                     public void onNext(BaseMessage baseMessage) {
                         boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.articlesItem(id));
-                        if(isNewData) {
+                        if (isNewData) {
                             FindItem data = baseMessage.getData(FindItem.class);
                             loadFindItem(data);
                         }
@@ -248,17 +423,17 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
     }
 
     private void loadFindItem(FindItem data) {
-        if(data != null){
+        if (data != null) {
             taskHelper.clear();
             findItem = data;
             list.clear();
             list.add("top");
             list.add("bottom");
             notifyDataSetChanged();
-            if(findItem.getRelease_task_id() != 0){//包含任务
+            if (findItem.getRelease_task_id() != 0) {//包含任务
                 taskHelper.initAcceptedTask(ActFindInformation.this, findItem.getRelease_task_id());
             }
-            if(findItem.getApplication_id() != 0){//包含游戏
+            if (findItem.getApplication_id() != 0) {//包含游戏
                 initFindApp(findItem.getApplication_id());
             }
         } else {
@@ -267,9 +442,10 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
     }
 
     private FindApp findApp;
+
     private void initFindApp(int application_id) {
         FindApp cacheResult = DataUtil.getInstance().getCacheResult(ApiKey.applications(id), FindApp.class);
-        if(cacheResult != null){
+        if (cacheResult != null) {
             findApp = cacheResult;
             notifyDataSetChanged();
         }
@@ -280,7 +456,7 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
                     @Override
                     public void onNext(BaseMessage baseMessage) {
                         boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.applications(id));
-                        if(isNewData) {
+                        if (isNewData) {
                             findApp = baseMessage.getData(FindApp.class);
                             notifyDataSetChanged();
                         } else {
@@ -298,7 +474,7 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
 
     private FindItem findItem;
 
-    private void notifyDataSetChanged(){
+    private void notifyDataSetChanged() {
         CommonUtil.getInstance().updateEmptyView(empty_view, list.isEmpty());
         refresh.setRefreshing(false);
         view_list.getAdapter().notifyDataSetChanged();
@@ -306,19 +482,21 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
 
 
     private Map<String, TextView> downLoadTextViewMap = new HashMap<>();
+
     //获取任务对应的TextView来更新进度
     private TextView getTextViewByTask(DownloadTask task) {
         return getTextViewByKey(task.getKey());
     }
+
     private TextView getTextViewByKey(String key) {
-        if(downLoadTextViewMap.containsKey(key))
+        if (downLoadTextViewMap.containsKey(key))
             return downLoadTextViewMap.get(key);
         return null;
     }
 
     //更新按钮状态与添加点击事件
     private void updateView(Activity activity, FindApp findApp, TextView textView) {
-        if(findApp.isCanDonload()){//可下载
+        if (findApp.isCanDonload()) {//可下载
             downLoadTextViewMap.put(findApp.getDownload_link(), textView);
             downLoadTextViewMap.put(findApp.getPackage_name(), textView);
             findApp.getFindAppHelper().updateDownloadTaskView(activity, findApp, textView);
@@ -329,79 +507,91 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
 
     //下载状态监听
 
-    @Download.onPre void onPre(DownloadTask task) {
+    @Download.onPre
+    void onPre(DownloadTask task) {
         TextView textView = getTextViewByTask(task);
-        if(textView != null) {
+        if (textView != null) {
             textView.setText("准备下载中");
         }
     }
 
-    @Download.onTaskStart void taskStart(DownloadTask task) {
+    @Download.onTaskStart
+    void taskStart(DownloadTask task) {
         TextView textView = getTextViewByTask(task);
-        if(textView != null) {
+        if (textView != null) {
             textView.setText("开始下载中");
         }
     }
-    @Download.onTaskResume void taskResume(DownloadTask task) {
+
+    @Download.onTaskResume
+    void taskResume(DownloadTask task) {
         TextView textView = getTextViewByTask(task);
-        if(textView != null) {
+        if (textView != null) {
             textView.setText("恢复下载中");
         }
     }
+
     //在这里处理任务执行中的状态，如进度进度条的刷新
-    @Download.onTaskRunning protected void running(DownloadTask task) {
+    @Download.onTaskRunning
+    protected void running(DownloadTask task) {
         TextView textView = getTextViewByTask(task);
-        if(textView != null) {
+        if (textView != null) {
             textView.setText(String.format(Locale.CHINA, "%d%%", Math.abs(task.getPercent())));
         }
     }
 
-    @Download.onTaskStop void taskStop(DownloadTask task) {
+    @Download.onTaskStop
+    void taskStop(DownloadTask task) {
         TextView textView = getTextViewByTask(task);
-        if(textView != null) {
+        if (textView != null) {
             textView.setText(CommonUtil.CONTINUE_DOWNLOAD);
         }
     }
 
-    @Download.onNoSupportBreakPoint void onNoSupportBreakPoint(DownloadTask task) {
+    @Download.onNoSupportBreakPoint
+    void onNoSupportBreakPoint(DownloadTask task) {
     }
 
-    @Download.onTaskCancel void taskCancel(DownloadTask task) {
+    @Download.onTaskCancel
+    void taskCancel(DownloadTask task) {
         TextView textView = getTextViewByTask(task);
-        if(textView != null) {
+        if (textView != null) {
             textView.setText("已经取消");
         }
     }
 
-    @Download.onTaskFail void taskFail(DownloadTask task) {
+    @Download.onTaskFail
+    void taskFail(DownloadTask task) {
         TextView textView = getTextViewByTask(task);
-        if(textView != null) {
+        if (textView != null) {
             textView.setText(CommonUtil.FAIL_DOWNLOAD);
         }
     }
 
-    @Download.onTaskComplete void taskComplete(DownloadTask task) {
+    @Download.onTaskComplete
+    void taskComplete(DownloadTask task) {
         TextView textView = getTextViewByTask(task);
-        if(textView != null) {
+        if (textView != null) {
             textView.setText(CommonUtil.START_INSTALL);
         }
-        if(findApp != null && TextUtils.equals(task.getKey(), findApp.getDownload_link()))
+        if (findApp != null && TextUtils.equals(task.getKey(), findApp.getDownload_link()))
             findApp.updateState(DownloadTaskService.STATUS_FINISH);
     }
+
     @Subscribe
     public void onEventMainThread(Intent intent) {
-        if(intent != null && intent.getAction() != null && intent.getDataString() != null && intent.getDataString().contains("package:")){
-            String packageName = intent.getDataString().replace("package:","");
+        if (intent != null && intent.getAction() != null && intent.getDataString() != null && intent.getDataString().contains("package:")) {
+            String packageName = intent.getDataString().replace("package:", "");
 
             TextView textView = getTextViewByKey(packageName);
-            if(textView != null) {
-                switch (intent.getAction()){
+            if (textView != null) {
+                switch (intent.getAction()) {
                     case ACTION_PACKAGE_ADDED:
                         textView.setText(CommonUtil.GAME_OPEN);
                         break;
                     case ACTION_PACKAGE_REMOVED:
                         String path = PackageUtil.isExistsFile(packageName);
-                        if(TextUtils.isEmpty(path)) {
+                        if (TextUtils.isEmpty(path)) {
                             textView.setText(CommonUtil.START_DOWNLOAD);
                         } else {
                             textView.setText(CommonUtil.START_INSTALL);
@@ -410,14 +600,14 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
                 }
             }
 
-            if(findApp != null && TextUtils.equals(packageName, findApp.getPackage_names())){
-                switch (intent.getAction()){
+            if (findApp != null && TextUtils.equals(packageName, findApp.getPackage_names())) {
+                switch (intent.getAction()) {
                     case ACTION_PACKAGE_ADDED:
                         findApp.updateState(DownloadTaskService.STATUS_INSTALLED);
                         break;
                     case ACTION_PACKAGE_REMOVED:
                         String path = PackageUtil.isExistsFile(packageName);
-                        if(TextUtils.isEmpty(path)) {
+                        if (TextUtils.isEmpty(path)) {
                             findApp.updateState(DownloadTaskService.STATUS_INIT);
                         } else {
                             findApp.updateState(DownloadTaskService.STATUS_FINISH);
@@ -428,14 +618,17 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
         }
     }
 
+
     @Override
     protected void onResume() {
         super.onResume();
         taskHelper.onResume();
         Aria.download(this).unRegister();
         try {
-            if(find_information_content_wb != null){
-                find_information_content_wb.getClass().getMethod("onResume").invoke(find_information_content_wb, (Object[]) null);
+            if (webView != null) {
+                webView.resumeTimers();
+                webView.onResume();
+                webView.getClass().getMethod("onResume").invoke(webView, (Object[]) null);
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -445,21 +638,31 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
     @Override
     protected void onDestroy() {
         super.onDestroy();
+        LogUtil.logI("释放资源");
         EventBus.getDefault().unregister(this);
-        taskHelper.clear();
+        taskHelper.destroy();
+        if (webView != null) {
+            webView.onPause();
+            webView.freeMemory();
+            webView.removeAllViews();
+            webView.destroy();
+            webView = null;
+        }
+        ActFindInformation.this.finish();
     }
 
     @Override
     public void call(Integer integer) {
-        switch (integer){
+        switch (integer) {
             case 1://刷新底部
                 loadBottom(bottomViewGroup);
                 break;
         }
     }
+
     @Subscribe
-    public void onEventMainThread(BigEvent event){
-        switch (event.getEventTypes()){
+    public void onEventMainThread(BigEvent event) {
+        switch (event.getEventTypes()) {
             case ONFRESH_TRYMAKEMANY_PAGE:
                 taskHelper.refreshTask();
                 break;
@@ -469,9 +672,11 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
     @Override
     protected void onPause() {
         super.onPause();
-        if(find_information_content_wb != null){
+        if (webView != null) {
+            webView.onPause();
+            webView.pauseTimers();
             try {
-                find_information_content_wb.getClass().getMethod("onPause").invoke(find_information_content_wb,  (Object[])null);
+                webView.getClass().getMethod("onPause").invoke(webView, (Object[]) null);
             } catch (Exception e) {
                 e.printStackTrace();
             }

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

@@ -13,6 +13,7 @@ import com.sheep.gamegroup.presenter.LoginContract;
 import com.sheep.gamegroup.presenter.LoginPresenter;
 import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
@@ -94,6 +95,7 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
     private void goTelLogin() {
         LOGIN_PHONE.onEvent();
         String openId = SpUtils.getToken(getApplicationContext());
+        LogUtil.logI("手机号码登录--token----"+openId);
         if (!TextUtils.isEmpty(openId)) {
             Jump2View.getInstance().checkPhoneOrGoHomePage(this);
             finish();

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

@@ -176,10 +176,10 @@ public class PersonalInfoAct extends AbsChooseImageActivity {
                 ViewUtil.choiceSex(PersonalInfoAct.this, getCurrentFocus());
                 break;
             case R.id.llayout_birthday://用户生日
-                ViewUtil.showDateDialog(PersonalInfoAct.this, tvBirthday);
+                ViewUtil.showDateDialog(PersonalInfoAct.this, tvBirthday,userEntity.getBirthday()==null?"":userEntity.getBirthday());
                 break;
             case R.id.tv_birthday:
-                ViewUtil.showDateDialog(PersonalInfoAct.this, tvBirthday);
+                ViewUtil.showDateDialog(PersonalInfoAct.this, tvBirthday,userEntity.getBirthday()==null?"":userEntity.getBirthday());
                 break;
             case R.id.personal_info_avatar_container://头像
                 showChooseDialog();
@@ -275,7 +275,7 @@ public class PersonalInfoAct extends AbsChooseImageActivity {
 
     private void loadUserInfo() {
         tvSex.setText((userEntity.getGender()==0)?"点击设置":(userEntity.getGender()==1?"男":"女"));
-        tvBirthday.setText((userEntity.getBirthday().substring(0,1)).equals("0")?"点击设置":userEntity.getBirthday().substring(0,11));
+        tvBirthday.setText((userEntity.getBirthday().substring(0,1)).equals("0")?"点击设置":userEntity.getBirthday().substring(0,10));
         personal_info_name.setText(userEntity.getNickname());
         personal_info_code.setText(userEntity.getInvitation_code());
 

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

@@ -27,6 +27,7 @@ import com.sheep.gamegroup.util.ActivityManager;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.SelfCountDownTimer;
 import com.sheep.gamegroup.util.TestUtil;
@@ -319,6 +320,7 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
 
 
     private void goMain(String openId) {
+        LogUtil.logI("goMain--token----"+openId);
         SpUtils.saveToken(getApplicationContext(), openId);
         Jump2View.getInstance().goHomePageView(this, null);
         ActivityManager.getInstance().endActivity(LoginAct.class);

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

@@ -56,6 +56,7 @@ import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.LocationUtils;
+import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.MyListview;
 import com.sheep.gamegroup.util.SelfCountDownTimer;
@@ -167,6 +168,13 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     TextView end_of_time_tv;
     @BindView(R.id.num_tv)
     TextView num_tv;
+    @BindView(R.id.num_tv1)
+    TextView num_tv1;
+
+    @BindView(R.id.task_detail_reward)
+    TextView task_detail_reward;
+    @BindView(R.id.task_detail_cancel)
+    TextView task_detail_cancel;
 
     private Activity activity;
     @Inject
@@ -199,6 +207,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     }
 
     private boolean isFromTaskList = false;//是否是从任务记录界面过来
+
     @Override
     public void initView() {
         activity = this;
@@ -219,7 +228,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         detail_task_listview.setAdapter(adpTaskDetailChildListview);
         adpTaskDetailChildListview.notifyDataSetChanged();
         bottom_btn_layout.setVisibility(View.GONE);
-        if(DataUtil.IS_USE_SCREEN_SHOT) {
+        if (DataUtil.IS_USE_SCREEN_SHOT) {
             //如果要使用小绵羊截图方案，则在进入任务详情界面启动FloatShotScreenService，并获取截屏权限，并把intent data传递给FloatShotScreenService
             Jump2View.getInstance().startShotScreenFloat(SheepApp.getInstance(), null);
             DataUtil.getInstance().requestCapturePermission(activity, new Action1<Integer>() {
@@ -247,6 +256,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         detail_shrae_friend_layout.setVisibility(View.VISIBLE);
 
         taskEty = taskReleaseEty.getTask();
+        LogUtil.logI("taskType----->" + taskEty.getInspect_type());
         nameTv.setText(taskReleaseEty.getName() + "");
         priceTv.setText("+" + taskReleaseEty.getBonus() + "元");
         if (!taskReleaseEty.getDeadline().equals("永久")) {
@@ -256,6 +266,8 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         }
         num_tv.setText("剩" + taskReleaseEty.getLast_num() + "份");
 
+        TaskHelper.setTaskTagText(num_tv, taskReleaseEty);
+        TaskHelper.setNumText(num_tv1, taskReleaseEty);
 
         GlideImageLoader.setGameImage(iconIv, taskEty.getIcon());
 
@@ -282,9 +294,19 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
             detailTaskTv.setText("领取福利号");
             detailTaskTv.setBackground(activity.getResources().getDrawable(R.drawable.selector_button_full_main));
         }
+        //设置是否显示取消任务按钮
+        if(gettaskAcceptedEty != null && (gettaskAcceptedEty.getStatus() == 1 || gettaskAcceptedEty.getStatus() == 2) &&
+                taskEty.canCancelTask()){
+            task_detail_reward.setVisibility(View.GONE);
+            task_detail_cancel.setVisibility(View.VISIBLE);
+        } else {
+            task_detail_reward.setVisibility(View.VISIBLE);
+            task_detail_cancel.setVisibility(View.GONE);
+        }
         updateBottom();
     }
-    private void updateBottom(){
+
+    private void updateBottom() {
         bottom_btn_layout.setVisibility(View.VISIBLE);
         btnTaskItem.setVisibility(View.VISIBLE);
         btnUpImag.setVisibility(View.VISIBLE);
@@ -301,7 +323,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     setBottomState();
                     break;
             }
-        } else if(taskEty.isGameReservationCantDownload()){//游戏任务中还不可以下载的预约任务
+        } else if (taskEty.isGameReservationCantDownload()) {//游戏任务中还不可以下载的预约任务
             btnUpImag.setText("预约下载");
             btnTaskItem.setVisibility(View.GONE);
             btnUpImag.setVisibility(View.VISIBLE);
@@ -311,17 +333,17 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
             btnUpImag.setVisibility(View.GONE);
         }
         //2.6修改
-        if(btn_show)
+        if (btn_show)
             bottom_btn_layout.setVisibility(View.GONE);
 
         //任务已经下线
-        if(taskReleaseEty.getStatus() == 3 || taskReleaseEty.getStatus() == 4){
+        if (taskReleaseEty.getStatus() == 3 || taskReleaseEty.getStatus() == 4) {
             bottom_btn_layout.setVisibility(View.GONE);
         }
 
-        switch (taskEty.getTask_type()){
+        switch (taskEty.getTask_type()) {
             case 1000://连续任务
-                if(taskEty.isAppAutoCommitTask()){
+                if (taskEty.isAppAutoCommitTask()) {
                     setBottomState2();
                 } else {//非应用自动审核的连续任务
                     setSuccessionTaskBottomState();
@@ -342,13 +364,13 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         boolean hasChildRunning = taskEty.hasChildRunning();//有子任务正在进行
         boolean hasChildCanAccepted = taskEty.hasChildCanAccepted();//有子任务处于可领取状态
 
-        if(!hasChildFail && !hasChildRunning && hasChildCanAccepted){//没有审核失败的子任务和正在进行的子任务且有子任务处于可领取状态
+        if (!hasChildFail && !hasChildRunning && hasChildCanAccepted) {//没有审核失败的子任务和正在进行的子任务且有子任务处于可领取状态
             bottom_btn_layout.setVisibility(View.VISIBLE);
             btnTaskItem.setVisibility(View.VISIBLE);
             btnUpImag.setVisibility(View.GONE);
             btnTaskItem.setEnabled(true);
             btnTaskItem.setText("领取任务");
-        } else if(hasChildRunning){//有子任务正在进行
+        } else if (hasChildRunning) {//有子任务正在进行
             bottom_btn_layout.setVisibility(View.VISIBLE);
             btnTaskItem.setVisibility(View.VISIBLE);
             btnUpImag.setVisibility(View.VISIBLE);
@@ -358,7 +380,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
             btnUpImag.setText("上传截图");
 
             setBottomState();
-        } else if(hasChildFail) {
+        } else if (hasChildFail) {
             bottom_btn_layout.setVisibility(View.VISIBLE);
             btnTaskItem.setVisibility(View.VISIBLE);
             btnUpImag.setVisibility(View.VISIBLE);
@@ -369,7 +391,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         } else {
             setBottomState2();
         }
-        if(hasChildFail){
+        if (hasChildFail) {
             btnUpImag.setText(String.format(Locale.CHINA, "重新上传截图（第%d天）", failChildPosition + 1));
         }
     }
@@ -378,8 +400,8 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
      * 根据TaskAcceptedEty中的status来设置底部两个按钮的状态
      */
     private void setBottomState2() {
-        if(gettaskAcceptedEty != null){// && taskEty.getTask_type() == 1000) {//连续任务
-            if(!TextUtils.isEmpty(gettaskAcceptedEty.getScreenshots())) {
+        if (gettaskAcceptedEty != null) {// && taskEty.getTask_type() == 1000) {//连续任务
+            if (!TextUtils.isEmpty(gettaskAcceptedEty.getScreenshots())) {
                 //                detailTaskTv.setVisibility(View.VISIBLE);//不显示截图
             }
             switch (gettaskAcceptedEty.getStatus()) {
@@ -398,11 +420,11 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     bottom_btn_layout.setVisibility(View.GONE);
                     break;
                 case 3://完成任务
-                    if(!taskEty.isGameTask())
+                    if (!taskEty.isGameTask())
                         bottom_btn_layout.setVisibility(View.GONE);
                     break;
                 case 8://任务已经下线
-                    if(TextUtils.isEmpty(gettaskAcceptedEty.getScreenshots()) || gettaskAcceptedEty.getLower_num() > 0){//没有提交过截图或者已经提交过一次 下线失败后提交
+                    if (TextUtils.isEmpty(gettaskAcceptedEty.getScreenshots()) || gettaskAcceptedEty.getLower_num() > 0) {//没有提交过截图或者已经提交过一次 下线失败后提交
                         break;
                     } else {//提交过一次，但是审核失败或者没有审核就下线了
                         String sr = "重新提交（<font color='#e2271d'><big>最后一次机会</big></font>）";
@@ -412,7 +434,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                         break;
                     }
             }
-            if(taskEty.isGameReservationCantDownload()) {//游戏任务中还不可以下载的预约任务
+            if (taskEty.isGameReservationCantDownload()) {//游戏任务中还不可以下载的预约任务
                 btnUpImag.setText("即将开放");
                 btnUpImag.setEnabled(false);
                 btnUpImag.setVisibility(View.VISIBLE);
@@ -426,13 +448,13 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
      */
     private void setBottomState() {
         taskEty.setRunTask(1);
-        setBtnStr(taskEty, mDownloadTaskService, new Action1<Object>(){
+        setBtnStr(taskEty, mDownloadTaskService, new Action1<Object>() {
             @Override
             public void call(Object o) {
-                if(o instanceof Integer){
+                if (o instanceof Integer) {
                     type = (int) o;
-                    if(taskEty.isGameTask()) {//游戏任务
-                        switch (type){
+                    if (taskEty.isGameTask()) {//游戏任务
+                        switch (type) {
                             case DownloadTaskService.STATUS_INIT:
                                 btnUpImag.setVisibility(View.GONE);
                                 btnTaskItem.setText(CommonUtil.GAME_DOWNLOAD);
@@ -442,7 +464,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                                 btnTaskItem.setText(CommonUtil.GAME_INSTALL);
                                 break;
                             case DownloadTaskService.STATUS_INSTALLED:
-                                if (gettaskAcceptedEty.getStatus() ==3) {
+                                if (gettaskAcceptedEty.getStatus() == 3) {
                                     btnUpImag.setText(CommonUtil.GAME_RECHAGE);
                                     btnUpImag.setVisibility(View.VISIBLE);
                                     btnTaskItem.setText("启动游戏");
@@ -469,9 +491,9 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                                 break;
                         }
                     }
-                } else if( o instanceof String){
+                } else if (o instanceof String) {
                     btnTaskItem.setText((String) o);
-                } else if( o instanceof Boolean){
+                } else if (o instanceof Boolean) {
                     btnTaskItem.setEnabled((Boolean) o);
                 }
             }
@@ -479,7 +501,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     }
 
     private void loadOld() {
-        if(taskEty.isOldTask()){
+        if (taskEty.isOldTask()) {
             detail_item_layout_2.setVisibility(View.VISIBLE);
             detail_item_layout_3.setVisibility(View.VISIBLE);
             detail_task_listview.setVisibility(View.VISIBLE);
@@ -544,7 +566,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                         buttonStr = CommonUtil.CONTINUE_DOWNLOAD;
                         break;
                     case DownloadTaskService.STATUS_FINISH:
-                        if(isExistApk){
+                        if (isExistApk) {
                             action1.call(DownloadTaskService.STATUS_FINISH);
                             buttonStr = CommonUtil.START_INSTALL;
                         } else {
@@ -575,12 +597,12 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
      */
     private DownloadTaskService mDownloadTaskService;
 
-    @OnClick({R.id.detail_task_tv, R.id.web_text, R.id.ll_infos, R.id.btn_task_item, R.id.btn_up_imag, R.id.detail_share_friend_tv})
+    @OnClick({R.id.detail_task_tv, R.id.web_text, R.id.ll_infos, R.id.btn_task_item, R.id.btn_up_imag, R.id.detail_share_friend_tv, R.id.task_detail_cancel})
     public void onViewClicked(View view) {
         try {
             switch (view.getId()) {
                 case R.id.detail_task_tv://查看任务截图
-                    if(taskEty.isGameTask() &&taskEty.isCan_receive_account()){
+                    if (taskEty.isGameTask() && taskEty.isCan_receive_account()) {
 
                         GAME_INSTEAD_OF_RECHARGE_GET.onEvent();
                         CommonUtil.getInstance()
@@ -664,13 +686,13 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     }
                     break;
                 case R.id.btn_up_imag:
-                    if(gettaskAcceptedEty != null && gettaskAcceptedEty.getStatus() ==3 &&taskEty.isGameTask()){
-                        if(taskEty.getThird_task_id() != null){
+                    if (gettaskAcceptedEty != null && gettaskAcceptedEty.getStatus() == 3 && taskEty.isGameTask()) {
+                        if (taskEty.getThird_task_id() != null) {
                             ViewUtil.showGamePayAccount(activity, taskEty.getThird_task_id(), taskReleaseEty.getName());
                             return;
                         }
-                    }else if(taskEty.isGameTask()){
-                        if(taskEty.isGameReservationCantDownload()){
+                    } else if (taskEty.isGameTask()) {
+                        if (taskEty.isGameReservationCantDownload()) {
                             CommonUtil.getInstance().reservationGameTask(activity, taskReleaseEty, new Action1<Integer>() {
                                 @Override
                                 public void call(Integer integer) {
@@ -681,7 +703,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                         } else {
                             accepteReceiveAward();
                         }
-                    }else if(taskEty.getInspect_type() == 3) {//应用自动审核任务
+                    } else if (taskEty.getInspect_type() == 3) {//应用自动审核任务
                         try {
                             checkAndCommitTask();
                         } catch (Exception e) {
@@ -692,7 +714,21 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     }
                     break;
                 case R.id.detail_share_friend_tv:
-                    Jump2View.getInstance().tryShare(activity,"task_desc_url", "task_id", releaseTaskId);
+                    Jump2View.getInstance().tryShare(activity, "task_desc_url", "task_id", releaseTaskId);
+                    break;
+                case R.id.task_detail_cancel://尝试取消任务
+                    if(gettaskAcceptedEty != null && gettaskAcceptedEty.getId() > 0)
+                        取消任务(gettaskAcceptedEty.getId(), new Action1<Integer>() {
+                            @Override
+                            public void call(Integer integer) {
+                                hideProgress();
+                                gettaskAcceptedEty = null;
+                                taskReleaseEty = null;
+                                CommonUtil.getInstance().setTAskEnty(null);
+                                DataUtil.getInstance().setTaskListChanged();
+                                presenter.taskDesc(releaseTaskId);
+                            }
+                        });
                     break;
             }
         } catch (Exception e) {
@@ -705,7 +741,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
      * 发起选择图片来上传截图
      */
     private void commitScreenShot() {
-        switch (taskEty.getTask_type()){
+        switch (taskEty.getTask_type()) {
             case 1000://连续任务
                 commitScreenShotTaskId = taskEty.getCanCommitChildRelease_task_id();
                 break;
@@ -713,7 +749,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                 commitScreenShotTaskId = taskReleaseEty.getAccepted_task_id() == 0 && gettaskAcceptedEty != null ? gettaskAcceptedEty.getId() : taskReleaseEty.getAccepted_task_id();
                 break;
         }
-        if(commitScreenShotTaskId > 0) {
+        if (commitScreenShotTaskId > 0) {
             if (DataUtil.IS_USE_SCREEN_SHOT) {//小绵羊截图方案
                 File dir = DataUtil.getInstance().getScreenShotsDir(taskEty.getPackage_names());
                 showChooseDialog(false, true, DEFAULT_MAX_COUNT, dir);
@@ -730,16 +766,18 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
      * 尝试提交应用自动审核任务
      */
     private void checkAndCommitTask() {
-        if(taskEty != null && taskReleaseEty != null) {
-            if(TextUtils.isEmpty(taskEty.getPackage_names())){
+        if (taskEty != null && taskReleaseEty != null) {
+            if (TextUtils.isEmpty(taskEty.getPackage_names())) {
                 G.showToast(R.string.error_package_link);
                 return;
             }
             String gps = LocationUtils.getInstance().getLongitudeLatitude();
             JSONObject object = new JSONObject();
             object.put("gps", gps);
+
             long runTime = AppUsageManager.getInstance().getTotalTimeInForeground(taskEty.getPackage_names());
-            if(runTime <= 0){//时间小于等于0则不提交
+
+            if (runTime <= 0) {//时间小于等于0则不提交
                 G.showToast("该任务时长未达到，请继续去体验应用哦！");
                 return;
             }
@@ -747,7 +785,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
             MyDbManager.getInstance().removeAppRecord();//删除记录表 5.0及以下使用
             AutoTaskListUtil.getInstance().resetReceiveTaskTime();//重置比对时间  5.1及以上使用
 
-            object.put("task_time", runTime/1000);
+            object.put("task_time", runTime / 1000);
             object.put("release_task_id", taskReleaseEty.getId());
             addTaskChildId(object, taskEty);
             SheepApp.getInstance().getNetComponent().getApiService().commitAutoTask(object)
@@ -758,11 +796,11 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                         public void onNext(BaseMessage baseMessage) {
                             CommonUtil.getInstance().setTAskEnty(null);
                             String amount = taskReleaseEty.getBonus();
-                            try{
-                                Map h = JSON.parseObject(baseMessage.getData() +"");
+                            try {
+                                Map h = JSON.parseObject(baseMessage.getData() + "");
 
                                 amount = h.get("amount") + "";
-                            }catch (Exception e){
+                            } catch (Exception e) {
                                 e.printStackTrace();
                             }
 
@@ -773,6 +811,8 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                         @Override
                         public void onError(BaseMessage baseMessage) {
                             G.showToast("该任务时长未达到，请继续去体验应用哦！");
+                            //时间重置
+                            MyDbManager.getInstance().retAppUsageTime(taskEty.getPackage_names());
                         }
                     });
         } else {
@@ -782,14 +822,15 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
 
     /**
      * 添加子任务id参数
+     *
      * @param object
      * @param taskEty
      */
     private void addTaskChildId(JSONObject object, TaskEty taskEty) {
-        switch (taskEty.getTask_type()){
+        switch (taskEty.getTask_type()) {
             case 1000://连续任务
                 int task_child_id = taskEty.getCanAcceptedChildId();
-                if(task_child_id < 1){
+                if (task_child_id < 1) {
                     G.showToast("暂无可以领取的任务");
                     return;
                 }
@@ -812,8 +853,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                 } else if (PackageUtil.isAppInstalled(SheepApp.mContext, taskEty.getPackage_names())) {
                     llInfos.addView(getStep("APP下载", "已完成", 0));
                     llInfos.addView(getStep("完成任务", "进行中", 1));
-                }
-                else {
+                } else {
                     llInfos.addView(getStep("APP下载", "待完成", 2));
                 }
             } else {
@@ -856,12 +896,12 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
 //                            onGetNetImageUrl(data);
         dismissLoaddingDialog();
         G.showToast("提交成功，等待审核!");
-        if(DataUtil.IS_USE_SCREEN_SHOT) {//小绵羊截图方案：上传截图成功后删除之前的截图
+        if (DataUtil.IS_USE_SCREEN_SHOT) {//小绵羊截图方案：上传截图成功后删除之前的截图
             DataUtil.getInstance().clearScreenShots();
         }
 
         UMConfigUtils.finishTask();
-        if(taskEty.hasCommitLast(commitScreenShotTaskId)){//非自动审核任务中的连续任务已经提交了最后一个子任务，或者普通任务提交截图成功
+        if (taskEty.hasCommitLast(commitScreenShotTaskId)) {//非自动审核任务中的连续任务已经提交了最后一个子任务，或者普通任务提交截图成功
             if (isFromTaskList)//之前界面为任务记录界面，需要回调刷新任务记录列表
                 setResult(RESULT_OK);
             finish();
@@ -904,7 +944,9 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     protected void onGetImage(String path) {
 
     }
+
     private int commitScreenShotTaskId;
+
     @Override
     protected void onSetNetImageUrl(String data) {
         setLoaddingText("提交中");
@@ -926,30 +968,17 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        switch (requestCode){
+        switch (requestCode) {
             case 0:
                 if (resultCode == RESULT_OK) {
-                    if (taskReleaseEty.getAccepted_task_id() > 0) {
-                        showProgress(true);
-                        SheepApp.getInstance()
-                                .getNetComponent()
-                                .getApiService()
-                                .giveUpTask(taskReleaseEty.getAccepted_task_id())
-                                .subscribeOn(Schedulers.io())
-                                .observeOn(AndroidSchedulers.mainThread())
-                                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
-                                    @Override
-                                    public void onError(BaseMessage baseMessage) {
-                                        hideProgress();
-                                        G.showToast(baseMessage);
-                                    }
-
-                                    @Override
-                                    public void onNext(BaseMessage baseMessage) {
-                                        CommonUtil.getInstance().setTAskEnty(null);
-                                        acceptedTask();
-                                    }
-                                });
+                    if (taskReleaseEty != null && taskReleaseEty.getAccepted_task_id() > 0) {
+                        取消任务(taskReleaseEty.getAccepted_task_id(), new Action1<Integer>() {
+                            @Override
+                            public void call(Integer integer) {
+                                CommonUtil.getInstance().setTAskEnty(null);
+                                acceptedTask();
+                            }
+                        });
                     }
                 }
                 break;
@@ -963,6 +992,29 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         }
     }
 
+    private void 取消任务(int id, final Action1<Integer> action1) {
+        showProgress(true);
+        SheepApp.getInstance()
+                .getNetComponent()
+                .getApiService()
+                .giveUpTask(id)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        hideProgress();
+                        G.showToast(baseMessage);
+                    }
+
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        if(action1 != null)
+                            action1.call(1);
+                    }
+                });
+    }
+
     /**
      * 领取任务
      */
@@ -1045,7 +1097,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                 int p = task.getPercent();    //任务进度百分比
                 String speed = task.getConvertSpeed();    //转换单位后的下载速度，单位转换需要在配置文件中打开
 //                long speed1 = task.getSpeed(); //原始byte长度速度
-                btnTaskItem.setText(String.format(Locale.CHINA, "%d%%",Math.abs(p)));
+                btnTaskItem.setText(String.format(Locale.CHINA, "%d%%", Math.abs(p)));
                 System.out.println("Aria p " + p + ", speed = " + speed);
             }
         } catch (Exception e) {
@@ -1106,7 +1158,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     @Override
     protected void onResume() {
         super.onResume();
-        if (taskReleaseEty == null || isFresh){
+        if (taskReleaseEty == null || isFresh) {
             isFresh = true;
             freshData();
         } else {
@@ -1118,16 +1170,17 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
      * 子任务模块显示
      */
     TaskdetailSonListviewAdp sonListviewAdp;
-    private void setSonVuewShow(){
+
+    private void setSonVuewShow() {
         boolean isSuccession = false;
         item_layout.setBackgroundResource(R.drawable.sp_bg_white_solid_top);
         detail_task_recyclerview.setVisibility(View.GONE);
         ems_game_layout.setVisibility(View.GONE);
         taskdetail_user_use_layout.setVisibility(View.GONE);
         taskdetail_explain_layout.setVisibility(View.GONE);
-        switch (taskEty.getTask_type()){
+        switch (taskEty.getTask_type()) {
             case 1000://连续任务
-                if(taskEty.getChild() != null && taskEty.getChild().size() > 0 && taskEty.getChild().get(0).getDescEntityList() != null){
+                if (taskEty.getChild() != null && taskEty.getChild().size() > 0 && taskEty.getChild().get(0).getDescEntityList() != null) {
                     detail_task_recyclerview.setVisibility(View.VISIBLE);
                     detail_item_layout_2.setVisibility(View.GONE);
                     detail_item_layout_3.setVisibility(View.GONE);
@@ -1140,7 +1193,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     TaskHelper.setSelectFlag(taskEty);
                     detail_task_recyclerview.setAdapter(sonListviewAdp);
                     isSuccession = true;
-                }else {
+                } else {
 
                     isSuccession = false;
                 }
@@ -1163,11 +1216,11 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         }
 
         //非连续任务且非游戏任务且应用自动审核时长任务  使用TaskdetailSonListviewAdp显示单个任务详情
-        if(!isSuccession && !ListUtil.isEmpty(taskEty.getDescEntityList())){
+        if (!isSuccession && !ListUtil.isEmpty(taskEty.getDescEntityList())) {
             List<TaskChild> descEntityArrayList = new ArrayList<>();
             TaskChild taskChild = new TaskChild();
             taskChild.setDescEntityList(taskEty.getDescEntityList());
-            if(!taskEty.isGameTask() && !taskEty.isAppAutoCommitTask()) {
+            if (!taskEty.isGameTask() && !taskEty.isAppAutoCommitTask()) {
                 List<ScreenshotsEntity> listS = new ArrayList<>();
                 if (taskEty.getDescEntityList() != null && taskEty.getDescEntityList().size() > 0) {
                     listS.clear();
@@ -1197,7 +1250,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         }
 
         //截至时间
-        if(gettaskAcceptedEty != null &&taskReleaseEty != null && gettaskAcceptedEty.isIs_running() && gettaskAcceptedEty.getEnd_time() > 0){
+        if (gettaskAcceptedEty != null && taskReleaseEty != null && gettaskAcceptedEty.isIs_running() && gettaskAcceptedEty.getEnd_time() > 0) {
             CommonUtil.getInstance().getHashMap(end_of_time_tv);
 
             end_of_time_tv.setVisibility(View.VISIBLE);
@@ -1206,7 +1259,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
             selfCountDownTimer.start();
 
             CommonUtil.getInstance().addTimerHashMap(end_of_time_tv, selfCountDownTimer);
-        }else {
+        } else {
             end_of_time_tv.setVisibility(View.GONE);
         }
 
@@ -1216,7 +1269,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     /**
      * 领取奖励
      */
-    private void accepteReceiveAward(){
+    private void accepteReceiveAward() {
         showProgress();
         SheepApp.getInstance()
                 .getNetComponent()
@@ -1236,7 +1289,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                         hideProgress();
 //                        G.showToast(taskReleaseEty.getBonus() + "元");
                         ViewUtil.showMsgDialog(activity,
-                                "恭喜你获得"+taskReleaseEty.getBonus() + "元奖励",
+                                "恭喜你获得" + taskReleaseEty.getBonus() + "元奖励",
                                 "提示",
                                 true);
 //                        finish();
@@ -1250,16 +1303,16 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     /**
      * 获取接受的任务详情
      */
-    private void getAcceptedTaskDetail(final int releaseTaskId){
+    private void getAcceptedTaskDetail(final int releaseTaskId) {
         showProgress();
         CommonUtil.getInstance().getTaskAllDetail(releaseTaskId, new Action1<BaseMessage>() {
             @Override
             public void call(BaseMessage baseMessage) {
-                if(baseMessage.getCode() == 0)
+                if (baseMessage.getCode() == 0)
                     gettaskAcceptedEty = baseMessage.getData(TaskAcceptedEty.class);
-                if(gettaskAcceptedEty != null)
+                if (gettaskAcceptedEty != null)
                     taskReleaseEty = gettaskAcceptedEty.getRelease_task();
-                if(taskReleaseEty == null){
+                if (taskReleaseEty == null) {
                     initTaskReleaseEty();
                 } else {
                     hideProgress();

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

@@ -1,9 +1,9 @@
 package com.sheep.gamegroup.view.customview;
 
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.View;
-import android.webkit.WebView;
+        import android.content.Context;
+        import android.util.AttributeSet;
+        import android.view.View;
+        import android.webkit.WebView;
 
 /**
  * WebViewForScrollView

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

@@ -23,11 +23,36 @@ public class SpUtils {
         editor.apply();
     }
 
+    /**
+     * 存入一些小型的用户数据
+     *
+     * @param key   ,
+     * @param value ,
+     */
+    public static void saveOrder(String key, int value) {
+        SharedPreferences user = SheepApp.mContext.getSharedPreferences("user", Context.MODE_PRIVATE);
+        SharedPreferences.Editor editor = user.edit();
+        editor.putInt(key, value);
+        editor.apply();
+    }
+
+    /**
+     * 获取user表的用户数据
+     *
+     * @param key ，
+     * @return value
+     * ，
+     */
+    public static int getOrder(String key) {
+        SharedPreferences user = SheepApp.mContext.getSharedPreferences("user", Context.MODE_PRIVATE);
+        return user.getInt(key, 0);
+    }
 
     /**
      * 点击事件 记录,是否在提示
+     *
      * @param context
-     * @param vaule 0：提示 1：这一次不提示 2：永远不提示
+     * @param vaule   0：提示 1：这一次不提示 2：永远不提示
      */
     public static void saveDownNotice(Context context, int vaule) {
         SharedPreferences user = context.getSharedPreferences("btn_download_notice", Context.MODE_PRIVATE);
@@ -49,8 +74,9 @@ public class SpUtils {
 
     /**
      * 储存设备id
-     * @param context
-     * @param vaule
+     *
+     * @param context ，
+     * @param vaule   ，
      */
     public static void saveDeviceIds(Context context, String vaule) {
         SharedPreferences user = context.getSharedPreferences("save_deviced_id", Context.MODE_PRIVATE);
@@ -68,6 +94,7 @@ public class SpUtils {
 
     /**
      * 保存要忽略的版本的md5值，只能忽略一个
+     *
      * @param vaule
      */
     public static void saveIgnoreMd5(String vaule) {
@@ -76,6 +103,7 @@ public class SpUtils {
         editor.putString("ignore_md5", vaule);
         editor.apply();
     }
+
     public static String getIgnoreMd5() {
         SharedPreferences user = SheepApp.getInstance().getSharedPreferences("save_data", Context.MODE_PRIVATE);
         return user.getString("ignore_md5", "");

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

@@ -47,7 +47,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
-        android:layout_marginBottom="40dp"
+        android:layout_marginBottom="30dp"
         android:background="@drawable/shape_get_redpackage_text_yellow"
         android:gravity="center"
         android:text="收下红包"

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

@@ -46,7 +46,8 @@
 
     <LinearLayout
         android:id="@+id/order_layout"
-        style="@style/style_item_container">
+        style="@style/style_item_container"
+        android:visibility="gone">
 
         <ImageView
             style="@style/style_item_img"
@@ -62,7 +63,8 @@
 
     </LinearLayout>
 
-    <View style="@style/style_item_line_new" />
+    <View style="@style/style_item_line_new"
+        android:visibility="gone"/>
 
     <View
         android:id="@+id/proxy_service_layout_line"

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

@@ -24,7 +24,8 @@
             android:src="@mipmap/invition_redpackage"
             android:layout_gravity="center_horizontal"
             android:layout_marginBottom="30dp"
-            android:layout_marginTop="20dp"/>
+            android:layout_marginTop="20dp"
+            android:visibility="invisible"/>
     </LinearLayout>
 
 

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

@@ -153,14 +153,30 @@
                                 android:layout_height="0dp"
                                 android:layout_weight="3"/>
 
-                            <TextView
-                                android:id="@+id/num_tv"
-                                android:layout_width="wrap_content"
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:text=""
-                                android:textSize="@dimen/text_size_2"
-                                android:textColor="@color/txt_black_818181"/>
+                                android:gravity="center_vertical"
+                                android:orientation="horizontal">
 
+                                <TextView
+                                    android:id="@+id/num_tv"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text=""
+                                    android:textSize="@dimen/text_size_2"
+                                    android:textColor="@color/txt_black_818181"/>
+                                <TextView
+                                    android:id="@+id/num_tv1"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginStart="@dimen/content_padding"
+                                    android:text=""
+                                    android:textColor="@color/txt_black_818181"
+                                    android:textSize="@dimen/text_size_2"
+                                    android:visibility="gone" />
+                            </LinearLayout>
                             <View
                                 android:layout_width="match_parent"
                                 android:layout_height="0dp"
@@ -195,6 +211,7 @@
                                 android:textSize="@dimen/text_size_20"
                                 android:layout_gravity="center_horizontal"/>
                             <TextView
+                                android:id="@+id/task_detail_reward"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:text="任务奖励"
@@ -202,6 +219,12 @@
                                 android:layout_gravity="center_horizontal"
                                 android:textColor="@color/txt_black_818181"/>
                             <TextView
+                                android:id="@+id/task_detail_cancel"
+                                style="@style/style_button_find"
+                                android:text="取消任务"
+                                android:textSize="@dimen/text_size_2"
+                                android:visibility="gone"/>
+                            <TextView
                                 android:id="@+id/detail_task_tv"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"