bug修改

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

@@ -61,6 +61,7 @@ import com.sheep.gamegroup.presenter.TryMakeMoneyPresenter;
 import com.sheep.gamegroup.util.AppUtil;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.ConnectAddress;
+import com.sheep.gamegroup.util.ImageGlarryDrawable;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.PreferenceUtils;
@@ -173,7 +174,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                 case 1:
                     if(releaseEtyLists != null && releaseEtyLists.size()>0){
 
-                        position++;
                         tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RELEASE_TASK, releaseEtyLists), position);
                     }
                     tryMakeMoneyAdp.notifyDataSetChanged();
@@ -535,11 +535,13 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
 
         try {
+            position = 0;
             BaseMessage baseMessage = (BaseMessage) o;
             TaskAcceptedEty taskAcceptedEty = JSONObject.parseObject(JSONObject.toJSONString(baseMessage.getData()), TaskAcceptedEty.class);
             tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RUN_TASK, taskAcceptedEty), position);
             tryMakeMoneyAdp.addPresenter(tryMakeMoneyPresenter);
             tryMakeMoneyAdp.setTaskAcceptedEty(taskAcceptedEty);
+            position++;
 //            mhandler.sendEmptyMessage(0);
         } catch (Exception e) {
             e.printStackTrace();
@@ -571,6 +573,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     public void releaseTaskTaskUpdataView(Object o) {
 
         releaseEtyLists.clear();
+        position = 0;
         try {
             BaseMessage baseMessage = (BaseMessage) o;
             List<TaskReleaseEty> releaseEtyList = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), TaskReleaseEty.class);
@@ -618,7 +621,10 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             List<SlideshowEty> slideshowEtyList = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), SlideshowEty.class);
             if (slideshowEtyList != null && slideshowEtyList.size()>0) {
                 slideshowEtyLists.clear();
-                slideshowEtyLists.addAll(slideshowEtyList);
+                for(SlideshowEty slideshowEty:slideshowEtyList){
+                    slideshowEty.setObjects(CommonUtil.getInstance().getValue(slideshowEty.getExt()));
+                    slideshowEtyLists.add(slideshowEty);
+                }
 
                 bindBanner();
             }else {
@@ -804,25 +810,22 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     }
 
 
-    private ImageGlarry mImageGlarryStr;
+    private ImageGlarryDrawable mImageGlarryStr;
     private void bindBanner() {
         homepage_item_banner_layout.setVisibility(View.VISIBLE);
-        ArrayList<String> imgURL = new ArrayList<>();
-        for (SlideshowEty indexBanner : slideshowEtyLists) {
-            imgURL.add(indexBanner.getUrl());
-        }
         if (mImageGlarryStr != null) {
-            mImageGlarryStr.init(imgURL.toArray(new String[]{}), ImageView.ScaleType.CENTER_CROP);
+            mImageGlarryStr.init((ArrayList<SlideshowEty>) slideshowEtyLists, ImageView.ScaleType.CENTER_CROP);
             mImageGlarryStr.notifyAll();
             return;
         }
-        mImageGlarryStr = new ImageGlarry((Activity) mContext, viewpager_banner, group_banner);
-        mImageGlarryStr.init(imgURL.toArray(new String[]{}), ImageView.ScaleType.CENTER_CROP);
+        mImageGlarryStr = new ImageGlarryDrawable((Activity) mContext, viewpager_banner, group_banner);
+        mImageGlarryStr.init((ArrayList<SlideshowEty>) slideshowEtyLists, ImageView.ScaleType.CENTER_CROP);
         mImageGlarryStr.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                 SlideshowEty clickedGameObj = slideshowEtyLists.get(position);
 
+                UMConfigUtils.onEvent(UMConfigUtils.Event.BANNER_CLICK_HORIZONTAL);
                 switch (clickedGameObj.getType()) {// 0,类型 1跳转试玩赚钱、2单个任务详情、3信用卡办理、4 H5页面
                     case 1:
                         Jump2View.getInstance()

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

@@ -17,11 +17,20 @@ public class SlideshowEty {
             private int Type = 1;// 0,类型 1跳转试玩赚钱、2单个任务详情、3信用卡办理、4 H5页面
             private String UpdateTime;// 0,
             private String Url;// private String stringprivate String
+    private String Title;
 
     private String objects;//预留字段
 
+    public String getTitle() {
+        return Title;
+    }
+
+    public void setTitle(String title) {
+        Title = title;
+    }
+
     public String getObjects() {
-        return objects = CommonUtil.getInstance().getValue(getExt());
+        return objects;
     }
 
     public void setObjects(String objects) {

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

@@ -18,8 +18,18 @@ public class TaskAcceptedEty implements Serializable{
     private String uid;// 0,
     private String update_time;// 0
 
+    private long end_time;
+
     private TaskReleaseEty release_task;
 
+    public long getEnd_time() {
+        return end_time;
+    }
+
+    public void setEnd_time(long end_time) {
+        this.end_time = end_time;
+    }
+
     public String getCreate_time() {
         return create_time;
     }

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

@@ -15,6 +15,7 @@ import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
 import java.io.File;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Map;
 
 /**
  * 一些公用的class
@@ -180,9 +181,10 @@ public class CommonUtil {
     /**
      * 任务倒计时
      * 组装String
+     * 若00:00:00后任务未完成，视为自动放弃，您可重新接受
      */
     public String assemblyString(String date){
-        String str = "若<font color='#ff2d4b'><small>" + date + "</small></font>后任务未完成，该任务自动取消，您可以重新接受该任务";
+        String str = "若<font color='#ff2d4b'><small>" + date + "</small></font>后任务未完成，视为自动放弃，您可重新接受";
         return str;
     }
     /**
@@ -205,9 +207,9 @@ public class CommonUtil {
     public String getValue(String json){
         try{
             JSONObject jsonObject = JSONObject.parseObject(json);
-            Iterator iterator = (Iterator) jsonObject.values();
-            while (iterator.hasNext()){
-                return (String) iterator.next();
+            for (Map.Entry<String, Object> entry : jsonObject.entrySet()) {
+                System.out.println(entry.getKey() + ":" + entry.getValue());
+                return (String)  entry.getValue();
             }
         }catch (Exception e){
             e.printStackTrace();

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

@@ -6,6 +6,8 @@ import android.os.Handler;
 import android.os.Message;
 import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.ViewPager;
+import android.text.TextUtils;
+import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
@@ -13,10 +15,13 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.kfzs.duanduan.view.ImageGlarry;
+import com.sheep.gamegroup.model.entity.SlideshowEty;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.G;
 
@@ -31,9 +36,9 @@ public class ImageGlarryDrawable {
     private Activity mActivity;
     private ViewPager mViewPager;
     private RadioGroup mRadioGroup;
-    private List<Drawable> mList = new ArrayList<>();
+    private List<SlideshowEty> mList = new ArrayList<>();
     private int mIntDelayTime = 4000;
-    private List<ImageView> mListImages = new ArrayList<>();
+    private List<RelativeLayout> mListImages = new ArrayList<>();
     private View mLastSelect;
     private boolean mIsMoved = false;
 
@@ -48,7 +53,7 @@ public class ImageGlarryDrawable {
         this.mIntDelayTime = mIntDelayTime;
     }
 
-    public ImageGlarryDrawable init(Drawable[] pics) {
+    public ImageGlarryDrawable init(ArrayList<SlideshowEty> pics) {
         return init(pics, ImageView.ScaleType.CENTER_INSIDE);
     }
 
@@ -57,21 +62,42 @@ public class ImageGlarryDrawable {
      *
      * @param pics 图片Url完整地址。
      */
-    public ImageGlarryDrawable init(Drawable[] pics, ImageView.ScaleType scaleType) {
+    public ImageGlarryDrawable init(ArrayList<SlideshowEty> pics, ImageView.ScaleType scaleType) {
         int pos = 0;
         mList.clear();
         mListImages.clear();
         mLastSelect = null;
         mRadioGroup.removeAllViews();
         //防止loading图案被放得很大很大
-        for (Drawable pic : pics) {
+        for (SlideshowEty pic : pics) {
             mList.add(pic);
+            RelativeLayout relativeLayout = new RelativeLayout(mActivity);
+            relativeLayout.setLayoutParams(new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT , RelativeLayout.LayoutParams.WRAP_CONTENT));
+            TextView textView = new TextView(mActivity);
+
+            RelativeLayout.LayoutParams textViewLayoutParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
+            textViewLayoutParams.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
+            textView.setLayoutParams(textViewLayoutParams);
+            textView.setText(pic.getTitle()+"");
+            textView.setTextColor(mActivity.getResources().getColor(R.color.white));
+            textView.setGravity(Gravity.CENTER);
+            textView.setPadding(3, 3, 3, 3);
+            textView.setBackgroundColor(mActivity.getResources().getColor(R.color.dark));
+            textView.getBackground().mutate().setAlpha(100);
+
+
             ImageView imageView = new ImageView(mActivity);
+            imageView.setLayoutParams(new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT , RelativeLayout.LayoutParams.MATCH_PARENT));
             imageView.setOnClickListener(new ImageGlarryDrawable.cls_main(pos));
-//            imageView.setScaleType(scaleType);
-            imageView.setImageDrawable(pic);
-//            Glide.with(mActivity).load(pic).apply(new RequestOptions().dontAnimate()).into(imageView);
-            mListImages.add(imageView);
+            imageView.setScaleType(scaleType);
+            Glide.with(mActivity).load(pic.getUrl()).apply(new RequestOptions().dontAnimate()).into(imageView);
+
+            relativeLayout.addView(imageView);
+            if(!TextUtils.isEmpty(pic.getTitle())){
+                relativeLayout.addView(textView);
+            }
+
+            mListImages.add(relativeLayout);
 
 
             RadioButton radioButton = (RadioButton) View.inflate(mActivity, R.layout.rbt_dot, null);

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

@@ -55,6 +55,8 @@ public class UMConfigUtils {
         SHEEP_CREDIT_CARD_DETAIL                    ,//信用卡任务列表界面 -> 信用卡任务接受列表 -> 信用卡任务详情界面
         SHEEP_CREDIT_CARD_DETAIL_WEB                ,//信用卡任务列表界面 -> 信用卡任务接受列表 -> 信用卡任务详情界面 -> 申请信用卡web界面
         SHEEP_CREDIT_CARD_PROGRESS_QUERY            ,//信用卡任务列表界面 ->信用卡任务进度查询列表 -> 信用卡任务进度查询
+        TASK_START_APP            ,//打开任务应用或游戏
+        TASK_INSTALL_APP            ,//安装应用
         ;
         private String key;
         Event(String key){
@@ -112,9 +114,13 @@ public class UMConfigUtils {
      * @param event
      */
     public static void onEvent(Event event){
-        MobclickAgent.onEvent(SheepApp.mContext,event.getKey());
+        try{
+            MobclickAgent.onEvent(SheepApp.mContext,event.getKey());
 
-        AppStatistics.getInstance().sendDataToServer(AppStatisticsConfig.SuperType.ONCLICK_EVENT, event.getId(),"");
+            AppStatistics.getInstance().sendDataToServer(AppStatisticsConfig.SuperType.ONCLICK_EVENT, event.getId(),"");
+        }catch (Exception e){
+            e.printStackTrace();
+        }
 
     }
 

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

@@ -246,6 +246,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
                         //发送红点信息
                         EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.TIPS_DOWN_ICON));
                     }
+                    UMConfigUtils.onEvent(UMConfigUtils.Event.TASK_DOWNLOAD);
                     break;
                 case 3://开始安装
                     isDownLoad = PackageUtil.isAppInstalled(SheepApp.mContext, task_entity.getPackage_names());
@@ -272,6 +273,13 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
                             .goHomePageView(activity, 3);
 //                    finish();
                     break;
+                case 10://信用卡
+
+                    if(!TextUtils.isEmpty(task_entity.getExt())){
+                        Jump2View.getInstance()
+                                .goWebview(activity, task_entity.getExt());
+                    }
+                    break;
             }
         }catch (Exception e){
             e.printStackTrace();
@@ -305,6 +313,10 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
             type = 4;
             buttonStr = CommonUtil.START_TASK;
             dialogItemSizeTv.setVisibility(View.INVISIBLE);
+        }else if(task_entity.getTask_type() == 4){//h5
+            type = 10;
+            buttonStr = CommonUtil.START_TASK;
+            dialogItemSizeTv.setVisibility(View.INVISIBLE);
         }
         else{
             //Todo 以后整理，现在加了个type=3

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

@@ -258,26 +258,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         switch (taskEty.getTask_type()){
             case 1:
                 if(taskReleaseEty.isIs_running()){
-                    type = 0;
-                    if (PackageUtil.isAppInstalled(SheepApp.mContext, taskEty.getPackage_names())) {
-                        type = 3;
-                        btnTaskItem.setText("开始游戏");
-                    }else if(!TextUtils.isEmpty(PackageUtil.isExistsFile(activity, taskEty.getPackage_names(), ""))){
-                        type = 2;
-                        btnTaskItem.setText("开始安装");
-                    }
-                    else {
-                        DownLoadInfo downLoadInfo = DDProviderHelper.getInstance()
-                                .getDownloadTaskToPackname(activity, taskEty.getPackage_names());
-                        if(downLoadInfo != null && !TextUtils.isEmpty(downLoadInfo.getMApkPath())){
-                            type = 2;
-                            btnTaskItem.setText("开始安装");
-                        }else {
-                            type = 1;
-                            btnTaskItem.setText("下载游戏");
-                        }
-
-                    }
+                    setBtnStr(taskEty.getTask_type());
                 }else {
                     type = -1;
                     btnTaskItem.setText("领取任务");
@@ -288,26 +269,8 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                 break;
             case 3:
                 if(taskReleaseEty.isIs_running()){
-                    type = 0;
-                    if (PackageUtil.isAppInstalled(SheepApp.mContext, taskEty.getPackage_names())) {
-                        type = 3;
-                        btnTaskItem.setText("打开应用");
-                    }else if(!TextUtils.isEmpty(PackageUtil.isExistsFile(activity, taskEty.getPackage_names(), ""))){
-                        type = 2;
-                        btnTaskItem.setText("开始安装");
-                    }
-                    else {
-                        DownLoadInfo downLoadInfo = DDProviderHelper.getInstance()
-                                .getDownloadTaskToPackname(activity, taskEty.getPackage_names());
-                        if(downLoadInfo != null && !TextUtils.isEmpty(downLoadInfo.getMApkPath())){
-                            type = 2;
-                            btnTaskItem.setText("开始安装");
-                        }else {
-                            type = 1;
-                            btnTaskItem.setText("下载应用");
-                        }
 
-                    }
+                    setBtnStr(taskEty.getTask_type());
                 }else {
                     type = -1;
                     btnTaskItem.setText("领取任务");
@@ -324,6 +287,13 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                 break;
 
         }
+        if(type >= 3){
+
+            btnUpImag.setVisibility(View.VISIBLE);
+        }else {
+
+            btnUpImag.setVisibility(View.GONE);
+        }
 //        if(taskEty.getTask_type() == 2){
 //            btnTaskItem.setText("信用卡注册");
 //        }
@@ -331,6 +301,54 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         taskSchedule();
     }
 
+    private void setBtnStr(int taskType){
+
+        DownloadTarget task = Aria.download(this).load(taskEty.getDownload_link());
+        int taskState = task.getTaskState();
+        String buttonStr = "";
+        switch (taskState) {
+            case IEntity.STATE_RUNNING:
+                type = 1;
+                buttonStr = task.getPercent() + "%";
+                break;
+            case IEntity.STATE_STOP:
+                type = 1;
+                buttonStr = CommonUtil.CONTINUE_DOWNLOAD;
+                break;
+            case IEntity.STATE_COMPLETE:
+                if (PackageUtil.isAppInstalled(SheepApp.mContext, taskEty.getPackage_names())) {
+                    type = 3;
+                    if(taskType == 3){//应用
+                        buttonStr = CommonUtil.OPEN_APPLY;
+
+                    }else {
+                        buttonStr = CommonUtil.START_PLAY;
+
+                    }
+                }else if(!TextUtils.isEmpty(PackageUtil.isExistsFile(activity, taskEty.getPackage_names(), ""))){
+                    type = 2;
+                    btnTaskItem.setText("开始安装");
+                    buttonStr = CommonUtil.START_INSTALL;
+                }
+                else {
+                    type = 1;
+                    task.resetState();
+                    buttonStr = CommonUtil.START_DOWNLOAD;
+
+                }
+                break;
+            case IEntity.STATE_FAIL:
+                type = 1;
+                buttonStr = CommonUtil.FAIL_DOWNLOAD;
+                break;
+            default:
+                type = 1;
+                buttonStr = CommonUtil.START_DOWNLOAD;
+                break;
+        }
+        btnTaskItem.setText(buttonStr+"");
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -403,7 +421,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     case 3:
                         PackageUtil.startApp(SheepApp.mContext, taskEty.getPackage_names());
                         break;
-                    case 4:
+                    case 10:
                         if(!TextUtils.isEmpty(taskEty.getExt())){
                             Jump2View.getInstance()
                                     .goWebview(activity, taskEty.getExt());
@@ -515,7 +533,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     protected void onSetNetImageUrl(String data) {
         setLoaddingText("提交中");
         JSONObject jsonObject = new JSONObject();
-        jsonObject.put("id", taskEty.getAcceptedTaskId());
+        jsonObject.put("id", taskReleaseEty.getAccepted_task_id());
         jsonObject.put("screenshots",data+"");
         jsonObject.put("remark",taskEty.getRemarks()+"");
         jsonObject.put("package_name",taskEty.getPackage_names()+"");
@@ -584,57 +602,94 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     public void onNext(BaseMessage baseMessage) {
                         hideProgress();
                         initData();
+                        EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.ONFRESH_TRYMAKEMANY_PAGE));
                     }
                 });
     }
     @Download.onPre void onPre(DownloadTask task) {
+        if(taskEty == null){
+            return;
+        }
         if(task.getKey().equals(taskEty.getDownload_link())) {
+            if(taskEty == null){
+                return;
+            }
             btnTaskItem.setText("准备下载中");
         }
     }
     @Download.onTaskStart void taskStart(DownloadTask task) {
+        if(taskEty == null){
+            return;
+        }
         if(task.getKey().equals(taskEty.getDownload_link())) {
             btnTaskItem.setText("开始下载中");
         }
     }
     @Download.onTaskResume void taskResume(DownloadTask task) {
+        if(taskEty == null){
+            return;
+        }
         if(task.getKey().equals(taskEty.getDownload_link())) {
             btnTaskItem.setText("恢复下载中");
         }
     }
     //在这里处理任务执行中的状态，如进度进度条的刷新
     @Download.onTaskRunning protected void running(DownloadTask task) {
-        if(task.getKey().equals(taskEty.getDownload_link())) {
-            int p = task.getPercent();    //任务进度百分比
-            String speed = task.getConvertSpeed();    //转换单位后的下载速度，单位转换需要在配置文件中打开
-            long speed1 = task.getSpeed(); //原始byte长度速度
-            btnTaskItem.setText(p + "%");
-            System.out.println("Aria p " + p + ", speed = " + speed);
+        if(taskEty == null){
+            return;
+        }
+        try{
+            if(task.getKey().equals(taskEty.getDownload_link())) {
+                int p = task.getPercent();    //任务进度百分比
+                String speed = task.getConvertSpeed();    //转换单位后的下载速度，单位转换需要在配置文件中打开
+                long speed1 = task.getSpeed(); //原始byte长度速度
+                btnTaskItem.setText(p + "%");
+                System.out.println("Aria p " + p + ", speed = " + speed);
+            }
+        }catch (Exception e){
+            e.printStackTrace();
         }
     }
 
     @Download.onTaskStop void taskStop(DownloadTask task) {
+        if(taskEty == null){
+            return;
+        }
         if(task.getKey().equals(taskEty.getDownload_link())) {
             btnTaskItem.setText(CommonUtil.CONTINUE_DOWNLOAD);
         }
     }
 
     @Download.onTaskCancel void taskCancel(DownloadTask task) {
+        if(taskEty == null){
+            return;
+        }
         if(task.getKey().equals(taskEty.getDownload_link())) {
             btnTaskItem.setText("已经取消");
         }
     }
 
     @Download.onTaskFail void taskFail(DownloadTask task) {
+        if(taskEty == null){
+            return;
+        }
         if(task.getKey().equals(taskEty.getDownload_link())) {
             btnTaskItem.setText(CommonUtil.FAIL_DOWNLOAD);
         }
     }
 
     @Download.onTaskComplete void taskComplete(DownloadTask task) {
+        if(taskEty == null){
+            return;
+        }
         if(task.getKey().equals(taskEty.getDownload_link())) {
             //在这里处理任务完成的状态
             btnTaskItem.setText(CommonUtil.START_INSTALL);
         }
     }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+    }
 }

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

@@ -53,6 +53,26 @@ public class TryMakeMoneyact extends BaseActivity {
 //        mAdapter.add(FgtTryMakeMoney2.newInstance(1), titles[1]);
         pager.setAdapter(mAdapter);
         indicator.setupWithViewPager(pager);
+        indicator.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
+            @Override
+            public void onTabSelected(TabLayout.Tab tab) {
+                if(0 == tab.getPosition()){
+                    mAdapter.getItem(tab.getPosition()).onResume();
+                } else {
+                    mAdapter.getItem(tab.getPosition()).onResume();
+                }
+            }
+
+            @Override
+            public void onTabUnselected(TabLayout.Tab tab) {
+
+            }
+
+            @Override
+            public void onTabReselected(TabLayout.Tab tab) {
+
+            }
+        });
 
     }
 
@@ -73,4 +93,16 @@ public class TryMakeMoneyact extends BaseActivity {
     protected void onStop() {
         super.onStop();
     }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        try{
+            if(mAdapter != null){
+                mAdapter.getItem(0).onResume();
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
 }

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

@@ -48,10 +48,10 @@ public class WebviewAct extends BaseActivity {
         webSettings.setJavaScriptEnabled(true);
         //设置编码方式
         webSettings.setDefaultTextEncodingName("utf-8");
-        activityWebview.setWebChromeClient(new chromClient());
+//        activityWebview.setWebChromeClient(new chromClient());
 
         if(TextUtils.isEmpty(url)){
-            activityWebview.loadUrl("file:///android_asset/sheep_show.html");
+//            activityWebview.loadUrl("file:///android_asset/sheep_show.html");
 
         }else {
             activityWebview.loadUrl(url);

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

@@ -325,7 +325,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                         taskEty.setAcceptedTaskId(etyList.get(i).getId());
                         taskEty.setName(etyList.get(i).getRelease_task().getName());
 //                        Jump2View.getInstance().goTaskDetailView(context, taskEty, taskAcceptedEty);
-                        Jump2View.getInstance().goTaskDetailView(context,  taskAcceptedEty.getRelease_task().getId());
+                        Jump2View.getInstance().goTaskDetailView(context,  etyList.get(i).getRelease_task().getId());
                         UMConfigUtils.onEvent(UMConfigUtils.Event.TASK_DETAIL);
                     }
                 });
@@ -334,7 +334,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 /**
                  * 倒计时
                  */
-                if(etyList.get(i).getRelease_task().getCancel_duration() > 0){
+                if(etyList.get(i).getEnd_time() > 0){
                     final TextView countdown_tv = viewHolder.itemView.findViewById(R.id.countdown_tv);
                     SelfCountDownTimer scTimer = timerHashMap.get(countdown_tv);
                     if(scTimer != null){
@@ -345,7 +345,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                     countdown_tv.setVisibility(View.VISIBLE);
                     String sr = "若<font color='#ff2d4b'><small>" + "" + "</small></font>后任务未完成，该任务自动取消，您可以重新接受该任务";
                     countdown_tv.setText(sr+"");
-                    SelfCountDownTimer selfCountDownTimer = new SelfCountDownTimer( etyList.get(i).getRelease_task().getCancel_duration() * 1000, 1000,(int)etyList.get(i).getRelease_task().getCancel_duration()) {
+                    SelfCountDownTimer selfCountDownTimer = new SelfCountDownTimer( etyList.get(i).getEnd_time() * 1000, 1000,(int)etyList.get(i).getRelease_task().getCancel_duration()) {
                         @Override
                         public void onTimerRest() {
                             countdown_tv.setText("");

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

@@ -1,6 +1,7 @@
 package com.sheep.gamegroup.view.fragment;
 
 import android.app.Activity;
+import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -10,6 +11,7 @@ import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.RelativeLayout;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -56,6 +58,8 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     RecyclerView recyclerview;
     @BindView(R.id.refresh)
     SwipeRefreshLayout refresh;
+    @BindView(R.id.download_mgr_empty_view)
+    RelativeLayout download_mgr_empty_view;
     Unbinder unbinder;
 
     @Inject
@@ -75,6 +79,10 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
             tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RELEASE_TASK, releaseEtyLists),position);
             tryMakeMoneyAdp.getmListDatas();
             tryMakeMoneyAdp.refreshAdapter();
+            if(tryMakeMoneyAdp.getmListDatas() == null || tryMakeMoneyAdp.getmListDatas().size() <1){
+
+//                download_mgr_empty_view.setVisibility(View.VISIBLE);
+            }
 //            recyclerview.setAdapter(tryMakeMoneyAdp);
         }
     };
@@ -172,6 +180,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         });
     }
     public void initData() {
+        download_mgr_empty_view.setVisibility(View.GONE);
         position = 0;
         tryMakeMoneyAdp.clear();
         tryMakeMoneyAdp.addType(type);
@@ -241,6 +250,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     public void returnTaskTaskUpdataView(Object o) {
 
         try{
+            position = 0;
             BaseMessage baseMessage = (BaseMessage) o;
             TaskAcceptedEty taskAcceptedEty = JSONObject.parseObject(JSONObject.toJSONString(baseMessage.getData()), TaskAcceptedEty.class);
             tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RUN_TASK, taskAcceptedEty),position);
@@ -281,6 +291,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     public void releaseTaskTaskUpdataView(Object o) {
         releaseEtyLists.clear();
         try{
+            position = 0;
             BaseMessage baseMessage = (BaseMessage) o;
             List<TaskReleaseEty> releaseEtyList = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), TaskReleaseEty.class);
             if(releaseEtyList != null){
@@ -364,4 +375,26 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
             tryMakeMoneyAdp.cancelAllTimers();
         }
     }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (presenter != null) {
+            initData();
+        }
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        try {
+
+            if(tryMakeMoneyAdp != null){
+
+                tryMakeMoneyAdp.refreshAdapter();
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
 }

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

@@ -20,6 +20,7 @@ import android.widget.Toast;
 import com.mylhyl.acp.Acp;
 import com.mylhyl.acp.AcpListener;
 import com.mylhyl.acp.AcpOptions;
+import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 
 import java.io.File;
@@ -115,6 +116,7 @@ public class PackageUtil {
     * install app
     */
     public static void installApk(final Context context,final String path) {
+        UMConfigUtils.onEvent(UMConfigUtils.Event.TASK_INSTALL_APP);
         install(context, path);
 //        if (Build.VERSION.SDK_INT >= 26) {//判读版本是否在8.0以上
 //
@@ -185,6 +187,7 @@ public class PackageUtil {
             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             context.startActivity(intent);
         }
+        UMConfigUtils.onEvent(UMConfigUtils.Event.TASK_START_APP);
     }
 
     //判断程序是否前台运行；
@@ -219,6 +222,11 @@ public class PackageUtil {
         if (!mApkPath.exists()) {
             return null;
         }else{
+//            mApkPath.length();
+            Log.e("length-------",mApkPath.length()+"");
+            Log.e("getTotalSpace-------",mApkPath.getTotalSpace()+"");
+            Log.e("getFreeSpace-------",mApkPath.getFreeSpace()+"");
+            Log.e("getUsableSpace-------",mApkPath.getUsableSpace()+"");
             return mApkPath.getAbsolutePath();
         }
     }

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

@@ -5,6 +5,10 @@
     android:orientation="vertical"
     android:background="@color/bg_gray">
 
+    <include
+        layout="@layout/empty_view"
+        android:visibility="gone"/>
+
 
     <android.support.v4.widget.SwipeRefreshLayout
         android:id="@+id/refresh"