Pārlūkot izejas kodu

引导页面添加跳过;修复进行中任务可能重合的bug

zengjiebin 7 gadi atpakaļ
vecāks
revīzija
3f4657ead8
21 mainītis faili ar 56 papildinājumiem un 680 dzēšanām
  1. 0 3
      app/src/main/AndroidManifest.xml
  2. 8 3
      app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java
  3. 0 16
      app/src/main/java/com/sheep/gamegroup/di/components/TaskDialogComponent.java
  4. 1 1
      app/src/main/java/com/sheep/gamegroup/heler/DownloadHelper.java
  5. 1 3
      app/src/main/java/com/sheep/gamegroup/heler/FindAppHelper.java
  6. 1 1
      app/src/main/java/com/sheep/gamegroup/heler/ImageListHelper.java
  7. 1 3
      app/src/main/java/com/sheep/gamegroup/heler/TaskHelper.java
  8. 1 1
      app/src/main/java/com/sheep/gamegroup/model/entity/FindApp.java
  9. 1 1
      app/src/main/java/com/sheep/gamegroup/model/entity/TaskReleaseEty.java
  10. 1 1
      app/src/main/java/com/sheep/gamegroup/model/entity/XiaomiGameEntity.java
  11. 0 11
      app/src/main/java/com/sheep/gamegroup/util/Jump2View.java
  12. 1 2
      app/src/main/java/com/sheep/gamegroup/view/activity/ActFindGame.java
  13. 1 3
      app/src/main/java/com/sheep/gamegroup/view/activity/ActFindInformation.java
  14. 9 1
      app/src/main/java/com/sheep/gamegroup/view/activity/ActGuide.java
  15. 0 477
      app/src/main/java/com/sheep/gamegroup/view/activity/DialogActivity.java
  16. 2 4
      app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAct.java
  17. 1 1
      app/src/main/java/com/sheep/gamegroup/view/adapter/TryMakeMoneyAdp.java
  18. 8 3
      app/src/main/java/com/sheep/gamegroup/view/fragment/FgtTryMakeMoney.java
  19. 18 1
      app/src/main/res/layout/act_guide.xml
  20. 0 141
      app/src/main/res/layout/download_item_dialog.xml
  21. 1 3
      app/src/main/res/values/strings.xml

+ 0 - 3
app/src/main/AndroidManifest.xml

@@ -189,9 +189,6 @@
             android:screenOrientation="portrait"/>
         <activity android:name="com.sheep.gamegroup.view.activity.LieMakeMoneyAct"
             android:launchMode="singleTask"/>
-        <activity android:name="com.sheep.gamegroup.view.activity.DialogActivity"
-            android:theme="@style/MyDialogActivityTheme"
-            />
         <activity android:name="com.sheep.gamegroup.view.activity.TaskListAct"
             android:screenOrientation="portrait"/>
         <activity android:name="com.sheep.gamegroup.view.activity.GameTaskOrderListAct"

+ 8 - 3
app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

@@ -169,6 +169,8 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     private AdpHomeListGrideview adpHomeListGrideview;
     private AdpHomeListListview adpHomeListListview;
 
+    private static final int LIST_COUNT = 2;//tryMakeMoneyAdp 总共有2条数据
+    private static final RecyleObj NULL = RecyleObj.make(RecyleType.NONE, null);//空数据
     Handler mHanderl = new Handler(Looper.getMainLooper()) {
         @Override
         public void handleMessage(Message msg) {
@@ -183,7 +185,10 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                         tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RUN_TASK, allTaskAcceptedTaskList), position++);
                     }
                     if(!ListUtil.isEmpty(releaseEtyLists)) {
-                        tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RELEASE_TASK, releaseEtyLists), position);
+                        tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RELEASE_TASK, releaseEtyLists), position++);
+                    }
+                    while(position < LIST_COUNT){
+                        tryMakeMoneyAdp.add(NULL, position++);
                     }
                     tryMakeMoneyAdp.notifyDataSetChanged();
                     checkAndInitView();
@@ -422,8 +427,8 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         recyclerview.setHasFixedSize(true);
         recyclerview.setNestedScrollingEnabled(false);
         tryMakeMoneyAdp = new TryMakeMoneyAdp(activity, 1);//1代表来自主页
-        for (int i = 0; i < 2; i++) {
-            tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.NONE, null));
+        for (int i = 0; i < LIST_COUNT; i++) {
+            tryMakeMoneyAdp.add(NULL);
         }
         tryMakeMoneyAdp.addType(1);
         tryMakeMoneyAdp.setIs_succession(3);

+ 0 - 16
app/src/main/java/com/sheep/gamegroup/di/components/TaskDialogComponent.java

@@ -1,16 +0,0 @@
-package com.sheep.gamegroup.di.components;
-
-import com.sheep.gamegroup.di.modules.TaskDialogModule;
-import com.sheep.gamegroup.di.scopes.UserScope;
-import com.sheep.gamegroup.view.activity.DialogActivity;
-
-import dagger.Component;
-
-/**
- * Created by ljy on 2018/3/22.
- */
-@UserScope
-@Component(modules = TaskDialogModule.class, dependencies = NetComponent.class)
-public interface TaskDialogComponent {
-    void inject(DialogActivity dialogActivity);
-}

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/heler/DownloadHelper.java

@@ -1,4 +1,4 @@
-package com.sheep.gamegroup.heler;
+package com.sheep.gamegroup.helper;
 
 import android.app.Activity;
 import android.text.TextUtils;

+ 1 - 3
app/src/main/java/com/sheep/gamegroup/heler/FindAppHelper.java

@@ -1,18 +1,16 @@
-package com.sheep.gamegroup.heler;
+package com.sheep.gamegroup.helper;
 
 import android.app.Activity;
 import android.view.Gravity;
 import android.view.View;
 import android.widget.TextView;
 
-import com.alibaba.fastjson.JSON;
 import com.kfzs.duanduan.services.DownloadTaskService;
 import com.sheep.gamegroup.model.api.IDownload;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.DialogConfig;
 import com.sheep.gamegroup.model.entity.FindApp;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
-import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.TimeUtil;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.jiuyan.samllsheep.SheepApp;

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/heler/ImageListHelper.java

@@ -1,4 +1,4 @@
-package com.sheep.gamegroup.heler;
+package com.sheep.gamegroup.helper;
 
 import android.app.Activity;
 import android.support.v7.widget.LinearLayoutManager;

+ 1 - 3
app/src/main/java/com/sheep/gamegroup/heler/TaskHelper.java

@@ -1,4 +1,4 @@
-package com.sheep.gamegroup.heler;
+package com.sheep.gamegroup.helper;
 
 import android.app.Activity;
 import android.text.TextUtils;
@@ -29,8 +29,6 @@ import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
 
-import org.afinal.simplecache.ApiKey;
-
 import java.util.List;
 import java.util.Locale;
 

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

@@ -1,7 +1,7 @@
 package com.sheep.gamegroup.model.entity;
 
 import com.sheep.gamegroup.model.api.IDownload;
-import com.sheep.gamegroup.heler.FindAppHelper;
+import com.sheep.gamegroup.helper.FindAppHelper;
 
 /**
  * Created by realicing on 2018/6/28.

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/model/entity/TaskReleaseEty.java

@@ -2,7 +2,7 @@ package com.sheep.gamegroup.model.entity;
 
 import android.text.TextUtils;
 
-import com.sheep.gamegroup.heler.DownloadHelper;
+import com.sheep.gamegroup.helper.DownloadHelper;
 
 import java.io.Serializable;
 

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/model/entity/XiaomiGameEntity.java

@@ -2,7 +2,7 @@ package com.sheep.gamegroup.model.entity;
 
 import android.text.TextUtils;
 
-import com.sheep.gamegroup.heler.DownloadHelper;
+import com.sheep.gamegroup.helper.DownloadHelper;
 import com.sheep.gamegroup.model.api.IDownload;
 
 import java.io.Serializable;

+ 0 - 11
app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -66,7 +66,6 @@ import com.sheep.gamegroup.view.activity.ChangeTelAct;
 import com.sheep.gamegroup.view.activity.ChangeWxOrTelAct;
 import com.sheep.gamegroup.view.activity.CommitWxAct;
 import com.sheep.gamegroup.view.activity.CommitWxCodeAct;
-import com.sheep.gamegroup.view.activity.DialogActivity;
 import com.sheep.gamegroup.view.activity.DialogToastAct;
 import com.sheep.gamegroup.view.activity.FeedbackAct;
 import com.sheep.gamegroup.view.activity.GameTaskOrderListAct;
@@ -529,16 +528,6 @@ public class Jump2View {
         context.startActivity(intent);
     }
 
-    /**
-     * 跳出弹框页面
-     * @param context
-     * @param curTask
-     */
-    public synchronized void goDialogActivityView(Context context, TaskEty curTask){
-        Intent intent = new Intent(context, DialogActivity.class);
-        intent.putExtra("task_entity", curTask);
-        context.startActivity(intent);
-    }
 
     /**
      * 跳转到信用卡任务详情界面

+ 1 - 2
app/src/main/java/com/sheep/gamegroup/view/activity/ActFindGame.java

@@ -26,7 +26,7 @@ import com.kfzs.duanduan.services.DownloadTaskService;
 import com.kfzs.duanduan.utils.StatusBarUtils;
 import com.kfzs.duanduan.utils.dlg.HelperUtils;
 import com.sheep.gamegroup.absBase.BaseActivity;
-import com.sheep.gamegroup.heler.ImageListHelper;
+import com.sheep.gamegroup.helper.ImageListHelper;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.FindApp;
 import com.sheep.gamegroup.model.entity.FindAppScore;
@@ -65,7 +65,6 @@ import static android.content.Intent.ACTION_PACKAGE_ADDED;
 import static android.content.Intent.ACTION_PACKAGE_REMOVED;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.FIND_SCORE;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.FIND_SHARE;
-import static com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp.PUBLIC_TAG_PREFIX_TEXTVIEW_LIST;
 
 /**
  * Created by realicing on 2018/5/10.

+ 1 - 3
app/src/main/java/com/sheep/gamegroup/view/activity/ActFindInformation.java

@@ -12,7 +12,6 @@ import android.webkit.WebView;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.alibaba.fastjson.JSON;
 import com.arialyy.annotations.Download;
 import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.download.DownloadTask;
@@ -28,9 +27,8 @@ 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.heler.TaskHelper;
+import com.sheep.gamegroup.helper.TaskHelper;
 import com.sheep.gamegroup.util.TimeUtil;
 import com.sheep.gamegroup.util.ViewHolder;
 import com.sheep.gamegroup.util.ViewUtil;

+ 9 - 1
app/src/main/java/com/sheep/gamegroup/view/activity/ActGuide.java

@@ -91,7 +91,7 @@ public class ActGuide extends BaseActivity {
         if (event.getEventTypes() == EventTypes.GUIDE_NEXT) {
             int index = guide_vp.getCurrentItem() + 1;
             if(index == ids.length)
-                Jump2View.getInstance().gotoMain(this);
+                toSkipNext(null);
             else
                 guide_vp.setCurrentItem(index);
         }
@@ -101,4 +101,12 @@ public class ActGuide extends BaseActivity {
         EventBus.getDefault().unregister(this);
         super.onDestroy();
     }
+
+    /**
+     * 点击跳过
+     * @param view
+     */
+    public void toSkipNext(View view) {
+        Jump2View.getInstance().gotoMain(this);
+    }
 }

+ 0 - 477
app/src/main/java/com/sheep/gamegroup/view/activity/DialogActivity.java

@@ -1,477 +0,0 @@
-package com.sheep.gamegroup.view.activity;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Build;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
-import android.text.TextUtils;
-import android.view.View;
-import android.webkit.WebChromeClient;
-import android.webkit.WebResourceRequest;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-import android.widget.ImageView;
-import android.widget.TextView;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.arialyy.annotations.Download;
-import com.arialyy.aria.core.Aria;
-import com.arialyy.aria.core.download.DownloadTarget;
-import com.arialyy.aria.core.download.DownloadTask;
-import com.arialyy.aria.core.inf.IEntity;
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.RequestOptions;
-import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
-import com.kfzs.duanduan.event.BigEvent;
-import com.kfzs.duanduan.event.EventTypes;
-import com.kfzs.duanduan.services.DownloadTaskService;
-import com.kfzs.duanduan.utils.ApkUtils;
-import com.sheep.gamegroup.di.components.DaggerTaskDialogComponent;
-import com.sheep.gamegroup.di.modules.TaskDialogModule;
-import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.entity.DialogEntity;
-import com.sheep.gamegroup.model.entity.Ext;
-import com.sheep.gamegroup.model.entity.TaskEty;
-import com.sheep.gamegroup.model.entity.TaskState;
-import com.sheep.gamegroup.model.util.EntityUtils;
-import com.sheep.gamegroup.model.util.SheepSubscriber;
-import com.sheep.gamegroup.presenter.TaskDialogContract;
-import com.sheep.gamegroup.presenter.TaskDialogPresenter;
-import com.sheep.gamegroup.util.CommonUtil;
-import com.sheep.gamegroup.util.DeviceUtil;
-import com.sheep.gamegroup.util.Jump2View;
-import com.sheep.gamegroup.util.MyListview;
-import com.sheep.gamegroup.util.UMConfigUtils;
-import com.sheep.gamegroup.view.adapter.TaskStateAdapter;
-import com.sheep.jiuyan.samllsheep.BuildConfig;
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.utils.G;
-import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
-
-
-import org.greenrobot.eventbus.EventBus;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.functions.Action1;
-import rx.schedulers.Schedulers;
-
-/**
- * 弹框activity
- * Created by ljy on 2018/3/20.
- */
-
-public class DialogActivity extends Activity implements TaskDialogContract.View {
-
-    @BindView(R.id.dialog_item_icon_iv)
-    ImageView dialogItemIconIv;
-    @BindView(R.id.dialog_item_name_tv)
-    TextView dialogItemNameTv;
-    @BindView(R.id.dialog_item_size_tv)
-    TextView dialogItemSizeTv;
-    @BindView(R.id.doalog_item_get_rewards_tv)
-    TextView doalogItemGetRewardsTv;
-    @BindView(R.id.webview)
-    WebView webview;
-    @BindView(R.id.start_task_tv)
-    TextView start_task_tv;
-    @BindView(R.id.dialog_title)
-    TextView dialog_title;
-    @BindView(R.id.listview)
-    MyListview listview;
-    private TaskEty taskEty;
-    private List<TaskState> stateList = new ArrayList<>();//状态列表
-    private TaskStateAdapter stateAdapter;
-
-    private int type = -1;//0,领取任务 1,开始试玩 2,开始下载 3,开始安装;4,信用卡跳转
-    private String buttonStr = CommonUtil.GET_TASK;
-    private Activity activity;
-
-    /**
-     * 下载模块修改
-     */
-    private DownloadTaskService mDownloadTaskService;
-
-    @Inject
-    TaskDialogPresenter preference;
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.download_item_dialog);
-        ButterKnife.bind(this);
-        activity = this;
-
-        taskEty = (TaskEty) getIntent().getSerializableExtra("task_entity");
-        if (taskEty == null) {
-            finish();
-            return;
-        }
-        initViews();
-        initDatas();
-        Aria.download(this).register();
-        mDownloadTaskService = new DownloadTaskService(this);
-    }
-
-    private void initDatas() {
-        webview.loadUrl(taskEty.getBoot_address());
-        Glide.with(this)
-                .load(taskEty.getIcon())
-                .apply(new RequestOptions().dontAnimate())
-                .into(dialogItemIconIv);
-        dialogItemNameTv.setText(taskEty.getName());
-        dialogItemSizeTv.setText( taskEty.getPackage_size() + "M");
-        dialog_title.setText(taskEty.getTask_name());
-
-        preference.getTaskState(taskEty.getRelease_task_id());
-
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        setBtnState();
-    }
-
-    private void initViews() {
-        DaggerTaskDialogComponent.builder()
-                .netComponent(SheepApp.get(DialogActivity.this).getNetComponent())
-                .taskDialogModule(new TaskDialogModule(this))
-                .build()
-                .inject(DialogActivity.this);
-        webview.setWebChromeClient(new WebChromeClient() {
-
-        });
-        webview.getSettings().setJavaScriptEnabled(true);
-        webview.setWebViewClient(new WebViewClient() {
-            @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-            @Override
-            public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
-                view.loadUrl(request.getUrl().toString());
-                return true;
-            }
-        });
-        stateAdapter = new TaskStateAdapter(activity, stateList);
-        listview.setAdapter(stateAdapter);
-        stateAdapter.notifyDataSetChanged();
-
-
-    }
-
-    @OnClick({R.id.doalog_item_get_rewards_tv, R.id.dialog_close, R.id.start_task_tv})
-    public void onViewClicked(View view) {
-        switch (view.getId()) {
-            case R.id.doalog_item_get_rewards_tv:
-                Jump2View.getInstance().tryGoWithdrawal(activity, null);
-                finish();
-                break;
-            case R.id.dialog_close:
-                finish();
-                break;
-            case R.id.start_task_tv:
-                startStask();
-                break;
-        }
-    }
-
-    /**
-     * 开始任务或者下载游戏、试玩
-     */
-    private void startStask() {
-        DownloadTarget task = null;
-        try{
-            switch (type){
-                case -1://领取任务
-                    if(taskEty.getAcceptedTaskId() < 1){//没有正在进行的任务
-                        acceptedTask();
-                    } else {//先取消正在进行的任务
-
-                        Jump2View.getInstance()
-                                .goNoticeAct(activity, new DialogEntity(null,
-                                        "是否放弃正在运行中的任务?",
-                                        "是",
-                                        "否",
-                                        null));
-
-                    }
-                    break;
-                case DownloadTaskService.STATUS_INSTALLED://开始试玩
-                    toTestPlay();
-                    break;
-                case DownloadTaskService.STATUS_INIT://开始下载
-                    if(taskEty.needDownloadApp()){
-                        if(TextUtils.isEmpty(taskEty.getDownload_link()) || !taskEty.getDownload_link().contains("http")){
-                            G.showToast(R.string.error_download_link);
-                            return;
-                        }
-                        task = Aria.download(this).load(taskEty.getDownload_link());
-                    }
-                    final DownLoadInfo downLoadInfo = mDownloadTaskService.getDownloadTaskByUrl(taskEty);
-                    if(task != null) {
-                        if (task.getTaskState() == IEntity.STATE_RUNNING) {
-                            task.stop();
-                        } else if (task.getTaskState() == IEntity.STATE_FAIL) {
-                            task.cancel(true);
-                            task.removeRecord();
-                        } else {
-                            mDownloadTaskService.start(downLoadInfo);
-                        }
-                        new Thread(new Runnable() {
-                            @Override
-                            public void run() {
-                                if(mDownloadTaskService.addDownloadTask(downLoadInfo)){
-                                    //发送红点信息
-                                    EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.TIPS_DOWN_ICON));
-                                }
-                            }
-                        }).start();
-                    }
-                    UMConfigUtils.onEvent(UMConfigUtils.Event.TASK_DOWNLOAD);
-                    break;
-                case DownloadTaskService.STATUS_FINISH://开始安装
-                    final DownLoadInfo downLoadInfo1 = mDownloadTaskService.getDownloadTaskByUrl(taskEty);
-                    boolean isInstalled = PackageUtil.isAppInstalled(SheepApp.mContext, taskEty.getPackage_names());
-                    if(isInstalled){
-                        if(taskEty.getTask_type() != 3){
-                            start_task_tv.setText(CommonUtil.OPEN_APPLY);
-                        }else {
-                            start_task_tv.setText(CommonUtil.START_PLAY);
-                        }
-                        type = DownloadTaskService.STATUS_INSTALLED;
-                        toTestPlay();
-                        return;
-                    }else if(!TextUtils.isEmpty(PackageUtil.isExistsFile(taskEty.getPackage_names()))){
-                        ApkUtils.installApk(activity, PackageUtil.isExistsFile(taskEty.getPackage_names()));
-                    }else{
-                        if(taskEty.needDownloadApp()){
-                            if(TextUtils.isEmpty(taskEty.getDownload_link()) || !taskEty.getDownload_link().contains("http")){
-                                G.showToast(R.string.error_download_link);
-                                return;
-                            }
-                            task = Aria.download(this).load(taskEty.getDownload_link());
-                        }
-                        if(task != null) {
-                            task.cancel(true);
-                            task.removeRecord();
-                            mDownloadTaskService.start(downLoadInfo1);
-                            type = DownloadTaskService.STATUS_INIT;
-                        }
-                    }
-                    break;
-                case 4://信用卡----------应该不会用到了------因为信用卡不会在这里显示
-                    Jump2View.getInstance().goCreditCardTaskList(activity, null);
-                    break;
-                case 10://H5
-                    Ext ext;
-                    if(taskEty == null) {
-                        G.showToast(R.string.service_data_error);
-                    } else if((ext = EntityUtils.getExtInfo(taskEty.getExt())) == null || TextUtils.isEmpty(ext.getUrl())){
-                        Jump2View.getInstance().goTaskDetailView(activity,  taskEty.getId());
-                    } else {
-                        Jump2View.getInstance().goWeb(activity, ext.getUrl());
-                    }
-                    break;
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-        }
-    }
-
-    private void acceptedTask() {
-        JSONObject object = new JSONObject();
-        object.put("device_id",DeviceUtil.getDeviceId(activity));
-        object.put("release_task_id", Integer.valueOf(taskEty.getRelease_task_id()+""));
-        preference.acceptedTask(object);
-        UMConfigUtils.onEvent(UMConfigUtils.Event.TASK_ACCEPT);
-    }
-
-    /**
-     * 去试玩
-     */
-    private void toTestPlay(){
-        PackageUtil.startApp(activity, taskEty.getPackage_names());
-    }
-
-    /**
-     * 按钮状态
-     */
-    private void setBtnState(){
-        type = -1;
-        if(taskEty.getRunTask() == 0){//领取任务
-            buttonStr = CommonUtil.GET_TASK;
-            type = -1;
-        }else if(taskEty.getTask_type() == 2){//信用卡业务----------应该不会用到了------因为信用卡不会在这里显示
-            type = 4;
-            buttonStr = CommonUtil.START_TASK;
-            dialogItemSizeTv.setVisibility(View.INVISIBLE);
-        }else if(taskEty.getTask_type() == 4){//h5
-            type = 10;
-            buttonStr = CommonUtil.START_TASK;
-            dialogItemSizeTv.setVisibility(View.INVISIBLE);
-        }else{
-            TaskDetailAct.setBtnStr(taskEty, mDownloadTaskService, new Action1<Object>() {
-                @Override
-                public void call(Object o) {
-                    if(o instanceof Integer){
-                        type = (int) o;
-                    } else if( o instanceof String){
-                        start_task_tv.setText((String) o);
-                    } else if( o instanceof Boolean){
-                        start_task_tv.setEnabled((Boolean) o);
-                    }
-                }
-            });
-            return;
-        }
-        start_task_tv.setText(buttonStr);
-    }
-
-    /**
-     * 接收任务 成功
-     * @param o
-     */
-    @Override
-    public void startTaskUpdataView(Object o) {
-        try{
-            BaseMessage baseMessage = (BaseMessage) o;
-            if(baseMessage.getCode() == 200){
-                taskEty.setRunTask(1);
-                setBtnState();
-                G.showToast("接收任务成功");
-                CommonUtil.getInstance().setTAskEnty(taskEty);
-            }
-            EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.ONFRESH_TRYMAKEMANY_PAGE));
-        }catch (Exception e){
-            e.printStackTrace();
-        }
-
-    }
-
-    @Override
-    public void startTaskFailView(Object o) {
-
-        G.showToast(((BaseMessage)o).getMsg()+ "");
-
-    }
-
-    @Override
-    public void getStateSuccess(Object o) {
-
-        if(o == null){
-            return;
-        }
-        BaseMessage baseMessage = (BaseMessage) o;
-
-        List<TaskState> stateList = JSONArray.parseArray(JSON.toJSONString(baseMessage.getData()), TaskState.class);
-
-        if(stateList != null && stateList.size()>0){
-            this.stateList.clear();
-            this.stateList.addAll(stateList);
-
-            stateAdapter.notifyDataSetChanged();
-
-        }
-
-
-    }
-
-    @Override
-    public void getStatefail(Object o) {
-
-
-    }
-
-    @Download.onPre void onPre(DownloadTask task) {
-        if(task.getKey().equals(taskEty.getDownload_link())) {
-            start_task_tv.setText("准备下载中");
-        }
-    }
-    @Download.onTaskStart void taskStart(DownloadTask task) {
-        if(task.getKey().equals(taskEty.getDownload_link())) {
-            start_task_tv.setText("开始下载中");
-        }
-    }
-    @Download.onTaskResume void taskResume(DownloadTask task) {
-        if(task.getKey().equals(taskEty.getDownload_link())) {
-            start_task_tv.setText("恢复下载中");
-        }
-    }
-    //在这里处理任务执行中的状态,如进度进度条的刷新
-    @Download.onTaskRunning protected void running(DownloadTask task) {
-        if(task.getKey().equals(taskEty.getDownload_link())) {
-            int p = task.getPercent();    //任务进度百分比
-//            mDownloadTaskService.setDownloadTaskPercent(p, task.getCurrentProgress()/1024d/1024d,task.getFileSize()/1024d/1024d,0,task.getKey());
-            String speed = task.getConvertSpeed();    //转换单位后的下载速度,单位转换需要在配置文件中打开
-            long speed1 = task.getSpeed(); //原始byte长度速度
-            start_task_tv.setText(p + "%");
-            System.out.println("Aria p " + p + ", speed = " + speed);
-        }
-    }
-
-    @Download.onTaskStop void taskStop(DownloadTask task) {
-        if(task.getKey().equals(taskEty.getDownload_link())) {
-//            mDownloadTaskService.setDownloadTaskStatus(task.getKey(), DownloadTaskService.STATUS_PAUSE);
-            start_task_tv.setText(CommonUtil.CONTINUE_DOWNLOAD);
-        }
-    }
-
-    @Download.onNoSupportBreakPoint void onNoSupportBreakPoint(DownloadTask task) {
-    }
-
-    @Download.onTaskCancel void taskCancel(DownloadTask task) {
-        if(task.getKey().equals(taskEty.getDownload_link())) {
-//            mDownloadTaskService.deleteDownloadTaskByDownloadUrl(task.getKey());
-            start_task_tv.setText("已经取消");
-        }
-    }
-
-    @Download.onTaskFail void taskFail(DownloadTask task) {
-        if(task.getKey().equals(taskEty.getDownload_link())) {
-//            mDownloadTaskService.setDownloadTaskStatus(task.getKey(), DownloadTaskService.STATUS_FAIL);
-            start_task_tv.setText(CommonUtil.FAIL_DOWNLOAD);
-        }
-    }
-
-    @Download.onTaskComplete void taskComplete(DownloadTask task) {
-        if(task.getKey().equals(taskEty.getDownload_link())) {
-//            mDownloadTaskService.setDownloadTaskFinish(task.getKey(), task.getDownloadPath());
-            //在这里处理任务完成的状态
-            start_task_tv.setText(CommonUtil.START_INSTALL);
-            type = 3;
-//            PackageUtil.installApk(activity, task.getDownloadPath());
-        }
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if(requestCode == 0 && resultCode == RESULT_OK && taskEty != null){
-            SheepApp.getInstance().getNetComponent().getApiService().giveUpTask(taskEty.getAcceptedTaskId())
-                    .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(new SheepSubscriber<BaseMessage>(activity) {
-                        @Override
-                        public void onNext(BaseMessage baseMessage) {
-                            acceptedTask();
-                            CommonUtil.getInstance().setTAskEnty(null);
-                        }
-
-                        @Override
-                        public void onError(BaseMessage baseMessage) {
-                            G.showToast(baseMessage);
-                        }
-                    });
-        }
-    }
-}

+ 2 - 4
app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAct.java

@@ -32,7 +32,7 @@ import com.kfzs.duanduan.utils.ApkUtils;
 import com.sheep.gamegroup.absBase.AbsChooseImageActivity;
 import com.sheep.gamegroup.di.components.DaggerTaskDetailComponent;
 import com.sheep.gamegroup.di.modules.TaskDetailModule;
-import com.sheep.gamegroup.heler.TaskHelper;
+import com.sheep.gamegroup.helper.TaskHelper;
 import com.sheep.gamegroup.model.api.IDownload;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.DialogEntity;
@@ -56,7 +56,6 @@ 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;
@@ -90,7 +89,6 @@ import rx.functions.Action1;
 import rx.schedulers.Schedulers;
 
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.GAME_INSTEAD_OF_RECHARGE_GET;
-import static com.sheep.gamegroup.util.DataUtil.REQUEST_CAPTURE_PERMISSION;
 
 /**
  * 任务详情页面
@@ -281,7 +279,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         btnTaskItem.setVisibility(View.VISIBLE);
         btnUpImag.setVisibility(View.VISIBLE);
         if (gettaskAcceptedEty != null && (gettaskAcceptedEty.isIs_running() || gettaskAcceptedEty.getStatus() == 3)) {//已经领取任务
-            switch (taskEty.getTask_type()) {// 1时间试玩任务 2 信用卡任务 3应用下载 4h5业务 1001畅思 1000连续任务, 1002 1003游戏任务
+            switch (taskEty.getTask_type()) {// 1时间试玩任务 2 信用卡任务 3应用下载 4h5业务 1001畅思 1000连续任务, 1002 1003游戏任务 1004 小米游戏任务
                 case 4://h5业务
                     type = 10;
                     btnTaskItem.setText(CommonUtil.START_TASK);

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

@@ -22,7 +22,7 @@ import com.kfzs.duanduan.event.BigEvent;
 import com.kfzs.duanduan.event.EventTypes;
 import com.kfzs.duanduan.services.DownloadTaskService;
 import com.kfzs.duanduan.utils.ApkUtils;
-import com.sheep.gamegroup.heler.TaskHelper;
+import com.sheep.gamegroup.helper.TaskHelper;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.GameAgencyRechargePlatformEntity;
 import com.sheep.gamegroup.model.entity.OrienteeringDetail;

+ 8 - 3
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtTryMakeMoney.java

@@ -75,6 +75,8 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         if(empty_view == null)
             empty_view = findViewById(R.id.empty_view);
     }
+    private static final int LIST_COUNT = 3;//tryMakeMoneyAdp 总共有3条数据
+    private static final RecyleObj NULL = RecyleObj.make(RecyleType.NONE, null);//空数据
     private void notifyDataSetChanged(){
         checkAndInitView();
         int position = 0;
@@ -83,7 +85,10 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         if(!ListUtil.isEmpty(releaseEtyLists))
             tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RELEASE_TASK, releaseEtyLists), position++);
         if(!ListUtil.isEmpty(releaseEtyListsBegin))
-            tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.BEGIN_TASK, releaseEtyListsBegin), position);
+            tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.BEGIN_TASK, releaseEtyListsBegin), position++);
+        while(position < LIST_COUNT){
+            tryMakeMoneyAdp.add(NULL, position++);
+        }
         tryMakeMoneyAdp.refreshAdapter();
         CommonUtil.getInstance().updateEmptyView(empty_view, tryMakeMoneyAdp.isEmpty() && releaseEtyLists.isEmpty() && releaseEtyListsBegin.isEmpty());
         refresh.setRefreshing(false);
@@ -150,8 +155,8 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         tryMakeMoneyAdp.addType(type);
         tryMakeMoneyAdp.setIs_succession(is_succession);
         tryMakeMoneyAdp.addPresenter(presenter);
-        for (int i = 0; i < 3; i++) {
-            tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.NONE, null));
+        for (int i = 0; i < LIST_COUNT; i++) {
+            tryMakeMoneyAdp.add(NULL);
         }
         recyclerview.setAdapter(tryMakeMoneyAdp);
 

+ 18 - 1
app/src/main/res/layout/act_guide.xml

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="com.sheep.gamegroup.view.activity.ActGuide">
 
     <android.support.v4.view.ViewPager
         android:id="@+id/guide_vp"
@@ -16,5 +18,20 @@
         android:layout_centerHorizontal="true"
         android:layout_marginBottom="20dp"
         android:orientation="horizontal"/>
+    <TextView
+        android:id="@+id/guide_skip"
+        android:layout_width="wrap_content"
+        android:layout_height="24dp"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentEnd="true"
+        android:gravity="center"
+        android:onClick="toSkipNext"
+        android:text="  跳过  "
+        android:paddingStart="10dp"
+        android:paddingEnd="10dp"
+        android:layout_margin="@dimen/content_padding_20"
+        android:textColor="#ffffff"
+        android:textSize="13sp"
+        android:background="@drawable/shape_ash_solid_rectangle_small_tra30"/>
 
 </RelativeLayout>

+ 0 - 141
app/src/main/res/layout/download_item_dialog.xml

@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_margin="@dimen/dp_10">
-
-        <ScrollView
-            android:id="@+id/dialog_center_ll"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="64dp"
-            android:background="@drawable/shape_white_solid_rectangle"
-            android:gravity="center"
-            android:paddingBottom="@dimen/dp_10"
-            android:paddingStart="@dimen/dp_10"
-            android:paddingEnd="@dimen/dp_10"
-            android:scrollbars="none">
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-                <ImageView
-                    android:id="@+id/dialog_item_icon_iv"
-                    android:layout_width="@dimen/view_size_60"
-                    android:layout_height="@dimen/view_size_60"
-                    android:src="@drawable/icon_lj" />
-
-                <TextView
-                    android:id="@+id/dialog_item_name_tv"
-                    style="@style/txt_big_noheight_style"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="@dimen/content_padding_10"
-                    android:layout_toRightOf="@id/dialog_item_icon_iv"
-                    android:textSize="13sp"
-                    android:text=""
-                    android:textStyle="bold"/>
-
-                <TextView
-                    android:id="@+id/dialog_item_size_tv"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@+id/dialog_item_name_tv"
-                    android:layout_marginLeft="@dimen/content_padding"
-                    android:layout_marginTop="@dimen/content_padding_small"
-                    android:layout_toRightOf="@id/dialog_item_icon_iv"
-                    android:text="10M"
-                    android:textSize="@dimen/text_size_12" />
-
-
-                <WebView
-                    android:id="@+id/webview"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@+id/dialog_item_icon_iv"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginLeft="@dimen/content_padding_40"
-                    android:layout_marginRight="@dimen/content_padding_40"
-                    android:layout_marginTop="@dimen/content_padding_15"
-                    android:visibility="gone">`
-
-                </WebView>
-                <com.sheep.gamegroup.util.MyListview
-                    android:id="@+id/listview"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:scrollbars="none"
-                    android:divider="@null"
-                    android:listSelector="@color/transparent"
-                    android:layout_below="@+id/dialog_item_icon_iv"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginLeft="@dimen/content_padding_40"
-                    android:layout_marginRight="@dimen/content_padding_40"
-                    android:layout_marginTop="@dimen/content_padding_15"/>
-
-                <LinearLayout
-                    android:id="@+id/start_layout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@+id/listview"
-                    android:layout_centerHorizontal="true"
-                    android:orientation="vertical"
-                    android:visibility="gone">
-                </LinearLayout>
-
-                <TextView
-                    android:layout_below="@+id/listview"
-                    android:id="@+id/start_task_tv"
-                    style="@style/style_button"
-                    android:layout_width="wrap_content"
-                    android:layout_centerHorizontal="true"
-                    android:minWidth="151dp"
-                    android:text="开始任务"
-                    android:visibility="visible"/>
-
-                <TextView
-                    android:id="@+id/doalog_item_get_rewards_tv"
-                    android:layout_width="wrap_content"
-                    android:layout_height="40dp"
-                    android:layout_below="@+id/start_layout"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginLeft="@dimen/content_padding_40"
-                    android:layout_marginRight="@dimen/content_padding_40"
-                    android:layout_marginTop="@dimen/content_padding_small"
-                    android:background="@drawable/sp_bg_gradient_rectangle_yellow"
-                    android:gravity="center"
-                    android:minWidth="151dp"
-                    android:text="领取奖励"
-                    android:textSize="18sp"
-                    android:textColor="#ffffff"
-                    android:visibility="gone"/>
-
-            </RelativeLayout>
-        </ScrollView>
-        <TextView
-            android:id="@+id/dialog_title"
-            android:layout_width="match_parent"
-            android:layout_height="54dp"
-            android:text="提示"
-            android:textSize="20sp"
-            android:gravity="center"
-            android:textColor="@android:color/white"
-            android:padding="@dimen/dp_10"
-            android:background="@drawable/shape_main_solid_rectangle_top" />
-
-        <ImageView
-            android:id="@+id/dialog_close"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_below="@+id/dialog_center_ll"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="@dimen/content_padding_30"
-            android:src="@mipmap/close" />
-    </RelativeLayout>
-</merge>

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 3
app/src/main/res/values/strings.xml