Quellcode durchsuchen

review代码:
优化提示,各种英文字段错误,删除无用代码,玩转游戏中支持长按选择下载方式,用户退出删除任务记录

zengjiebin vor 7 Jahren
Ursprung
Commit
bf189e7b19
25 geänderte Dateien mit 126 neuen und 254 gelöschten Zeilen
  1. 15 0
      app/src/main/java/com/sheep/gamegroup/greendao/DDProviderHelper.java
  2. 4 4
      app/src/main/java/com/sheep/gamegroup/helper/FindAppHelper.java
  3. 1 1
      app/src/main/java/com/sheep/gamegroup/model/entity/FindApp.java
  4. 1 1
      app/src/main/java/com/sheep/gamegroup/model/entity/PlayGameEntity.java
  5. 7 142
      app/src/main/java/com/sheep/gamegroup/model/util/AutoTaskListUtil.java
  6. 3 3
      app/src/main/java/com/sheep/gamegroup/usage/AppUsageManager.java
  7. 21 12
      app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java
  8. 1 11
      app/src/main/java/com/sheep/gamegroup/util/ConnectAddress.java
  9. 2 3
      app/src/main/java/com/sheep/gamegroup/view/activity/ActFindGame.java
  10. 2 2
      app/src/main/java/com/sheep/gamegroup/view/activity/ActFindInformation.java
  11. 1 3
      app/src/main/java/com/sheep/gamegroup/view/activity/ActPlayGameDetail.java
  12. 1 1
      app/src/main/java/com/sheep/gamegroup/view/activity/ActReservation.java
  13. 1 1
      app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAct.java
  14. 2 0
      app/src/main/java/com/sheep/gamegroup/view/adapter/GiftCenterAdapter.java
  15. 23 6
      app/src/main/java/com/sheep/gamegroup/view/adapter/PlayGameListAdapter.java
  16. 9 8
      app/src/main/java/com/sheep/gamegroup/view/adapter/WelfareAdapter.java
  17. 1 1
      app/src/main/java/com/sheep/gamegroup/view/fragment/FgtFindChild.java
  18. 3 20
      app/src/main/java/com/sheep/gamegroup/view/fragment/FgtPlayGame.java
  19. 1 1
      app/src/main/java/com/sheep/gamegroup/view/fragment/FgtSmallSheep.java
  20. 1 0
      app/src/main/java/com/sheep/gamegroup/view/fragment/FgtTryMakeMoney.java
  21. 2 0
      app/src/main/java/com/sheep/gamegroup/view/fragment/FgtWelfareCenter.java
  22. 0 22
      app/src/main/java/com/sheep/jiuyan/samllsheep/Config.java
  23. 1 1
      app/src/main/java/com/sheep/jiuyan/samllsheep/SheepApp.java
  24. 22 10
      app/src/main/java/com/sheep/jiuyan/samllsheep/service/DownloadService.java
  25. 1 1
      app/src/main/res/values/strings.xml

+ 15 - 0
app/src/main/java/com/sheep/gamegroup/greendao/DDProviderHelper.java

@@ -10,6 +10,7 @@ import com.sheep.gamegroup.greendao.download.DownLoadInfo;
 import com.sheep.gamegroup.greendao.download.DownLoadInfoDao;
 import com.sheep.gamegroup.greendao.download.ProcessRecord;
 import com.sheep.gamegroup.greendao.download.ProcessRecordDao;
+import com.sheep.jiuyan.samllsheep.service.AutoCheckService;
 
 import java.util.List;
 
@@ -350,4 +351,18 @@ public class DDProviderHelper {
                 .build()
                 .unique();
     }
+    /**
+     * 删除用户的任务记录数据
+     *
+     * @param context
+     */
+    public void deleteTaskRecord(Context context) {
+        if(AutoCheckService.IS_USE_THIS_SERVICE){
+            ProcessRecordDao processRecordDao = getDaossion(context).getProcessRecordDao();
+            processRecordDao.deleteAll();
+        } else {
+            AcceptTaskRecordDao acceptTaskRecordDao = getDaossion(context).getAcceptTaskRecordDao();
+            acceptTaskRecordDao.deleteAll();
+        }
+    }
 }

+ 4 - 4
app/src/main/java/com/sheep/gamegroup/helper/FindAppHelper.java

@@ -120,7 +120,7 @@ public class FindAppHelper{
                     @Override
                     public void onNext(BaseMessage baseMessage) {
                         findApp.setRecord(2);//设置为不可记录
-                        if(findApp.isCanDonload()){
+                        if(findApp.isCanDownload()){
                             //提交下载成功
                             if(textView != null)
                                 textView.setEnabled(true);
@@ -137,7 +137,7 @@ public class FindAppHelper{
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        if(!findApp.isCanDonload()){
+                        if(!findApp.isCanDownload()){
                             G.showToast("预约失败");
                         }
                         if(textView != null)
@@ -154,7 +154,7 @@ public class FindAppHelper{
                     @Override
                     public void onNext(BaseMessage baseMessage) {
                         items.setRecord(2);//设置为不可记录
-                        if(items.isCanDonload()){
+                        if(items.isCanDownload()){
                             //提交下载成功
                             if(textView != null)
                                 textView.setEnabled(true);
@@ -171,7 +171,7 @@ public class FindAppHelper{
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        if(!items.isCanDonload()){
+                        if(!items.isCanDownload()){
                             G.showToast("预约失败");
                         }
                         if(textView != null)

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

@@ -318,7 +318,7 @@ public class FindApp implements IDownload {
      * 是否可以下载
      * @return
      */
-    public boolean isCanDonload(){
+    public boolean isCanDownload(){
         return download == 1;//可以下载
     }
 

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

@@ -365,7 +365,7 @@ public class PlayGameEntity implements IDownload, Serializable {
      * 是否可以下载
      * @return
      */
-    public boolean isCanDonload(){
+    public boolean isCanDownload(){
         return download == 1;//可以下载
     }
     /**

+ 7 - 142
app/src/main/java/com/sheep/gamegroup/model/util/AutoTaskListUtil.java

@@ -1,24 +1,6 @@
 package com.sheep.gamegroup.model.util;
 
 import android.support.v7.app.AlertDialog;
-import android.text.TextUtils;
-
-import com.alibaba.fastjson.JSON;
-import com.sheep.gamegroup.model.entity.AppRecord;
-import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
-import com.sheep.gamegroup.model.entity.TaskEty;
-import com.sheep.gamegroup.model.entity.TaskReleaseEty;
-import com.sheep.gamegroup.util.DataUtil;
-import com.sheep.gamegroup.util.LogUtil;
-import com.sheep.jiuyan.samllsheep.SheepApp;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
 
 /**
  * Created by realicing on 2018/6/15.
@@ -29,7 +11,6 @@ public class AutoTaskListUtil {
     private static AutoTaskListUtil autoTaskListUtil = new AutoTaskListUtil();
 
     private AutoTaskListUtil(){
-        resetReceiveTaskTime();
     }
     public static AutoTaskListUtil getInstance(){
         if (autoTaskListUtil == null){
@@ -37,138 +18,22 @@ public class AutoTaskListUtil {
         }
         return autoTaskListUtil;
     }
-    private Map<String, TaskEty> map = new HashMap<>();
-    public boolean addTask(TaskEty task) {
-        if(map == null)
-            map = new HashMap<>();
-        if(task != null && !TextUtils.isEmpty(task.getPackage_names())){
-            if(task.isAppAutoCommitTask()) {
-                map.put(task.getPackage_names(), task);
-                return true;
-            }
-        }
-        return false;
-    }
-    public boolean addTask(TaskReleaseEty taskReleaseEty) {
-        if(taskReleaseEty != null && taskReleaseEty.getTask() != null && taskReleaseEty.getTask().isAppAutoCommitTask()) {
-            taskReleaseEty.getTask().setRelease_task_id(taskReleaseEty.getId());
-            return addTask(taskReleaseEty.getTask());
-        }
-        return false;
-    }
-
-    public boolean isEmpty() {
-        return map == null || map.isEmpty();
-    }
-    private boolean loadding = false;
-    public void initTaskList() {
-        if(loadding){
-            return;
-        }
-        loadding = true;
-        //下面的功能主要是初始化 正在运行的应用自动审核任务列表
-        AutoTaskListUtil.getInstance().clear();
-        SheepApp.getInstance().getNetComponent().getApiService()
-                .returnTask(3, 1)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
-                    @Override
-                    public void onError(BaseMessage baseMessage) {
-                        loadding = false;
-                    }
-
-                    @Override
-                    public void onNext(BaseMessage baseMessage) {
-                        List<TaskAcceptedEty> list = baseMessage.getDatas(TaskAcceptedEty.class);
-                        loadList(list);
-                        loadding = false;
-                    }
-                });
-    }
-
-    public void loadList(List<TaskAcceptedEty> list) {
-//        DataUtil.getInstance().addTaskAcceptedEtyList(list);//添加正在运行的任务列表到内存中
-        clear();
-        if(list != null) {
-            for (TaskAcceptedEty item : list) {
-                if (item != null && item.isIs_running())
-                   addTask(item.getRelease_task());
-            }
-        }
-    }
-
-    public void clear() {
-        if(map != null)
-            map.clear();
-    }
-
-    public boolean hasTask(String packageName) {
-        return !TextUtils.isEmpty(packageName) && map != null && map.containsKey(packageName);
-    }
-
-    public boolean hasTask(AppRecord appRecord) {
-        return appRecord != null && hasTask(appRecord.getPackageName());
-    }
-
 
-
-
-    private AppRecord lastAppRecord;
-    private long lastTime;
-    public AppRecord getLastAppRecord() {
-        return lastAppRecord;
-    }
-
-    public long getLastTime() {
-        return lastTime;
-    }
-
-    public void setLastAppRecord(AppRecord lastAppRecord) {
-        this.lastAppRecord = lastAppRecord;
-    }
-
-    public void setLastTime(long lastTime) {
-        this.lastTime = lastTime;
-    }
-
-
-
-
-
-    private AlertDialog tipToOpernAccessibilityDialog;
+    private AlertDialog tipToOpenAccessibilityDialog;
     public void clearAlertDialog(){
-        tipToOpernAccessibilityDialog = null;
+        tipToOpenAccessibilityDialog = null;
     }
 
-    public AlertDialog getTipToOpernAccessibilityDialog() {
-        return tipToOpernAccessibilityDialog;
+    public AlertDialog getTipToOpenAccessibilityDialog() {
+        return tipToOpenAccessibilityDialog;
     }
 
-    public void setTipToOpernAccessibilityDialog(AlertDialog tipToOpernAccessibilityDialog) {
-        this.tipToOpernAccessibilityDialog = tipToOpernAccessibilityDialog;
+    public void setTipToOpenAccessibilityDialog(AlertDialog tipToOpenAccessibilityDialog) {
+        this.tipToOpenAccessibilityDialog = tipToOpenAccessibilityDialog;
     }
 
     public boolean isShowing() {
-        return tipToOpernAccessibilityDialog != null && tipToOpernAccessibilityDialog.isShowing();
-    }
-    //正在运行的app没有变化,即传入的包名与lastAppRecord中的包名相同
-    public boolean isLastAppRecord(String packageName) {
-        return lastAppRecord != null && TextUtils.equals(packageName, lastAppRecord.getPackageName());
-    }
-
-
-
-
-    private long receiveTaskTime;//使用UsageStatsManager来计算应用使用时长时的开始计算时间
-    /**
-     * 重置比对时间  5.1及以上使用
-     */
-    public void resetReceiveTaskTime(){//点击领取应用自动审核时,重置这个时间;提交领取奖励时也要重置这个时间
-        receiveTaskTime = System.currentTimeMillis();
+        return tipToOpenAccessibilityDialog != null && tipToOpenAccessibilityDialog.isShowing();
     }
 
-    public long getReceiveTaskTime() {
-        return receiveTaskTime;
-    }
 }

+ 3 - 3
app/src/main/java/com/sheep/gamegroup/usage/AppUsageManager.java

@@ -90,7 +90,7 @@ public class AppUsageManager {
         }
         LogUtil.println("tryOpenLookAppUsageStatsPermission", "start");
         AutoTaskListUtil.getInstance().clearAlertDialog();
-        if(!AutoTaskListUtil.getInstance().isEmpty() || DataUtil.IS_LISTEN_SCREEN_SHOT){
+        if(DataUtil.IS_LISTEN_SCREEN_SHOT){
             LogUtil.println("tryOpenLookAppUsageStatsPermission", "notEmpty");
             showAccessibilityDialog();
         } else {
@@ -113,7 +113,7 @@ public class AppUsageManager {
                 AutoTaskListUtil.getInstance().clearAlertDialog();
             }
         });
-        AutoTaskListUtil.getInstance().setTipToOpernAccessibilityDialog(tipToOpenAccessibilityDialog);
+        AutoTaskListUtil.getInstance().setTipToOpenAccessibilityDialog(tipToOpenAccessibilityDialog);
     }
     public void openLookAppUsageStatsPermission(){
         if(Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP){
@@ -133,7 +133,7 @@ public class AppUsageManager {
             UsageStatsManager mUsageStatsManager = (UsageStatsManager) SheepApp.getInstance().getSystemService(USAGE_STATS_SERVICE);//usagestats
             long time = System.currentTimeMillis();
             if(mUsageStatsManager != null) {
-                List<UsageStats> usageStatsList = mUsageStatsManager.queryUsageStats(UsageStatsManager.INTERVAL_BEST, AutoTaskListUtil.getInstance().getReceiveTaskTime(), time);
+                List<UsageStats> usageStatsList = mUsageStatsManager.queryUsageStats(UsageStatsManager.INTERVAL_BEST, 1_514_736_000_000L, time);
 
                 if (usageStatsList != null && !usageStatsList.isEmpty()) {
                     for (UsageStats usageStats : usageStatsList) {

+ 21 - 12
app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java

@@ -563,6 +563,8 @@ public class CommonUtil {
         });
         SpUtils.saveToken(activity, "");
         DataUtil.getInstance().clearData();
+        //删除自动审核任务中保存的数据,防止用户切换账号后直接提交
+        DDProviderHelper.getInstance().deleteTaskRecord(SheepApp.getInstance());
         ActivityManager.getInstance().finishAllActivity();
         Jump2View.getInstance().goLoginView(activity, "");
 
@@ -614,21 +616,28 @@ public class CommonUtil {
                         @Override
                         public void onNext(BaseMessage baseMessage) {
                             List<TaskAcceptedEty> list = baseMessage.getDatas(TaskAcceptedEty.class);
-                            ArrayList<String> packageNameList = ListUtil.emptyList();
-                            for (TaskAcceptedEty item : list) {
-                                TaskReleaseEty taskReleaseEty;
-                                TaskEty taskEty;
-                                if ((taskReleaseEty = item.getRelease_task()) != null && (taskEty = taskReleaseEty.getTask()) != null
-                                        && taskEty.isAppAutoCommitTask() && !TextUtils.isEmpty(taskEty.getPackage_names()))
-                                    packageNameList.add(taskEty.getPackage_names());
-                            }
-                            Jump2View.getInstance().startAutoCheckService(SheepApp.getInstance(), packageNameList);
+                            reloadAutoTaskList(list);
                             isLoadingAcceptedTaskList = false;
                         }
                     });
         }
     }
 
+    //5.0及以下设备,正在运行的任务列表发生变化就要通知后台服务
+    public void reloadAutoTaskList(List<TaskAcceptedEty> list) {
+        if(AutoCheckService.IS_USE_THIS_SERVICE && !ListUtil.isEmpty(list)) {
+            ArrayList<String> packageNameList = ListUtil.emptyList();
+            for (TaskAcceptedEty item : list) {
+                TaskReleaseEty taskReleaseEty;
+                TaskEty taskEty;
+                if ((taskReleaseEty = item.getRelease_task()) != null && (taskEty = taskReleaseEty.getTask()) != null
+                        && taskEty.isAppAutoCommitTask() && !TextUtils.isEmpty(taskEty.getPackage_names()))
+                    packageNameList.add(taskEty.getPackage_names());
+            }
+            Jump2View.getInstance().startAutoCheckService(SheepApp.getInstance(), packageNameList);
+        }
+    }
+
     /**
      * 设置 drawLeft drawRight
      */
@@ -1324,7 +1333,7 @@ public class CommonUtil {
         jsonObject.put("device_id", DeviceUtil.getDeviceId(context));
         jsonObject.put("release_task_id", taskReleaseEty.getId());
         jsonObject.put("create_time", System.currentTimeMillis() / 1000L);//这里添加时间戳,防止用户抓包后重复使用
-        jsonObject.put("app_version", BuildConfig.VERSION_CODE);
+        jsonObject.put("app_version", String.valueOf(BuildConfig.VERSION_CODE));
         SheepApp.getInstance().getNetComponent().getApiService().acceptedTask(jsonObject)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
@@ -1366,7 +1375,7 @@ public class CommonUtil {
         jsonObject.put("device_id", DeviceUtil.getDeviceId(context));
         jsonObject.put("release_task_id", gameEntity.getRelease_task().getId());
         jsonObject.put("create_time", System.currentTimeMillis() / 1000L);//这里添加时间戳,防止用户抓包后重复使用
-        jsonObject.put("app_version", BuildConfig.VERSION_CODE);
+        jsonObject.put("app_version", String.valueOf(BuildConfig.VERSION_CODE));
         SheepApp.getInstance().getNetComponent().getApiService().acceptedTask(jsonObject)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
@@ -2364,7 +2373,7 @@ public class CommonUtil {
             } else {
                 releaseEty.getDownloadHelper().updateDownloadTaskView((Activity) context, taskEty, detail_task_tv_center, null, type);
             }
-        } else if (gameEntity.getApp().isCanDonload()) {//可下载
+        } else if (gameEntity.getApp().isCanDownload()) {//可下载
             gameEntity.getApp().getFindAppHelper().updateDownloadTaskView((Activity) context, gameEntity.getApp(), detail_task_tv_center, type);
             detail_task_tv_center.setTag("PUBLIC_TAG_PREFIX_TEXTVIEW_LIST" + gameEntity.getApp().getDownload_link());
         } else {//预约下载

+ 1 - 11
app/src/main/java/com/sheep/gamegroup/util/ConnectAddress.java

@@ -41,16 +41,6 @@ public enum ConnectAddress {
         public String getName() {
             return "梅恩";
         }
-    },sheepzhangwei {
-
-        @Override
-        public String getAppUrl() {
-            return "http://10.8.220.171:8081/";
-        }
-        @Override
-        public String getName() {
-            return "张伟";
-        }
     },developSheeptest {
 
         @Override
@@ -132,7 +122,7 @@ public enum ConnectAddress {
         }
     }
 
-    public ConnectAddress getDefultConnectAddress() {
+    public ConnectAddress getDefaultConnectAddress() {
         if(TestUtil.isTest()){
             if(ConfigUtil.getInstance().isFileExists()) {
                 String flavor = ConfigUtil.getInstance().getItem(0);//第一行填写connectAddress的名字

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

@@ -7,7 +7,6 @@ import android.support.annotation.Nullable;
 import android.support.design.widget.AppBarLayout;
 import android.support.v7.widget.AppCompatRatingBar;
 import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
 import android.view.View;
 import com.tencent.smtt.sdk.WebView;
@@ -349,7 +348,7 @@ public class ActFindGame extends BaseActivity {
         //游戏简介与下载
         GlideImageLoader.setGameImage(find_game_iv, findApp.getIcon());
         ViewUtil.setText(find_game_name_tv, findApp.getName());
-        isNeedReservation = !findApp.isCanDonload();//这里认为只有两种状态:可下载与预约下载
+        isNeedReservation = !findApp.isCanDownload();//这里认为只有两种状态:可下载与预约下载
         if (isNeedReservation)
             ViewUtil.setText(find_game_info_tv, String.format(Locale.CHINA, "开放时间:%s", TimeUtil.TimeStamp2Date(findApp.getDownload_at(), "yyyy-MM-dd\u0020HH:mm")));
         else {
@@ -535,7 +534,7 @@ public class ActFindGame extends BaseActivity {
             CommonUtil.getInstance()
                     .xiaomiRevieceAcctoun(find_game_down_tv, findApp, activity);
         }else
-        if (findApp.isCanDonload()) {//可下载
+        if (findApp.isCanDownload()) {//可下载
             downLoadTextViewMap.put(findApp.getDownload_link(), textView);
             downLoadTextViewMap.put(findApp.getPackage_name(), textView);
             findApp.getFindAppHelper().updateDownloadTaskView(activity, findApp, textView);

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

@@ -357,7 +357,7 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
         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();//这里认为只有两种状态:可下载与预约下载
+        final boolean isNeedReservation = !findApp.isCanDownload();//这里认为只有两种状态:可下载与预约下载
         ViewUtil.setText(find_information_game_surplus);
         if (isNeedReservation)
             ViewUtil.setText(find_information_game_time, String.format(Locale.CHINA, "开放时间:%s", TimeUtil.TimeStamp2Date(findApp.getDownload_at(), "yyyy-MM-dd\u0020HH:mm")));
@@ -496,7 +496,7 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
 
     //更新按钮状态与添加点击事件
     private void updateView(Activity activity, FindApp findApp, TextView textView) {
-        if (findApp.isCanDonload()) {//可下载
+        if (findApp.isCanDownload()) {//可下载
             downLoadTextViewMap.put(findApp.getDownload_link(), textView);
             downLoadTextViewMap.put(findApp.getPackage_name(), textView);
             findApp.getFindAppHelper().updateDownloadTaskView(activity, findApp, textView);

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

@@ -17,8 +17,6 @@ import com.arialyy.annotations.Download;
 import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.download.DownloadTask;
 import com.sheep.gamegroup.event.BigEvent;
-import com.sheep.gamegroup.model.entity.TaskEty;
-import com.sheep.gamegroup.model.entity.TaskReleaseEty;
 import com.sheep.gamegroup.view.adapter.TitleFragmentListAdapter;
 import com.sheep.gamegroup.util.DownloadUtil;
 import com.kfzs.duanduan.view.ViewPagerAutoHeigh;
@@ -245,7 +243,7 @@ public class ActPlayGameDetail extends BaseActivity implements Action1<Integer>
         //游戏简介与下载
         GlideImageLoader.setGameImage(find_game_iv, gameEntity.getApp().getIcon()+"");
         ViewUtil.setText(find_game_name_tv, gameEntity.getApp().getName());
-        isNeedReservation = !gameEntity.getApp().isCanDonload();//这里认为只有两种状态:可下载与预约下载
+        isNeedReservation = !gameEntity.getApp().isCanDownload();//这里认为只有两种状态:可下载与预约下载
 //        if (isNeedReservation)
 //            ViewUtil.setText(find_game_info_tv, String.format(Locale.CHINA, "开放时间:%s", TimeUtil.TimeStamp2Date(gameEntity.getApp().getDownload_at(), "yyyy-MM-dd\u0020HH:mm")));
 //        else {

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

@@ -129,7 +129,7 @@ public class ActReservation extends BaseActivity {
             ViewUtil.setImage(find_information_game_icon, findApp.getIcon());
             ViewUtil.setText(find_information_game_name, findApp.getName());
             ViewUtil.setText(find_information_game_time, String.format(Locale.CHINA, "开放时间:\n%s", TimeUtil.TimeStamp2Date(findApp.getDownload_at(), "yyyy-MM-dd\u0020HH:mm")));
-            if(findApp.isCanDonload()){//可以下载
+            if(findApp.isCanDownload()){//可以下载
                 downLoadTextViewMap.put(findApp.getDownload_link(), find_information_game_bt1);
                 downLoadTextViewMap.put(findApp.getPackage_name(), find_information_game_bt1);
                 findAppMap.put(findApp.getDownload_link(),findApp);

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

@@ -1273,7 +1273,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         object.put("device_id", device_id);
         object.put("release_task_id", release_task_id);
         object.put("create_time", System.currentTimeMillis() / 1000L);//这里添加时间戳,防止用户抓包后重复使用
-        object.put("app_version", BuildConfig.VERSION_CODE);
+        object.put("app_version", String.valueOf(BuildConfig.VERSION_CODE));
         addCanAcceptedTaskChildId(object, taskEty);
         SheepApp.getInstance()
                 .getNetComponent()

+ 2 - 0
app/src/main/java/com/sheep/gamegroup/view/adapter/GiftCenterAdapter.java

@@ -21,6 +21,7 @@ import com.sheep.gamegroup.util.ViewHolder;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.service.DownloadService;
 import com.sheep.jiuyan.samllsheep.utils.G;
 
 import java.util.List;
@@ -127,6 +128,7 @@ public class GiftCenterAdapter extends AdbCommonRecycler<GiftBagApp> {
                     Jump2View.getInstance().goGiftDetail(context, item);
                 }
             });
+            DownloadService.setDownLoadLongClick(holder.itemView, item.getApp());
         }
     }
     //领取礼包

+ 23 - 6
app/src/main/java/com/sheep/gamegroup/view/adapter/PlayGameListAdapter.java

@@ -17,6 +17,7 @@ import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.ViewHolder;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.service.DownloadService;
 
 import java.util.List;
 
@@ -47,12 +48,8 @@ public class PlayGameListAdapter extends AdbCommonRecycler<GameEntityList>{
 
             @Override
             public void convert(ViewHolder holder, final GameEntity gameEntity) {
-                holder.itemView.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        Jump2View.getInstance().goPlayGameDetail((Activity) context, gameEntity.getApp().getId());
-                    }
-                });
+                setOnClickGameEntity((Activity) context, holder.itemView, gameEntity);
+
                 View item_download_welfare_line = holder.itemView.findViewById(R.id.line_tv);
                 TextView detail_task_tv_center = holder.itemView.findViewById(R.id.detail_task_tv_center);
                 TextView item_name_tv = holder.itemView.findViewById(R.id.item_name_tv);
@@ -74,4 +71,24 @@ public class PlayGameListAdapter extends AdbCommonRecycler<GameEntityList>{
 
 
     }
+
+    /**
+     * 设置游戏中心中游戏的点击与长按
+     * @param activity
+     * @param view
+     * @param item
+     */
+    public static void setOnClickGameEntity(final Activity activity, View view, final GameEntity item){
+        if(item.getApp() != null){
+            DownloadService.setDownLoadLongClick(view, item.getApp());
+            view.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    Jump2View.getInstance().goPlayGameDetail(activity, item.getApp().getId());
+                }
+            });
+        } else if(item.getRelease_task() != null) {
+            DownloadService.setDownLoadLongClick(view, item.getRelease_task().getTask());
+        }
+    }
 }

+ 9 - 8
app/src/main/java/com/sheep/gamegroup/view/adapter/WelfareAdapter.java

@@ -22,6 +22,7 @@ import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.service.DownloadService;
 import com.sheep.jiuyan.samllsheep.utils.G;
 
 import java.util.List;
@@ -62,11 +63,10 @@ public class WelfareAdapter extends AdbCommonRecycler<TaskReleaseEty>{
         TextView item_download_welfare_btn_top = (TextView)holder.getView(R.id.item_download_welfare_btn_top);
         View item_download_welfare_line = holder.getView(R.id.item_download_welfare_line);
         item_download_welfare_line.setVisibility(holder.getAdapterPosition() + 1 == getItemCount() ? View.GONE : View.VISIBLE);
-        item_download_welfare_num_tv.setVisibility(View.GONE);
+        item_download_welfare_num_tv1.setVisibility(View.GONE);
         if(item == null){
             ViewUtil.setDefaultText(item_download_welfare_name_tv);
             ViewUtil.setDefaultText(item_download_welfare_num_tv);
-            ViewUtil.setDefaultText(item_download_welfare_num_tv1);
             ViewUtil.setDefaultText(item_download_welfare_date_tv);
             ViewUtil.setDefaultText(item_download_welfare_money);
             item_download_welfare_iv2.setVisibility(View.GONE);
@@ -78,14 +78,14 @@ public class WelfareAdapter extends AdbCommonRecycler<TaskReleaseEty>{
             GlideImageLoader.setGameImage(item_download_welfare_iv, itemTask.getIcon());
             ViewUtil.setText(item_download_welfare_name_tv, item.getName());
             ViewUtil.setH5Text(item_download_welfare_money, item.getH5BonusText());
-            ViewUtil.setText(item_download_welfare_num_tv, item.getGiftRatioText());
+//            ViewUtil.setText(item_download_welfare_num_tv, item.getGiftRatioText());
             ViewUtil.setText(item_download_welfare_date_tv, item.getDateText());
             item_download_welfare_iv2.setVisibility(item.isTaskFinished()? View.VISIBLE : View.INVISIBLE);
 
             item_download_welfare_btn_bottom.setTag(PUBLIC_TAG_PREFIX_TEXTVIEW_LIST + itemTask.getDownload_link());
             switch (item.getUser_task_status()){//1,已接受任务 2,正在进行中,3完成任务,4放弃任务,5任务失败,6审核失败,7提交审核,8任务已下线,9至少完成了一个任务了
                 case 0:
-                    ViewUtil.setText(item_download_welfare_num_tv1, item.getLastNumText());
+                    ViewUtil.setText(item_download_welfare_num_tv, item.getLastNumText());
                     item_download_welfare_money.setVisibility(View.VISIBLE);
                     item_download_welfare_btn_top.setVisibility(View.INVISIBLE);
                     item_download_welfare_btn_bottom.setEnabled(true);
@@ -99,7 +99,7 @@ public class WelfareAdapter extends AdbCommonRecycler<TaskReleaseEty>{
                     break;
                 case 1:
                 case 2:
-                    ViewUtil.setText(item_download_welfare_num_tv1, item.getLastNumText());
+                    ViewUtil.setText(item_download_welfare_num_tv, item.getLastNumText());
                     item_download_welfare_money.setVisibility(View.VISIBLE);
                     item_download_welfare_btn_top.setVisibility(View.INVISIBLE);
                     item_download_welfare_btn_bottom.setEnabled(true);
@@ -125,7 +125,7 @@ public class WelfareAdapter extends AdbCommonRecycler<TaskReleaseEty>{
                     }
                     break;
                 case 3:
-                    ViewUtil.setH5Text(item_download_welfare_num_tv1, item.getH5BonusText());
+                    ViewUtil.setH5Text(item_download_welfare_num_tv, item.getH5BonusText());
                     item_download_welfare_money.setVisibility(View.INVISIBLE);
                     item_download_welfare_btn_top.setVisibility(View.VISIBLE);
                     item.getDownloadHelper().updateDownloadTaskView((Activity) context, itemTask, item_download_welfare_btn_bottom);
@@ -144,7 +144,7 @@ public class WelfareAdapter extends AdbCommonRecycler<TaskReleaseEty>{
                     });
                     break;
                 default:
-                    ViewUtil.setText(item_download_welfare_num_tv1, item.getLastNumText());
+                    ViewUtil.setText(item_download_welfare_num_tv, item.getLastNumText());
                     item_download_welfare_money.setVisibility(View.VISIBLE);
                     item_download_welfare_btn_top.setVisibility(View.INVISIBLE);
                     item_download_welfare_btn_bottom.setText("已经下线");
@@ -157,6 +157,7 @@ public class WelfareAdapter extends AdbCommonRecycler<TaskReleaseEty>{
                     Jump2View.getInstance().goGameTaskDetailView(context,  item.getId(), itemTask.getThird_task_id(),1);
                 }
             });
+            DownloadService.setDownLoadLongClick(holder.itemView, item.getTask());
         }
     }
 
@@ -170,7 +171,7 @@ public class WelfareAdapter extends AdbCommonRecycler<TaskReleaseEty>{
         object.put("device_id", device_id);
         object.put("release_task_id", release_task_id);
         object.put("create_time", System.currentTimeMillis() / 1000L);//这里添加时间戳,防止用户抓包后重复使用
-        object.put("app_version", BuildConfig.VERSION_CODE);
+        object.put("app_version", String.valueOf(BuildConfig.VERSION_CODE));
         SheepApp.getInstance()
                 .getNetComponent()
                 .getApiService()

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtFindChild.java

@@ -279,7 +279,7 @@ public class FgtFindChild extends BaseListFragment<FindItem> {
 
     //更新按钮状态与添加点击事件
     private void updateView(Activity activity, FindApp findApp, TextView textView) {
-        if(findApp.isCanDonload()){//可下载
+        if(findApp.isCanDownload()){//可下载
             downLoadTextViewMap.put(findApp.getDownload_link(), textView);
             downLoadTextViewMap.put(findApp.getPackage_name(), textView);
             findAppMap.put(findApp.getDownload_link(),findApp);

+ 3 - 20
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtPlayGame.java

@@ -2,7 +2,6 @@ package com.sheep.gamegroup.view.fragment;
 
 import android.app.Activity;
 import android.content.Context;
-import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
@@ -12,7 +11,6 @@ import android.support.v4.widget.NestedScrollView;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
@@ -62,6 +60,7 @@ import static com.sheep.gamegroup.model.entity.TaskEty.TASK_TYPE_GAME_OTHER;
 import static com.sheep.gamegroup.model.entity.TaskEty.TASK_TYPE_GAME_SHEEP;
 import static com.sheep.gamegroup.model.entity.TaskEty.TASK_TYPE_GAME_TECENT;
 import static com.sheep.gamegroup.model.entity.TaskEty.TASK_TYPE_GAME_XIAO_MI;
+import static com.sheep.gamegroup.view.adapter.PlayGameListAdapter.setOnClickGameEntity;
 
 /**
  * Created by ljy on 2018/9/3.
@@ -183,7 +182,7 @@ public class FgtPlayGame extends BaseFragment {
                     // 加载数据
                     ViewUtil.setText(item_hot_welfare_tv, welfareCenter.getApp().getName());
                     GlideImageLoader.setGameImage(item_hot_welfare_iv, welfareCenter.getApp().getIcon());
-                    onClickToPlayGameDetail(holder.itemView, welfareCenter);
+                    setOnClickGameEntity(activity, holder.itemView, welfareCenter);
                 }
             }
         });
@@ -208,7 +207,7 @@ public class FgtPlayGame extends BaseFragment {
                     // 加载数据
                     ViewUtil.setText(item_hot_welfare_tv, welfareCenter.getApp().getName());
                     GlideImageLoader.setGameImage(item_hot_welfare_iv, welfareCenter.getApp().getIcon());
-                    onClickToPlayGameDetail(holder.itemView, welfareCenter);
+                    setOnClickGameEntity(activity, holder.itemView, welfareCenter);
                 }
             }
         });
@@ -225,22 +224,6 @@ public class FgtPlayGame extends BaseFragment {
         initTab();
     }
 
-    private void onClickToPlayGameDetail(View view, final GameEntity playGameEntity){
-        view.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Jump2View.getInstance().goPlayGameDetail(activity, playGameEntity.getApp().getId());
-            }
-        });
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        // TODO: inflate a fragment view
-        View rootView = super.onCreateView(inflater, container, savedInstanceState);
-        return rootView;
-    }
-
     @Override
     public void onStart() {
         super.onStart();

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtSmallSheep.java

@@ -1017,7 +1017,7 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
         if (isNewData) {
             BaseMessage baseMessage = (BaseMessage) object;
             allTaskAcceptedTaskList = baseMessage.getDataList(TaskAcceptedEty.class);
-            AutoTaskListUtil.getInstance().loadList(allTaskAcceptedTaskList);
+            CommonUtil.getInstance().reloadAutoTaskList(allTaskAcceptedTaskList);
         } else {
             allTaskAcceptedTaskList.clear();
         }

+ 1 - 0
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtTryMakeMoney.java

@@ -179,6 +179,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
             about_to_begin = bundle.getInt("type", 0);
             show_type = bundle.getString("show_type", "");
             isFromHome = !TextUtils.isEmpty(show_type);
+            per_page = isFromHome ? 100 : per_page;//主页直接加载100条数据,不然会卡,待解决卡的问题后修改回去
             switch (show_type){
                 case "is_hot":
                     isGetRelease = true;

+ 2 - 0
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtWelfareCenter.java

@@ -31,6 +31,7 @@ import com.sheep.gamegroup.view.adapter.GiftCenterAdapter;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseFragment;
+import com.sheep.jiuyan.samllsheep.service.DownloadService;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -102,6 +103,7 @@ public class FgtWelfareCenter extends BaseFragment{
                 } else {
                     GlideImageLoader.setGameImage(item_hot_welfare_iv, item.getTask().getIcon());
                     ViewUtil.setText(item_hot_welfare_tv, item.getName());
+                    DownloadService.setDownLoadLongClick(holder.itemView, item.getTask());
                 }
                 holder.itemView.setOnClickListener(new View.OnClickListener() {
                     @Override

+ 0 - 22
app/src/main/java/com/sheep/jiuyan/samllsheep/Config.java

@@ -5,27 +5,5 @@ package com.sheep.jiuyan.samllsheep;
  */
 
 public class Config {
-    private  final static Config mConfig = new Config();
-    private Config() {
-    }
-    public static Config instance() {
-        return mConfig;
-    }
-    //        public String mBaseUrl = "http://10.8.220.132:8088";
-    //    public String mBaseUrl = "http://10.8.220.130:8088";
-    //        public String mBaseUrl = "http://10.8.220.213:8088";
-    //    public String mBaseUrl = "http://10.8.220.130:8088";
-    //何威
-// public String mBaseUrl = "http://10.8.220.6:8088";
-//张伟
-//    public String mBaseUrl = "http://10.8.220.132:8088";
-   public String mBaseUrl = "http://api.task.bandaimi.com";
-//    public String mBaseUrl = "http://test.ss.shouyouquan.com";
-    public final static String WX_APPID = "wx3c0376c4fcc8b723";
     public final static String BUGLY_APPID = "0dd998212c";
-    public String[] mUrlList = new String[]{"http://10.8.220.213:8088", "http://10.8.220.132:8088", "http://test.ss.shouyouquan.com", "http://10.8.220.130:8088", "http://api.task.bandaimi.com"};
-    public void setBaseUrl(String url) {
-        this.mBaseUrl = url;
-    }
-
 }

+ 1 - 1
app/src/main/java/com/sheep/jiuyan/samllsheep/SheepApp.java

@@ -165,7 +165,7 @@ public class SheepApp extends MultiDexApplication {
         super.onCreate();
         if (AppUtil.isMainProcess(this)) {
             mSheepApp = this;
-            connectAddress = ConnectAddress.sheep.getDefultConnectAddress();
+            connectAddress = ConnectAddress.sheep.getDefaultConnectAddress();
             registerActivityLifecycleCallbacks(activityLifecycleCallbacks);
             initNet();
             initUtils();

+ 22 - 10
app/src/main/java/com/sheep/jiuyan/samllsheep/service/DownloadService.java

@@ -10,6 +10,7 @@ import android.net.Uri;
 import android.os.IBinder;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AlertDialog;
+import android.text.TextUtils;
 import android.view.View;
 
 import com.arialyy.annotations.Download;
@@ -19,7 +20,10 @@ import com.kfzs.duanduan.utils.ApkUtils;
 import com.kfzs.duanduan.view.DialogStorageLow;
 import com.sheep.gamegroup.event.BigEvent;
 import com.sheep.gamegroup.event.EventTypes;
+import com.sheep.gamegroup.greendao.download.DownLoadInfo;
 import com.sheep.gamegroup.model.entity.DialogConfig;
+import com.sheep.gamegroup.model.entity.FindApp;
+import com.sheep.gamegroup.model.entity.PlayGameEntity;
 import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.util.ActivityManager;
 import com.sheep.gamegroup.util.DataUtil;
@@ -32,9 +36,7 @@ import com.sheep.jiuyan.samllsheep.utils.G;
 import org.greenrobot.eventbus.EventBus;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.Locale;
-import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 import rx.Observable;
@@ -51,13 +53,13 @@ import static com.sheep.jiuyan.samllsheep.utils.ClassFileHelper.DIR;
 
 public class DownloadService extends Service {
 
-    private DownloadUtil mDownloadTaskService;
+    private DownloadUtil downloadUtil;
 
     @Override
     public void onCreate() {
         super.onCreate();
         Aria.download(this).register();
-        mDownloadTaskService = new DownloadUtil(this);
+        downloadUtil = new DownloadUtil(this);
     }
     public static final String ON_PRE = "onPre";
     public static final String RUNNING = "running";
@@ -76,9 +78,11 @@ public class DownloadService extends Service {
                         String taskStatus = DataUtil.getAsString(String.format(Locale.CHINA, "hasShow[%s]", task.getKey()), ON_PRE);
                         switch (taskStatus) {
                             case ON_PRE:
+                                DownLoadInfo downloadInfo = downloadUtil.getDownloadTaskByUrl(task.getKey());
+                                String taskName = downloadInfo != null ? downloadInfo.getMGameName() : task.getTaskName();
                                 DataUtil.putAsString(String.format(Locale.CHINA, "hasShow[%s]", task.getKey()), HAS_SHOW);
                                 ViewUtil.showMsgDialog(ActivityManager.getInstance().currentActivity(), new DialogConfig().setTitle("提示")
-                                        .setMsg("任务【"+task.getTaskName()+"】下载无响应,是否使用其它下载方式(在列表中长按任务也可选择其它下载方式)").setBtnLeftText("取消").setBtnRightText("确定")
+                                        .setMsg("任务【"+taskName+"】下载无响应,是否使用其它下载方式(在任务列表中长按也可选择其它下载方式)").setBtnLeftText("取消").setBtnRightText("确定")
                                         .setBtnRightOnClickListener(new View.OnClickListener() {
                                             @Override
                                             public void onClick(View view) {
@@ -106,14 +110,14 @@ public class DownloadService extends Service {
     protected void running(DownloadTask task) {
         LogUtil.println("DownloadService", "running", task.getKey(), task.getTaskName(), task.getPercent());
         DataUtil.putAsString(String.format(Locale.CHINA, "hasShow[%s]", task.getKey()), RUNNING);
-        mDownloadTaskService.setDownloadTaskPercent(task.getPercent(), task.getCurrentProgress() / 1024d / 1024d, task.getFileSize() / 1024d / 1024d, 0, task.getKey());
+        downloadUtil.setDownloadTaskPercent(task.getPercent(), task.getCurrentProgress() / 1024d / 1024d, task.getFileSize() / 1024d / 1024d, 0, task.getKey());
         EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.GENERATION_ACCOUNT_REFRESH_ADAPTER).setData(task));
     }
 
     @Download.onTaskStop
     void taskStop(DownloadTask task) {
         LogUtil.println("DownloadService", "taskStop", task.getKey(), task.getTaskName());
-        mDownloadTaskService.setDownloadTaskStatus(task.getKey(), DownloadUtil.STATUS_PAUSE);
+        downloadUtil.setDownloadTaskStatus(task.getKey(), DownloadUtil.STATUS_PAUSE);
         EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.DOWNLOAD_STOP).setData(task));
     }
 
@@ -124,14 +128,14 @@ public class DownloadService extends Service {
     @Download.onTaskCancel
     void taskCancel(DownloadTask task) {
         LogUtil.println("DownloadService", "taskCancel", task.getKey(), task.getTaskName());
-        mDownloadTaskService.deleteDownloadTaskByDownloadUrl(task.getKey());
+        downloadUtil.deleteDownloadTaskByDownloadUrl(task.getKey());
         EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.DOWNLOAD_CANCEL).setData(task));
     }
 
     @Download.onTaskFail
     void taskFail(DownloadTask task) {
         LogUtil.println("DownloadService", "taskFail", task.getKey(), task.getTaskName());
-        mDownloadTaskService.setDownloadTaskStatus(task.getKey(), DownloadUtil.STATUS_FAIL);
+        downloadUtil.setDownloadTaskStatus(task.getKey(), DownloadUtil.STATUS_FAIL);
         EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.DOWNLOAD_FAIL).setData(task));
         //空间不足,弹框提示
         try {
@@ -146,7 +150,7 @@ public class DownloadService extends Service {
     @Download.onTaskComplete
     void taskComplete(DownloadTask task) {
         LogUtil.println("DownloadService", "taskComplete", task.getKey(), task.getTaskName());
-        mDownloadTaskService.setDownloadTaskFinish(task.getKey(), task.getDownloadPath());
+        downloadUtil.setDownloadTaskFinish(task.getKey(), task.getDownloadPath());
         ApkUtils.installApk(getApplicationContext(), task.getDownloadPath());
         EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.DOWNLOAD_COMPLETE).setData(task));
     }
@@ -166,6 +170,14 @@ public class DownloadService extends Service {
         if(task != null && task.needDownloadApp())
             setDownLoadLongClick(view, task.getDownload_link(), task.getTask_name());
     }
+    public static void setDownLoadLongClick(View view, final FindApp task) {
+        if(task != null && !TextUtils.isEmpty(task.getDownload_link()))
+            setDownLoadLongClick(view, task.getDownload_link(), task.getTask_name());
+    }
+    public static void setDownLoadLongClick(View view, final PlayGameEntity task) {
+        if(task != null && task.isCanDownload())
+            setDownLoadLongClick(view, task.getDownload_link(), task.getTask_name());
+    }
 
     public static void setDownLoadLongClick(View view, final String link, final String taskName) {
         view.setOnLongClickListener(new View.OnLongClickListener() {

+ 1 - 1
app/src/main/res/values/strings.xml

@@ -45,7 +45,7 @@
     <string name="user_know_three">3、若用户的充值不能满足相应条件,则平台会以绵羊币的形式退还给用户,您仍然可以在下次充值继续使用;</string>
     <string name="user_know_four">4、下载成功后,请进入游戏任务—我的游戏,点击充值进行消费;</string>
 
-    <string name="supplement_explain">部分机型的用户需要去手机设置里开启允许小绵羊查看应用使用情况权限,方可点击 \"领取奖励\" 完成</string>
+    <string name="supplement_explain">部分机型的用户需要去手机设置里开启允许小绵羊查看应用使用情况权限,方可正常完成任务</string>
     <string name="supplement_explain_n">补充说明(点我开启权限)</string>
     <string name="warm_prompt_n">温馨提示</string>
     <string name="warm_prompt_content">游戏必须是在小绵羊平台下载的游戏,且游戏账号是新注册的,否者任务奖励无法使用。</string>