Bläddra i källkod

leakcanary memory optionmize

billyyoyo 7 år sedan
förälder
incheckning
8d023b39ba
30 ändrade filer med 190 tillägg och 216 borttagningar
  1. 1 0
      app/build.gradle
  2. 1 1
      app/src/main/java/com/sheep/gamegroup/event/EventDownloadHandler.java
  3. 69 96
      app/src/main/java/com/sheep/gamegroup/greendao/DDProviderHelper.java
  4. 12 12
      app/src/main/java/com/sheep/gamegroup/greendao/download/DaoMaster.java
  5. 47 47
      app/src/main/java/com/sheep/gamegroup/greendao/download/DaoSession.java
  6. 1 1
      app/src/main/java/com/sheep/gamegroup/helper/DownloadHelper.java
  7. 1 1
      app/src/main/java/com/sheep/gamegroup/util/CertificationUtil.java
  8. 5 5
      app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java
  9. 14 17
      app/src/main/java/com/sheep/gamegroup/util/DownloadUtil.java
  10. 1 1
      app/src/main/java/com/sheep/gamegroup/view/activity/ActDownloadMgr.java
  11. 2 2
      app/src/main/java/com/sheep/gamegroup/view/activity/ActMiDong.java
  12. 3 3
      app/src/main/java/com/sheep/gamegroup/view/activity/ActSearchAppOrTask.java
  13. 2 4
      app/src/main/java/com/sheep/gamegroup/view/activity/DialogToastAct.java
  14. 2 2
      app/src/main/java/com/sheep/gamegroup/view/activity/GameCertificationActivity.java
  15. 8 8
      app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAct.java
  16. 1 1
      app/src/main/java/com/sheep/gamegroup/view/adapter/AdListAdapter.java
  17. 2 1
      app/src/main/java/com/sheep/gamegroup/view/adapter/AdpMiDong.java
  18. 1 1
      app/src/main/java/com/sheep/gamegroup/view/adapter/PlayGameItemAdapter.java
  19. 1 1
      app/src/main/java/com/sheep/gamegroup/view/adapter/TryMakeMoneyAdp.java
  20. 1 1
      app/src/main/java/com/sheep/gamegroup/view/dialog/DialogAccountAbnormal.java
  21. 1 1
      app/src/main/java/com/sheep/gamegroup/view/dialog/DialogMidong.java
  22. 2 1
      app/src/main/java/com/sheep/gamegroup/view/fragment/FgtMiDongAdTskList.java
  23. 2 1
      app/src/main/java/com/sheep/gamegroup/view/fragment/FgtMiDongSignTskList.java
  24. 3 2
      app/src/main/java/com/sheep/gamegroup/view/fragment/FgtMiDongWeChatTaskList.java
  25. 1 1
      app/src/main/java/com/sheep/jiuyan/samllsheep/SheepApp.java
  26. 1 1
      app/src/main/java/com/sheep/jiuyan/samllsheep/service/AutoCheckService.java
  27. 1 1
      app/src/main/java/com/sheep/jiuyan/samllsheep/service/DownloadService.java
  28. 1 1
      app/src/main/java/com/sheep/jiuyan/samllsheep/service/ListenerShotNewService.java
  29. 1 1
      app/src/main/java/com/sheep/jiuyan/samllsheep/service/ListenerShotService.java
  30. 2 1
      app/src/main/java/com/youmi/android/offer/YmPermissionUtil.java

+ 1 - 0
app/build.gradle

@@ -320,6 +320,7 @@ dependencies {
 //        exclude group: 'com.github.bumptech.glide', module: 'disklrucache'
 //        exclude group: 'com.github.bumptech.glide', module: 'annotations'
     }
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.1.1'
 
     //    implementation 'com.github.yalantis:ucrop:2.2.1-native'
 

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/event/EventDownloadHandler.java

@@ -25,7 +25,7 @@ public class EventDownloadHandler {
     public static EventDownloadHandler newInstance(Context context, OnDownCallback callback) {
         mContext = context;
         eventDownloadHandler = new EventDownloadHandler();
-        downloadTaskService = new DownloadUtil(mContext);
+        downloadTaskService = new DownloadUtil();
         onDownCallback = callback;
         return eventDownloadHandler;
     }

+ 69 - 96
app/src/main/java/com/sheep/gamegroup/greendao/DDProviderHelper.java

@@ -1,7 +1,5 @@
 package com.sheep.gamegroup.greendao;
 
-import android.content.Context;
-
 import com.sheep.gamegroup.greendao.download.AcceptTaskRecord;
 import com.sheep.gamegroup.greendao.download.AcceptTaskRecordDao;
 import com.sheep.gamegroup.greendao.download.DaoMaster;
@@ -18,6 +16,7 @@ import com.sheep.gamegroup.greendao.download.SearchRecord;
 import com.sheep.gamegroup.greendao.download.SearchRecordDao;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.DownloadUtil;
+import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.service.AutoCheckService;
 
 import java.util.List;
@@ -47,10 +46,10 @@ public class DDProviderHelper {
     private DaoMaster.DevOpenHelper openHelper;
     private DaoSession daoSession;
 
-    private synchronized DaoSession getDaossion(Context context) {
+    private synchronized DaoSession getDaossion() {
         if(daoSession == null) {
             if (openHelper == null) {
-                openHelper = new DaoMaster.DevOpenHelper(context, "dd.db");
+                openHelper = new DaoMaster.DevOpenHelper(SheepApp.getInstance(), "dd.db");
             }
             daoSession = new DaoMaster(openHelper.getReadableDb()).newSession();
         }
@@ -60,11 +59,10 @@ public class DDProviderHelper {
     /**
      * 获取下载任务列表
      *
-     * @param context
      * @return
      */
-    public List<DownLoadInfo> getDownloadList(Context context) {
-        List<DownLoadInfo> list = getDaossion(context).getDownLoadInfoDao().queryBuilder().build().list();
+    public List<DownLoadInfo> getDownloadList() {
+        List<DownLoadInfo> list = getDaossion().getDownLoadInfoDao().queryBuilder().build().list();
         return list;
     }
 
@@ -72,22 +70,20 @@ public class DDProviderHelper {
     /**
      * 更新下载任务状态;
      *
-     * @param context
      * @param info
      */
-    public void updateDownload(Context context, DownLoadInfo info) {
-        DownLoadInfoDao loadInfoDao = getDaossion(context).getDownLoadInfoDao();
+    public void updateDownload(DownLoadInfo info) {
+        DownLoadInfoDao loadInfoDao = getDaossion().getDownLoadInfoDao();
         loadInfoDao.update(info);
     }
 
     /**
      * 添加或更新任务
      *
-     * @param context
      * @param info
      */
-    public boolean addOrUpDataDownloadTask(Context context, DownLoadInfo info) {
-        DownLoadInfoDao infoDao = getDaossion(context).getDownLoadInfoDao();
+    public boolean addOrUpDataDownloadTask(DownLoadInfo info) {
+        DownLoadInfoDao infoDao = getDaossion().getDownLoadInfoDao();
         DownLoadInfo downLoadInfo = infoDao
                 .queryBuilder()
                 .where(DownLoadInfoDao.Properties.MDownloadUrl.eq(info.getMDownloadUrl()))
@@ -110,10 +106,9 @@ public class DDProviderHelper {
     /**
      * 删除所有任务;
      *
-     * @param context
      */
-    public void deleteAllDownloadTask(Context context) {
-        DownLoadInfoDao loadInfoDao = getDaossion(context).getDownLoadInfoDao();
+    public void deleteAllDownloadTask() {
+        DownLoadInfoDao loadInfoDao = getDaossion().getDownLoadInfoDao();
         loadInfoDao.deleteAll();
     }
 
@@ -121,12 +116,11 @@ public class DDProviderHelper {
     /**
      * 删除指定任务;
      *
-     * @param context
      * @param url
      */
-    public boolean deleteDownloadTaskByUrl(Context context, String url) {
+    public boolean deleteDownloadTaskByUrl(String url) {
         try {
-            DownLoadInfoDao loadInfoDao = getDaossion(context).getDownLoadInfoDao();
+            DownLoadInfoDao loadInfoDao = getDaossion().getDownLoadInfoDao();
             DownLoadInfo loadInfo = loadInfoDao.queryBuilder()
                     .where(DownLoadInfoDao.Properties.MDownloadUrl.eq(url))
                     .build()
@@ -142,10 +136,9 @@ public class DDProviderHelper {
     /**
      * 获取下载中的任务;
      *
-     * @param ctx
      */
-    public List<DownLoadInfo> getDownloadingTask(Context ctx) {
-        List<DownLoadInfo> loadInfos = getDaossion(ctx)
+    public List<DownLoadInfo> getDownloadingTask() {
+        List<DownLoadInfo> loadInfos = getDaossion()
                 .getDownLoadInfoDao()
                 .queryBuilder()
                 .where(DownLoadInfoDao.Properties.MStatus.eq(2))
@@ -159,8 +152,8 @@ public class DDProviderHelper {
      *
      * @param downloadUrl
      */
-    public DownLoadInfo getDownloadTask(Context context, String downloadUrl) {
-        DownLoadInfo downLoadInfo = getDaossion(context)
+    public DownLoadInfo getDownloadTask(String downloadUrl) {
+        DownLoadInfo downLoadInfo = getDaossion()
                 .getDownLoadInfoDao()
                 .queryBuilder()
                 .where(DownLoadInfoDao.Properties.MDownloadUrl.eq(downloadUrl))
@@ -174,8 +167,8 @@ public class DDProviderHelper {
      *
      * @param packName
      */
-    public DownLoadInfo getDownloadTaskToPackname(Context context, String packName) {
-        DownLoadInfo downLoadInfo = getDaossion(context)
+    public DownLoadInfo getDownloadTaskToPackname(String packName) {
+        DownLoadInfo downLoadInfo = getDaossion()
                 .getDownLoadInfoDao()
                 .queryBuilder()
                 .where(DownLoadInfoDao.Properties.MPackageName.eq(packName))
@@ -188,16 +181,15 @@ public class DDProviderHelper {
     /**
      * 下载任务完成
      *
-     * @param ctx
      * @param downloadUrl
      * @param apkPath
      */
-    public DownLoadInfo setDownloadTaskFinish(Context ctx, String downloadUrl, String apkPath) {
-        DownLoadInfo downloadTask = getDownloadTask(ctx, downloadUrl);
+    public DownLoadInfo setDownloadTaskFinish(String downloadUrl, String apkPath) {
+        DownLoadInfo downloadTask = getDownloadTask(downloadUrl);
         if (downloadTask != null) {
             downloadTask.setMApkPath(apkPath);
             downloadTask.setMStatus(DownloadUtil.STATUS_FINISH);//DownloadTaskService.STATUS_FINISH
-            getDaossion(ctx).getDownLoadInfoDao().update(downloadTask);
+            getDaossion().getDownLoadInfoDao().update(downloadTask);
         }
         return downloadTask;
     }
@@ -205,13 +197,12 @@ public class DDProviderHelper {
     /**
      * 更新任务状态
      *
-     * @param ctx
      * @param downloadedSize
      * @param downloadTaskId
      * @param downloadUrl
      */
-    public DownLoadInfo updateDownloadPercent(Context ctx, double downloadedSize, String averageSpeed, int downloadTaskId, String downloadUrl, int state) {
-        DownLoadInfo downloadTask = getDownloadTask(ctx, downloadUrl);
+    public DownLoadInfo updateDownloadPercent(double downloadedSize, String averageSpeed, int downloadTaskId, String downloadUrl, int state) {
+        DownLoadInfo downloadTask = getDownloadTask(downloadUrl);
         if (downloadTask != null) {
             int percent = (int) (downloadedSize * 100 / downloadTask.getMTotalSize());
             downloadTask.setMPercent(percent);
@@ -219,7 +210,7 @@ public class DDProviderHelper {
             downloadTask.setMDownloadedSize(downloadedSize);
             downloadTask.setMDownloadTaskId(downloadTaskId);
             downloadTask.setMStatus(state);//2下载中
-            updateDownload(ctx, downloadTask);
+            updateDownload(downloadTask);
         }
         return downloadTask;
     }
@@ -227,22 +218,21 @@ public class DDProviderHelper {
     /**
      * 更新任务状态
      *
-     * @param ctx
      * @param percent
      * @param downloadedSize
      * @param totalSize
      * @param downloadTaskId
      * @param downloadUrl
      */
-    public void updateDownloadPercent(Context ctx, int percent, double downloadedSize, double totalSize, int downloadTaskId, String downloadUrl, int state) {
-        DownLoadInfo downloadTask = getDownloadTask(ctx, downloadUrl);
+    public void updateDownloadPercent(int percent, double downloadedSize, double totalSize, int downloadTaskId, String downloadUrl, int state) {
+        DownLoadInfo downloadTask = getDownloadTask(downloadUrl);
         if (downloadTask != null) {
             downloadTask.setMPercent(percent);
             downloadTask.setMTotalSize(totalSize);
             downloadTask.setMDownloadedSize(downloadedSize);
             downloadTask.setMDownloadTaskId(downloadTaskId);
             downloadTask.setMStatus(state);//2下载中
-            updateDownload(ctx, downloadTask);
+            updateDownload(downloadTask);
         }
     }
 
@@ -250,16 +240,15 @@ public class DDProviderHelper {
     /**
      * 添加文件总长度
      *
-     * @param ctx
      * @param downloadUrl
      * @param totalLength
      */
-    public DownLoadInfo setDownloadTaskTotal(Context ctx, String downloadUrl, double totalLength) {
+    public DownLoadInfo setDownloadTaskTotal(String downloadUrl, double totalLength) {
         try {
-            DownLoadInfo downloadTask = getDownloadTask(ctx, downloadUrl);
+            DownLoadInfo downloadTask = getDownloadTask(downloadUrl);
             if (downloadTask != null) {
                 downloadTask.setMTotalSize(totalLength);
-                updateDownload(ctx, downloadTask);
+                updateDownload(downloadTask);
                 return downloadTask;
             }
             return null;
@@ -272,16 +261,15 @@ public class DDProviderHelper {
     /**
      * 改变任务状态
      *
-     * @param ctx
      * @param downloadUrl
      * @param status
      */
-    public DownLoadInfo setDownloadTaskStatus(Context ctx, String downloadUrl, int status) {
+    public DownLoadInfo setDownloadTaskStatus(String downloadUrl, int status) {
         try {
-            DownLoadInfo downloadTask = getDownloadTask(ctx, downloadUrl);
+            DownLoadInfo downloadTask = getDownloadTask(downloadUrl);
             if (downloadTask != null) {
                 downloadTask.setMStatus(status);
-                updateDownload(ctx, downloadTask);
+                updateDownload(downloadTask);
                 return downloadTask;
             }
             return null;
@@ -294,10 +282,9 @@ public class DDProviderHelper {
     /**
      * app启动  所有任务全部暂停
      *
-     * @param context
      */
-    public void restoreDownloadTaskStatus(Context context) {
-        DownLoadInfoDao downLoadInfoDao = getDaossion(context).getDownLoadInfoDao();
+    public void restoreDownloadTaskStatus() {
+        DownLoadInfoDao downLoadInfoDao = getDaossion().getDownLoadInfoDao();
         List<DownLoadInfo> list = downLoadInfoDao
                 .queryBuilder()
                 .whereOr(DownLoadInfoDao.Properties.MStatus.eq(0), DownLoadInfoDao.Properties.MStatus.eq(2))
@@ -317,22 +304,20 @@ public class DDProviderHelper {
      * 添加或更新记录
      * 添加成功返回true
      *
-     * @param context
      * @param newInfo
      */
-    public boolean addOrUpdateProcessRecord(Context context, ProcessRecord newInfo) {
-        return addOrUpdateProcessRecord(context, newInfo, null);
+    public boolean addOrUpdateProcessRecord(ProcessRecord newInfo) {
+        return addOrUpdateProcessRecord(newInfo, null);
     }
 
     /**
      * 添加或更新记录
      * 添加成功返回true
      *
-     * @param context
      * @param newInfo
      */
-    public boolean addOrUpdateProcessRecord(Context context, ProcessRecord newInfo, Action1<ProcessRecord> action1) {
-        ProcessRecordDao infoDao = getDaossion(context).getProcessRecordDao();
+    public boolean addOrUpdateProcessRecord(ProcessRecord newInfo, Action1<ProcessRecord> action1) {
+        ProcessRecordDao infoDao = getDaossion().getProcessRecordDao();
         ProcessRecord lastInfo = infoDao
                 .queryBuilder()
                 .where(ProcessRecordDao.Properties.PackageName.eq(newInfo.getPackageName()), ProcessRecordDao.Properties.UserId.eq(newInfo.getUserId()))
@@ -359,8 +344,8 @@ public class DDProviderHelper {
      *
      * @param packageName
      */
-    public ProcessRecord getProcessRecord(Context context, String packageName) {
-        ProcessRecord processRecord = getDaossion(context)
+    public ProcessRecord getProcessRecord(String packageName) {
+        ProcessRecord processRecord = getDaossion()
                 .getProcessRecordDao()
                 .queryBuilder()
                 .where(ProcessRecordDao.Properties.PackageName.eq(packageName))
@@ -373,12 +358,11 @@ public class DDProviderHelper {
      * 添加记录
      * 添加成功返回true
      *
-     * @param context
      * @param newInfo
      */
-    public boolean addAcceptTaskRecord(Context context, AcceptTaskRecord newInfo) {
+    public boolean addAcceptTaskRecord(AcceptTaskRecord newInfo) {
         try {
-            AcceptTaskRecordDao infoDao = getDaossion(context).getAcceptTaskRecordDao();
+            AcceptTaskRecordDao infoDao = getDaossion().getAcceptTaskRecordDao();
             infoDao.insert(newInfo);
         } catch (Exception e) {
             e.printStackTrace();
@@ -391,12 +375,11 @@ public class DDProviderHelper {
      * 更新记录
      * 添加成功返回true
      *
-     * @param context
      * @param newInfo
      */
-    public boolean updateAcceptTaskRecord(Context context, AcceptTaskRecord newInfo) {
+    public boolean updateAcceptTaskRecord(AcceptTaskRecord newInfo) {
         try {
-            AcceptTaskRecordDao infoDao = getDaossion(context).getAcceptTaskRecordDao();
+            AcceptTaskRecordDao infoDao = getDaossion().getAcceptTaskRecordDao();
             infoDao.update(newInfo);
         } catch (Exception e) {
             e.printStackTrace();
@@ -410,8 +393,8 @@ public class DDProviderHelper {
      *
      * @param packageName
      */
-    public AcceptTaskRecord getAcceptTaskRecord(Context context, String packageName) {
-        return getDaossion(context)
+    public AcceptTaskRecord getAcceptTaskRecord(String packageName) {
+        return getDaossion()
                 .getAcceptTaskRecordDao()
                 .queryBuilder()
                 .where(AcceptTaskRecordDao.Properties.PackageName.eq(packageName))
@@ -422,14 +405,13 @@ public class DDProviderHelper {
     /**
      * 删除用户的任务记录数据
      *
-     * @param context
      */
-    public void deleteTaskRecord(Context context) {
+    public void deleteTaskRecord() {
         if (AutoCheckService.IS_USE_THIS_SERVICE) {
-            ProcessRecordDao processRecordDao = getDaossion(context).getProcessRecordDao();
+            ProcessRecordDao processRecordDao = getDaossion().getProcessRecordDao();
             processRecordDao.deleteAll();
         } else {
-            AcceptTaskRecordDao acceptTaskRecordDao = getDaossion(context).getAcceptTaskRecordDao();
+            AcceptTaskRecordDao acceptTaskRecordDao = getDaossion().getAcceptTaskRecordDao();
             acceptTaskRecordDao.deleteAll();
         }
     }
@@ -438,12 +420,11 @@ public class DDProviderHelper {
      * 添加截图记录
      * 添加成功返回true
      *
-     * @param context
      * @param newInfo
      */
-    public boolean addScreenShotRecord(Context context, ScreenShotRecord newInfo) {
+    public boolean addScreenShotRecord(ScreenShotRecord newInfo) {
         try {
-            ScreenShotRecordDao infoDao = getDaossion(context).getScreenShotRecordDao();
+            ScreenShotRecordDao infoDao = getDaossion().getScreenShotRecordDao();
             infoDao.insert(newInfo);
         } catch (Exception e) {
             e.printStackTrace();
@@ -455,10 +436,9 @@ public class DDProviderHelper {
     /**
      * 获取对应包名下的截图列表
      *
-     * @param ctx
      */
-    public List<ScreenShotRecord> getScreenShotRecordList(Context ctx, String packageName) {
-        return getDaossion(ctx)
+    public List<ScreenShotRecord> getScreenShotRecordList(String packageName) {
+        return getDaossion()
                 .getScreenShotRecordDao()
                 .queryBuilder()
                 .where(ScreenShotRecordDao.Properties.PackageName.eq(packageName), ScreenShotRecordDao.Properties.UserId.eq(DataUtil.getInstance().getUserId()))
@@ -469,10 +449,9 @@ public class DDProviderHelper {
     /**
      * 是否监听到该截图
      *
-     * @param ctx
      */
-    public ScreenShotRecord getScreenShotRecord(Context ctx, String packageName, String imagePath) {
-        return getDaossion(ctx)
+    public ScreenShotRecord getScreenShotRecord(String packageName, String imagePath) {
+        return getDaossion()
                 .getScreenShotRecordDao()
                 .queryBuilder()
                 .where(ScreenShotRecordDao.Properties.PackageName.eq(packageName), ScreenShotRecordDao.Properties.Path.eq(imagePath), ScreenShotRecordDao.Properties.UserId.eq(DataUtil.getInstance().getUserId()))
@@ -483,10 +462,9 @@ public class DDProviderHelper {
     /**
      * 获取对应服务器下所有登录过的用户列表
      *
-     * @param ctx
      */
-    public List<SdkLoginUser> getSdkLoginUserList(Context ctx, String serviceName) {
-        return getDaossion(ctx)
+    public List<SdkLoginUser> getSdkLoginUserList(String serviceName) {
+        return getDaossion()
                 .getSdkLoginUserDao()
                 .queryBuilder()
                 .where(SdkLoginUserDao.Properties.ServiceName.eq(serviceName))
@@ -498,11 +476,10 @@ public class DDProviderHelper {
      * 添加或更新记录
      * 添加成功返回true
      *
-     * @param context
      * @param newInfo
      */
-    public boolean addOrUpdateSdkLoginUser(Context context, SdkLoginUser newInfo, Action1<SdkLoginUser> action1) {
-        SdkLoginUserDao infoDao = getDaossion(context).getSdkLoginUserDao();
+    public boolean addOrUpdateSdkLoginUser(SdkLoginUser newInfo, Action1<SdkLoginUser> action1) {
+        SdkLoginUserDao infoDao = getDaossion().getSdkLoginUserDao();
         SdkLoginUser lastInfo = infoDao
                 .queryBuilder()
                 .where(SdkLoginUserDao.Properties.ServiceName.eq(newInfo.getServiceName()), SdkLoginUserDao.Properties.Token.eq(newInfo.getToken()))
@@ -528,12 +505,11 @@ public class DDProviderHelper {
      * 删除sdkLoginUser记录
      * 删除成功返回true
      *
-     * @param context
      * @param oldInfo
      */
-    public boolean deleteSdkLoginUser(Context context, SdkLoginUser oldInfo) {
+    public boolean deleteSdkLoginUser(SdkLoginUser oldInfo) {
         if (oldInfo != null) {
-            SdkLoginUserDao loadInfoDao = getDaossion(context).getSdkLoginUserDao();
+            SdkLoginUserDao loadInfoDao = getDaossion().getSdkLoginUserDao();
             try {
                 loadInfoDao.delete(oldInfo);
                 return true;
@@ -558,11 +534,10 @@ public class DDProviderHelper {
      * 添加或更新搜索记录
      * 添加成功返回true
      *
-     * @param context
      * @param newInfo
      */
-    public boolean addOrUpdateSearchRecord(Context context, SearchRecord newInfo, Action1<SearchRecord> action1) {
-        SearchRecordDao infoDao = getDaossion(context).getSearchRecordDao();
+    public boolean addOrUpdateSearchRecord(SearchRecord newInfo, Action1<SearchRecord> action1) {
+        SearchRecordDao infoDao = getDaossion().getSearchRecordDao();
         SearchRecord lastInfo = infoDao
                 .queryBuilder()
                 .where(SearchRecordDao.Properties.Input.eq(newInfo.getInput()))
@@ -589,10 +564,9 @@ public class DDProviderHelper {
     /**
      * 获取搜索历史(根据搜索次数来排序)
      *
-     * @param ctx
      */
-    public List<SearchRecord> getSearchRecordList(Context ctx, int limit) {
-        return getDaossion(ctx)
+    public List<SearchRecord> getSearchRecordList(int limit) {
+        return getDaossion()
                 .getSearchRecordDao()
                 .queryBuilder()
                 .limit(limit)
@@ -605,12 +579,11 @@ public class DDProviderHelper {
      * 删除搜索记录
      * 删除成功返回true
      *
-     * @param context
      * @param oldInfo
      */
-    public boolean deleteSearchRecord(Context context, SearchRecord oldInfo) {
+    public boolean deleteSearchRecord(SearchRecord oldInfo) {
         if (oldInfo != null) {
-            SearchRecordDao loadInfoDao = getDaossion(context).getSearchRecordDao();
+            SearchRecordDao loadInfoDao = getDaossion().getSearchRecordDao();
             try {
                 loadInfoDao.delete(oldInfo);
                 return true;

+ 12 - 12
app/src/main/java/com/sheep/gamegroup/greendao/download/DaoMaster.java

@@ -21,24 +21,24 @@ public class DaoMaster extends AbstractDaoMaster {
 
     /** Creates underlying database table using DAOs. */
     public static void createAllTables(Database db, boolean ifNotExists) {
-        AcceptTaskRecordDao.createTable(db, ifNotExists);
-        AppdownloadBeanDao.createTable(db, ifNotExists);
-        DownLoadInfoDao.createTable(db, ifNotExists);
         ProcessRecordDao.createTable(db, ifNotExists);
-        ScreenShotRecordDao.createTable(db, ifNotExists);
+        AppdownloadBeanDao.createTable(db, ifNotExists);
         SdkLoginUserDao.createTable(db, ifNotExists);
+        ScreenShotRecordDao.createTable(db, ifNotExists);
+        AcceptTaskRecordDao.createTable(db, ifNotExists);
         SearchRecordDao.createTable(db, ifNotExists);
+        DownLoadInfoDao.createTable(db, ifNotExists);
     }
 
     /** Drops underlying database table using DAOs. */
     public static void dropAllTables(Database db, boolean ifExists) {
-        AcceptTaskRecordDao.dropTable(db, ifExists);
-        AppdownloadBeanDao.dropTable(db, ifExists);
-        DownLoadInfoDao.dropTable(db, ifExists);
         ProcessRecordDao.dropTable(db, ifExists);
-        ScreenShotRecordDao.dropTable(db, ifExists);
+        AppdownloadBeanDao.dropTable(db, ifExists);
         SdkLoginUserDao.dropTable(db, ifExists);
+        ScreenShotRecordDao.dropTable(db, ifExists);
+        AcceptTaskRecordDao.dropTable(db, ifExists);
         SearchRecordDao.dropTable(db, ifExists);
+        DownLoadInfoDao.dropTable(db, ifExists);
     }
 
     /**
@@ -57,13 +57,13 @@ public class DaoMaster extends AbstractDaoMaster {
 
     public DaoMaster(Database db) {
         super(db, SCHEMA_VERSION);
-        registerDaoClass(AcceptTaskRecordDao.class);
-        registerDaoClass(AppdownloadBeanDao.class);
-        registerDaoClass(DownLoadInfoDao.class);
         registerDaoClass(ProcessRecordDao.class);
-        registerDaoClass(ScreenShotRecordDao.class);
+        registerDaoClass(AppdownloadBeanDao.class);
         registerDaoClass(SdkLoginUserDao.class);
+        registerDaoClass(ScreenShotRecordDao.class);
+        registerDaoClass(AcceptTaskRecordDao.class);
         registerDaoClass(SearchRecordDao.class);
+        registerDaoClass(DownLoadInfoDao.class);
     }
 
     public DaoSession newSession() {

+ 47 - 47
app/src/main/java/com/sheep/gamegroup/greendao/download/DaoSession.java

@@ -8,21 +8,21 @@ import org.greenrobot.greendao.database.Database;
 import org.greenrobot.greendao.identityscope.IdentityScopeType;
 import org.greenrobot.greendao.internal.DaoConfig;
 
-import com.sheep.gamegroup.greendao.download.AcceptTaskRecord;
-import com.sheep.gamegroup.greendao.download.AppdownloadBean;
-import com.sheep.gamegroup.greendao.download.DownLoadInfo;
 import com.sheep.gamegroup.greendao.download.ProcessRecord;
-import com.sheep.gamegroup.greendao.download.ScreenShotRecord;
+import com.sheep.gamegroup.greendao.download.AppdownloadBean;
 import com.sheep.gamegroup.greendao.download.SdkLoginUser;
+import com.sheep.gamegroup.greendao.download.ScreenShotRecord;
+import com.sheep.gamegroup.greendao.download.AcceptTaskRecord;
 import com.sheep.gamegroup.greendao.download.SearchRecord;
+import com.sheep.gamegroup.greendao.download.DownLoadInfo;
 
-import com.sheep.gamegroup.greendao.download.AcceptTaskRecordDao;
-import com.sheep.gamegroup.greendao.download.AppdownloadBeanDao;
-import com.sheep.gamegroup.greendao.download.DownLoadInfoDao;
 import com.sheep.gamegroup.greendao.download.ProcessRecordDao;
-import com.sheep.gamegroup.greendao.download.ScreenShotRecordDao;
+import com.sheep.gamegroup.greendao.download.AppdownloadBeanDao;
 import com.sheep.gamegroup.greendao.download.SdkLoginUserDao;
+import com.sheep.gamegroup.greendao.download.ScreenShotRecordDao;
+import com.sheep.gamegroup.greendao.download.AcceptTaskRecordDao;
 import com.sheep.gamegroup.greendao.download.SearchRecordDao;
+import com.sheep.gamegroup.greendao.download.DownLoadInfoDao;
 
 // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
 
@@ -33,100 +33,100 @@ import com.sheep.gamegroup.greendao.download.SearchRecordDao;
  */
 public class DaoSession extends AbstractDaoSession {
 
-    private final DaoConfig acceptTaskRecordDaoConfig;
-    private final DaoConfig appdownloadBeanDaoConfig;
-    private final DaoConfig downLoadInfoDaoConfig;
     private final DaoConfig processRecordDaoConfig;
-    private final DaoConfig screenShotRecordDaoConfig;
+    private final DaoConfig appdownloadBeanDaoConfig;
     private final DaoConfig sdkLoginUserDaoConfig;
+    private final DaoConfig screenShotRecordDaoConfig;
+    private final DaoConfig acceptTaskRecordDaoConfig;
     private final DaoConfig searchRecordDaoConfig;
+    private final DaoConfig downLoadInfoDaoConfig;
 
-    private final AcceptTaskRecordDao acceptTaskRecordDao;
-    private final AppdownloadBeanDao appdownloadBeanDao;
-    private final DownLoadInfoDao downLoadInfoDao;
     private final ProcessRecordDao processRecordDao;
-    private final ScreenShotRecordDao screenShotRecordDao;
+    private final AppdownloadBeanDao appdownloadBeanDao;
     private final SdkLoginUserDao sdkLoginUserDao;
+    private final ScreenShotRecordDao screenShotRecordDao;
+    private final AcceptTaskRecordDao acceptTaskRecordDao;
     private final SearchRecordDao searchRecordDao;
+    private final DownLoadInfoDao downLoadInfoDao;
 
     public DaoSession(Database db, IdentityScopeType type, Map<Class<? extends AbstractDao<?, ?>>, DaoConfig>
             daoConfigMap) {
         super(db);
 
-        acceptTaskRecordDaoConfig = daoConfigMap.get(AcceptTaskRecordDao.class).clone();
-        acceptTaskRecordDaoConfig.initIdentityScope(type);
+        processRecordDaoConfig = daoConfigMap.get(ProcessRecordDao.class).clone();
+        processRecordDaoConfig.initIdentityScope(type);
 
         appdownloadBeanDaoConfig = daoConfigMap.get(AppdownloadBeanDao.class).clone();
         appdownloadBeanDaoConfig.initIdentityScope(type);
 
-        downLoadInfoDaoConfig = daoConfigMap.get(DownLoadInfoDao.class).clone();
-        downLoadInfoDaoConfig.initIdentityScope(type);
-
-        processRecordDaoConfig = daoConfigMap.get(ProcessRecordDao.class).clone();
-        processRecordDaoConfig.initIdentityScope(type);
+        sdkLoginUserDaoConfig = daoConfigMap.get(SdkLoginUserDao.class).clone();
+        sdkLoginUserDaoConfig.initIdentityScope(type);
 
         screenShotRecordDaoConfig = daoConfigMap.get(ScreenShotRecordDao.class).clone();
         screenShotRecordDaoConfig.initIdentityScope(type);
 
-        sdkLoginUserDaoConfig = daoConfigMap.get(SdkLoginUserDao.class).clone();
-        sdkLoginUserDaoConfig.initIdentityScope(type);
+        acceptTaskRecordDaoConfig = daoConfigMap.get(AcceptTaskRecordDao.class).clone();
+        acceptTaskRecordDaoConfig.initIdentityScope(type);
 
         searchRecordDaoConfig = daoConfigMap.get(SearchRecordDao.class).clone();
         searchRecordDaoConfig.initIdentityScope(type);
 
-        acceptTaskRecordDao = new AcceptTaskRecordDao(acceptTaskRecordDaoConfig, this);
-        appdownloadBeanDao = new AppdownloadBeanDao(appdownloadBeanDaoConfig, this);
-        downLoadInfoDao = new DownLoadInfoDao(downLoadInfoDaoConfig, this);
+        downLoadInfoDaoConfig = daoConfigMap.get(DownLoadInfoDao.class).clone();
+        downLoadInfoDaoConfig.initIdentityScope(type);
+
         processRecordDao = new ProcessRecordDao(processRecordDaoConfig, this);
-        screenShotRecordDao = new ScreenShotRecordDao(screenShotRecordDaoConfig, this);
+        appdownloadBeanDao = new AppdownloadBeanDao(appdownloadBeanDaoConfig, this);
         sdkLoginUserDao = new SdkLoginUserDao(sdkLoginUserDaoConfig, this);
+        screenShotRecordDao = new ScreenShotRecordDao(screenShotRecordDaoConfig, this);
+        acceptTaskRecordDao = new AcceptTaskRecordDao(acceptTaskRecordDaoConfig, this);
         searchRecordDao = new SearchRecordDao(searchRecordDaoConfig, this);
+        downLoadInfoDao = new DownLoadInfoDao(downLoadInfoDaoConfig, this);
 
-        registerDao(AcceptTaskRecord.class, acceptTaskRecordDao);
-        registerDao(AppdownloadBean.class, appdownloadBeanDao);
-        registerDao(DownLoadInfo.class, downLoadInfoDao);
         registerDao(ProcessRecord.class, processRecordDao);
-        registerDao(ScreenShotRecord.class, screenShotRecordDao);
+        registerDao(AppdownloadBean.class, appdownloadBeanDao);
         registerDao(SdkLoginUser.class, sdkLoginUserDao);
+        registerDao(ScreenShotRecord.class, screenShotRecordDao);
+        registerDao(AcceptTaskRecord.class, acceptTaskRecordDao);
         registerDao(SearchRecord.class, searchRecordDao);
+        registerDao(DownLoadInfo.class, downLoadInfoDao);
     }
     
     public void clear() {
-        acceptTaskRecordDaoConfig.clearIdentityScope();
-        appdownloadBeanDaoConfig.clearIdentityScope();
-        downLoadInfoDaoConfig.clearIdentityScope();
         processRecordDaoConfig.clearIdentityScope();
-        screenShotRecordDaoConfig.clearIdentityScope();
+        appdownloadBeanDaoConfig.clearIdentityScope();
         sdkLoginUserDaoConfig.clearIdentityScope();
+        screenShotRecordDaoConfig.clearIdentityScope();
+        acceptTaskRecordDaoConfig.clearIdentityScope();
         searchRecordDaoConfig.clearIdentityScope();
+        downLoadInfoDaoConfig.clearIdentityScope();
     }
 
-    public AcceptTaskRecordDao getAcceptTaskRecordDao() {
-        return acceptTaskRecordDao;
+    public ProcessRecordDao getProcessRecordDao() {
+        return processRecordDao;
     }
 
     public AppdownloadBeanDao getAppdownloadBeanDao() {
         return appdownloadBeanDao;
     }
 
-    public DownLoadInfoDao getDownLoadInfoDao() {
-        return downLoadInfoDao;
-    }
-
-    public ProcessRecordDao getProcessRecordDao() {
-        return processRecordDao;
+    public SdkLoginUserDao getSdkLoginUserDao() {
+        return sdkLoginUserDao;
     }
 
     public ScreenShotRecordDao getScreenShotRecordDao() {
         return screenShotRecordDao;
     }
 
-    public SdkLoginUserDao getSdkLoginUserDao() {
-        return sdkLoginUserDao;
+    public AcceptTaskRecordDao getAcceptTaskRecordDao() {
+        return acceptTaskRecordDao;
     }
 
     public SearchRecordDao getSearchRecordDao() {
         return searchRecordDao;
     }
 
+    public DownLoadInfoDao getDownLoadInfoDao() {
+        return downLoadInfoDao;
+    }
+
 }

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

@@ -48,7 +48,7 @@ public class DownloadHelper {
     public void updateDownloadTaskView(final Activity activity, final IDownload iTask, final TextView down_tv, final Action1<Object> callBack,int type) {
         final boolean showSimpleText = down_tv.getText().length() < 4;
         if(downloadUtil == null){
-            downloadUtil = new DownloadUtil(activity);
+            downloadUtil = new DownloadUtil();
         }
         TaskDetailAct.setBtnStr(iTask, downloadUtil, new Action1<Object>() {
             @Override

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

@@ -120,7 +120,7 @@ public class CertificationUtil {
                     newSdkLoginUser.setInvitation_code(userEntity.getInvitation_code());
                     newSdkLoginUser.setNickname(userEntity.getNickname());
                     newSdkLoginUser.setServiceName(SheepApp.getInstance().getConnectAddress().name());
-                    DDProviderHelper.getInstance().addOrUpdateSdkLoginUser(SheepApp.getInstance(), newSdkLoginUser, null);
+                    DDProviderHelper.getInstance().addOrUpdateSdkLoginUser(newSdkLoginUser, null);
                 }
             }
         });

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

@@ -630,7 +630,7 @@ public class CommonUtil {
         SpUtils.saveToken(activity, "");
         DataUtil.getInstance().clearData();
         //删除自动审核任务中保存的数据,防止用户切换账号后直接提交
-        DDProviderHelper.getInstance().deleteTaskRecord(SheepApp.getInstance());
+        DDProviderHelper.getInstance().deleteTaskRecord();
         ActivityManager.getInstance().finishAllActivity();
         Jump2View.getInstance().goLoginView(activity, "");
 
@@ -647,7 +647,7 @@ public class CommonUtil {
             reloadAutoTaskList();
         } else {//5.1及以上设备,直接记录任务开始时间
             if (task != null && task.isAppAutoCommitTask() && !TextUtils.isEmpty(task.getPackage_names())) {//接受自动审核任务才记录
-                AcceptTaskRecord lastAcceptTaskRecord = DDProviderHelper.getInstance().getAcceptTaskRecord(SheepApp.getInstance(), task.getPackage_names());
+                AcceptTaskRecord lastAcceptTaskRecord = DDProviderHelper.getInstance().getAcceptTaskRecord(task.getPackage_names());
                 long runTime = AppUsageManager.getInstance().getTotalTimeInForeground(task.getPackage_names());
                 if (lastAcceptTaskRecord == null) {
                     AcceptTaskRecord acceptTaskRecord = new AcceptTaskRecord();
@@ -655,10 +655,10 @@ public class CommonUtil {
                     acceptTaskRecord.setUserId(DataUtil.getInstance().getUserId());
                     acceptTaskRecord.setAcceptTime(System.currentTimeMillis());
                     acceptTaskRecord.setRunTime(runTime);
-                    DDProviderHelper.getInstance().addAcceptTaskRecord(SheepApp.getInstance(), acceptTaskRecord);//重置记录 5.1及以上使用
+                    DDProviderHelper.getInstance().addAcceptTaskRecord(acceptTaskRecord);//重置记录 5.1及以上使用
                 } else {
                     lastAcceptTaskRecord.setRunTime(runTime);
-                    DDProviderHelper.getInstance().updateAcceptTaskRecord(SheepApp.getInstance(), lastAcceptTaskRecord);
+                    DDProviderHelper.getInstance().updateAcceptTaskRecord(lastAcceptTaskRecord);
                 }
             }
         }
@@ -2025,7 +2025,7 @@ public class CommonUtil {
             String appId = "40";
             String cUId = String.valueOf(id);
             String appKey = "ad9a30556666207";
-            AdManager.getInstance(activity).init(activity, appId, cUId, appKey);
+            AdManager.getInstance(SheepApp.getInstance()).init(activity, appId, cUId, appKey);
             return true;
         }
         return false;

+ 14 - 17
app/src/main/java/com/sheep/gamegroup/util/DownloadUtil.java

@@ -66,10 +66,7 @@ public class DownloadUtil {
      */
     public static final int STATUS_INSTALLED = 0X6;
 
-    private Context ctx;
-
-    public DownloadUtil(Context context) {
-        this.ctx = context;
+    public DownloadUtil() {
     }
 
     /**
@@ -78,7 +75,7 @@ public class DownloadUtil {
      * @return
      */
     public List<DownLoadInfo> getAllDownloadTasks() {
-        return DDProviderHelper.getInstance().getDownloadList(ctx);
+        return DDProviderHelper.getInstance().getDownloadList();
 
        /* List<DownloadtaskBean> tasks = new ArrayList<>();
         ContentResolver contentResolver = ctx.getContentResolver();
@@ -118,7 +115,7 @@ public class DownloadUtil {
     public int getDownloadingTasksCount() {
         return DDProviderHelper
                 .getInstance()
-                .getDownloadingTask(ctx)
+                .getDownloadingTask()
                 .size();
       /*  ContentResolver contentResolver = ctx.getContentResolver();
         DownloadtaskSelection selection = new DownloadtaskSelection();
@@ -134,7 +131,7 @@ public class DownloadUtil {
     public boolean isDownloadExists(String downloadUrl) {
         DownLoadInfo task = DDProviderHelper
                 .getInstance()
-                .getDownloadTask(ctx, downloadUrl);
+                .getDownloadTask(downloadUrl);
 
        /* ContentResolver contentResolver = ctx.getContentResolver();
         DownloadtaskSelection selection = new DownloadtaskSelection();
@@ -170,7 +167,7 @@ public class DownloadUtil {
     public DownLoadInfo getDownloadTaskByUrl(String downloadUrl) {
         return DDProviderHelper
                 .getInstance()
-                .getDownloadTask(ctx, downloadUrl);
+                .getDownloadTask(downloadUrl);
         /*ContentResolver contentResolver = ctx.getContentResolver();
         DownloadtaskSelection selection = new DownloadtaskSelection();
         selection.downloadUrl(downloadUrl);
@@ -213,7 +210,7 @@ public class DownloadUtil {
             task.setMStatus(0);
         }
         if (!TextUtils.isEmpty(task.getMDownloadUrl())) {
-            return DDProviderHelper.getInstance().addOrUpDataDownloadTask(ctx, task);
+            return DDProviderHelper.getInstance().addOrUpDataDownloadTask(task);
         }
         return false;
 
@@ -253,7 +250,7 @@ public class DownloadUtil {
         where.downloadUrl(downloadUrl);
         ContentResolver contentResolver = ctx.getContentResolver();
         int delete = where.delete(contentResolver);*/
-        return DDProviderHelper.getInstance().deleteDownloadTaskByUrl(ctx, downloadUrl);
+        return DDProviderHelper.getInstance().deleteDownloadTaskByUrl(downloadUrl);
     }
 
     /**
@@ -262,7 +259,7 @@ public class DownloadUtil {
      * @return
      */
     public void deleteAllDownloadTask() {
-        DDProviderHelper.getInstance().deleteAllDownloadTask(ctx);
+        DDProviderHelper.getInstance().deleteAllDownloadTask();
     }
 
     /**
@@ -271,7 +268,7 @@ public class DownloadUtil {
      */
     public DownLoadInfo setDownloadTaskFinish(String downloadUrl, String apkPath) {
         return DDProviderHelper.getInstance()
-                .setDownloadTaskFinish(ctx, downloadUrl, apkPath);
+                .setDownloadTaskFinish(downloadUrl, apkPath);
        /* ContentResolver resolver = ctx.getContentResolver();
         DownloadtaskSelection where = new DownloadtaskSelection();
         where.downloadUrl(downloadUrl);
@@ -290,11 +287,11 @@ public class DownloadUtil {
     }
 
     public DownLoadInfo setDownloadTaskPercent(double downloadedSize, String averageSpeed, int downloadTaskId, String downloadUrl) {
-        return DDProviderHelper.getInstance().updateDownloadPercent(ctx, downloadedSize, averageSpeed, downloadTaskId, downloadUrl, DownloadUtil.STATUS_ING);
+        return DDProviderHelper.getInstance().updateDownloadPercent(downloadedSize, averageSpeed, downloadTaskId, downloadUrl, DownloadUtil.STATUS_ING);
     }
 
     public void setDownloadTaskPercent(int percent, double downloadedSize, double totalSize, int downloadTaskId, String downloadUrl) {
-        DDProviderHelper.getInstance().updateDownloadPercent(ctx, percent, downloadedSize, totalSize, downloadTaskId, downloadUrl, DownloadUtil.STATUS_ING);
+        DDProviderHelper.getInstance().updateDownloadPercent(percent, downloadedSize, totalSize, downloadTaskId, downloadUrl, DownloadUtil.STATUS_ING);
 
 
 
@@ -330,7 +327,7 @@ public class DownloadUtil {
      * @param totalLength
      */
     public DownLoadInfo setDownloadTaskTotal(String downloadUrl, double totalLength) {
-        return DDProviderHelper.getInstance().setDownloadTaskTotal(ctx, downloadUrl, totalLength);
+        return DDProviderHelper.getInstance().setDownloadTaskTotal(downloadUrl, totalLength);
     }
     /**
      * Set the task status
@@ -340,7 +337,7 @@ public class DownloadUtil {
      */
     public DownLoadInfo setDownloadTaskStatus(String downloadUrl, int status) {
 
-        return DDProviderHelper.getInstance().setDownloadTaskStatus(ctx, downloadUrl, status);
+        return DDProviderHelper.getInstance().setDownloadTaskStatus(downloadUrl, status);
         /*ContentResolver resolver = ctx.getContentResolver();
         DownloadtaskSelection where = new DownloadtaskSelection();
         where.downloadUrl(downloadUrl);
@@ -362,7 +359,7 @@ public class DownloadUtil {
 
     public void restoreDownloadTaskStatus() {
 
-        DDProviderHelper.getInstance().restoreDownloadTaskStatus(ctx);
+        DDProviderHelper.getInstance().restoreDownloadTaskStatus();
        /* ContentResolver resolver = ctx.getContentResolver();
         DownloadtaskContentValues taskValues = new DownloadtaskContentValues();
         taskValues.putStatus(STATUS_PAUSE);

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

@@ -112,7 +112,7 @@ public class ActDownloadMgr extends BaseActivity {
     @Override
     public void initData() {
         downloadTasks = new ArrayList<>();
-        downloadUtil = new DownloadUtil(this);
+        downloadUtil = new DownloadUtil();
         initControlsEvents();
     }
 

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

@@ -107,7 +107,7 @@ public class ActMiDong extends BaseActivity {
         pager.setCurrentItem(0);
         pager.setOffscreenPageLimit(fgtMiDongList.size());
         CommonUtil.getInstance().reflex(indicator, activity);
-        AdManager.getInstance(activity).setDownloadListener(new AppDownloadListener() {
+        AdManager.getInstance(SheepApp.getInstance()).setDownloadListener(new AppDownloadListener() {
             @Override
             public void onDownloadStart(String id) {
                 LogUtil.println("AdManager", "onDownloadStart", id);
@@ -132,7 +132,7 @@ public class ActMiDong extends BaseActivity {
 
             }
         });
-        AdManager.getInstance(activity).setRewardListener(new RewardListener() {
+        AdManager.getInstance(SheepApp.getInstance()).setRewardListener(new RewardListener() {
             @Override
             public void doTaskSuccess(String s) {
                 LogUtil.println("AdManager","onDownloadFail", s);

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

@@ -134,7 +134,7 @@ public class ActSearchAppOrTask extends BaseContainerActivity {
         }
 
         //初始化搜索历史
-        List<SearchRecord> newSgrList = DDProviderHelper.getInstance().getSearchRecordList(SheepApp.getInstance(), MAX_SHOW_SEARCH_RECORD_COUNT);
+        List<SearchRecord> newSgrList = DDProviderHelper.getInstance().getSearchRecordList(MAX_SHOW_SEARCH_RECORD_COUNT);
         if (!ListUtil.isEmpty(newSgrList)) {
             searchRecordList.addAll(newSgrList);
             addListData("搜索历史", searchRecordList, SORT_SEARCH_RECORD);
@@ -200,7 +200,7 @@ public class ActSearchAppOrTask extends BaseContainerActivity {
                         public void onClick(View view) {
                             list.remove(item);
                             recyclerView.getAdapter().notifyDataSetChanged();
-                            DDProviderHelper.getInstance().deleteSearchRecord(SheepApp.getInstance(), (SearchRecord) item);
+                            DDProviderHelper.getInstance().deleteSearchRecord((SearchRecord) item);
                             if (isTitleInfoListEmpty()) {
                                 frame_container.setVisibility(View.VISIBLE);
                                 recyclerView.setVisibility(View.INVISIBLE);
@@ -255,7 +255,7 @@ public class ActSearchAppOrTask extends BaseContainerActivity {
             searchRecord.setLast_time(System.currentTimeMillis());
             searchRecord.setCount(1);
             searchRecordList.add(searchRecord);
-            DDProviderHelper.getInstance().addOrUpdateSearchRecord(SheepApp.getInstance(), searchRecord, null);
+            DDProviderHelper.getInstance().addOrUpdateSearchRecord(searchRecord, null);
             recyclerView.getAdapter().notifyDataSetChanged();
         }
         if (fragment instanceof ISearch)

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

@@ -50,7 +50,6 @@ public class DialogToastAct extends Activity {
     EditText gamePayEt;
 
     private DialogEntity dialog_entity;
-    private Activity activity;
     DownloadUtil mDownloadTaskService;
 
     @Override
@@ -58,10 +57,9 @@ public class DialogToastAct extends Activity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.dialog_notice_layout);
         ButterKnife.bind(this);
-        activity = this;
         dialog_entity = (DialogEntity) getIntent().getSerializableExtra("dialog_entity");
 
-        mDownloadTaskService = new DownloadUtil(activity);
+        mDownloadTaskService = new DownloadUtil();
         initView();
     }
 
@@ -123,7 +121,7 @@ public class DialogToastAct extends Activity {
         if (dialog_entity.getDownLoadInfo() == null) {
             return;
         }
-        SpUtils.saveDownNotice(activity, flag);
+        SpUtils.saveDownNotice(this, flag);
         if (flag != 0)
             mDownloadTaskService.start(dialog_entity.getDownLoadInfo());
     }

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

@@ -107,7 +107,7 @@ public class GameCertificationActivity extends BaseActivity {
                 item_sdk_arrow.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View view) {
-                        DDProviderHelper.getInstance().deleteSdkLoginUser(SheepApp.getInstance(), item);
+                        DDProviderHelper.getInstance().deleteSdkLoginUser(item);
                         try {
                             userList.remove(position);
                             sdk_change_user_list.getAdapter().notifyDataSetChanged();
@@ -145,7 +145,7 @@ public class GameCertificationActivity extends BaseActivity {
             CertificationUtil.newInstance().showCertificationErrorAndExitApp("", 2000);
         }
         //获取登录过的用户列表
-        userList.addAll(DDProviderHelper.getInstance().getSdkLoginUserList(activity, SheepApp.getInstance().getConnectAddress().name()));
+        userList.addAll(DDProviderHelper.getInstance().getSdkLoginUserList(SheepApp.getInstance().getConnectAddress().name()));
         sdk_change_user_list.getAdapter().notifyDataSetChanged();
         ViewUtil.setVisibility2(sdk_arrow, !userList.isEmpty());
     }

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

@@ -245,7 +245,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         TitleBarUtils.getInstance()
                 .setTitle(activity, "任务详情")
                 .setTitleFinish(activity);
-        downloadUtil = new DownloadUtil(this);
+        downloadUtil = new DownloadUtil();
         adpTaskDetailChildListview = new AdpTaskDetailChildListview(taskChildList, activity);
         detail_task_listview.setAdapter(adpTaskDetailChildListview);
         adpTaskDetailChildListview.notifyDataSetChanged();
@@ -1043,7 +1043,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     showChooseDialog(false, true, DEFAULT_MAX_COUNT);
                 } else if ((DataUtil.IS_USE_SCREEN_SHOT || DataUtil.IS_LISTEN_SCREEN_SHOT) && taskEty.needShotScreen()) {//小绵羊截图方案与监听方案
                     if (ListenerShotService.IS_RECORD_PATH) {//使用记录的方式来获取用户的截图
-                        List<ScreenShotRecord> list = DDProviderHelper.getInstance().getScreenShotRecordList(activity, taskEty.getPackage_names());
+                        List<ScreenShotRecord> list = DDProviderHelper.getInstance().getScreenShotRecordList(taskEty.getPackage_names());
                         showChooseListDialog(false, true, DEFAULT_MAX_COUNT, ListUtil.asList(new ListUtil.CallBack<ScreenShotRecord, String>() {
                             @Override
                             public String call(ScreenShotRecord screenShotRecord) {
@@ -1084,12 +1084,12 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
             JSONObject object = new JSONObject();
             object.put("gps", gps);
             if (AutoCheckService.IS_USE_THIS_SERVICE) {
-                ProcessRecord processRecord = DDProviderHelper.getInstance().getProcessRecord(SheepApp.getInstance(), taskEty.getPackage_names());
+                ProcessRecord processRecord = DDProviderHelper.getInstance().getProcessRecord(taskEty.getPackage_names());
                 object.put("task_time", processRecord.getRunTime());
                 LogUtil.println(1, "checkAndCommitTask", processRecord.getRunTime());
                 if (processRecord.getId() != null) {
                     processRecord.setRunTime(0);
-                    DDProviderHelper.getInstance().addOrUpdateProcessRecord(SheepApp.getInstance(), processRecord);//重置记录 5.0及以下使用
+                    DDProviderHelper.getInstance().addOrUpdateProcessRecord(processRecord);//重置记录 5.0及以下使用
                 }
             } else {
                 long runTime = AppUsageManager.getInstance().getTotalTimeInForeground(taskEty.getPackage_names());
@@ -1097,7 +1097,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     AppUsageManager.getInstance().showAccessibilityDialog();
                     return;
                 }
-                AcceptTaskRecord acceptTaskRecord = DDProviderHelper.getInstance().getAcceptTaskRecord(SheepApp.getInstance(), taskEty.getPackage_names());
+                AcceptTaskRecord acceptTaskRecord = DDProviderHelper.getInstance().getAcceptTaskRecord(taskEty.getPackage_names());
                 if (acceptTaskRecord == null) {
                     object.put("task_time", 0);
                     LogUtil.println(2, "checkAndCommitTask", 0);
@@ -1106,12 +1106,12 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     acceptTaskRecord.setUserId(DataUtil.getInstance().getUserId());
                     acceptTaskRecord.setAcceptTime(System.currentTimeMillis());
                     acceptTaskRecord.setRunTime(runTime);
-                    DDProviderHelper.getInstance().addAcceptTaskRecord(SheepApp.getInstance(), acceptTaskRecord);//重置记录 5.1及以上使用
+                    DDProviderHelper.getInstance().addAcceptTaskRecord(acceptTaskRecord);//重置记录 5.1及以上使用
                 } else {
                     object.put("task_time", runTime < 0 || runTime < acceptTaskRecord.getRunTime() ? 0 : (runTime - acceptTaskRecord.getRunTime()) / 1000L);
                     LogUtil.println(3, "checkAndCommitTask", runTime, acceptTaskRecord.getRunTime());
                     acceptTaskRecord.setRunTime(runTime);
-                    DDProviderHelper.getInstance().updateAcceptTaskRecord(SheepApp.getInstance(), acceptTaskRecord);//重置记录 5.1及以上使用
+                    DDProviderHelper.getInstance().updateAcceptTaskRecord(acceptTaskRecord);//重置记录 5.1及以上使用
                 }
             }
 
@@ -1294,7 +1294,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
             String imagePath = (String) args[0];
             switch (type) {
                 case IS_RECORD:
-                    if (DDProviderHelper.getInstance().getScreenShotRecord(activity.getApplication(), taskEty.getPackage_names(), imagePath) != null) {
+                    if (DDProviderHelper.getInstance().getScreenShotRecord(taskEty.getPackage_names(), imagePath) != null) {
                         return true;
                     }
                     break;

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

@@ -164,7 +164,7 @@ public class AdListAdapter extends android.support.v7.widget.RecyclerView.Adapte
                             /**
                              * 签到任务传1,非签到任务传0
                              */
-                            AdManager.getInstance(mContext).openOrDownLoadApps((Activity) mContext, data, isSign ? 1 : 0);
+                            AdManager.getInstance(SheepApp.getInstance()).openOrDownLoadApps((Activity) mContext, data, isSign ? 1 : 0);
                         }
                     });
                 }

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

@@ -19,6 +19,7 @@ import com.sheep.gamegroup.util.TimeUtil;
 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 java.util.List;
 import java.util.Locale;
@@ -97,7 +98,7 @@ public class AdpMiDong extends AdbCommonRecycler<AdData> {
                 /**
                  * 签到任务传1,非签到任务传0
                  */
-                AdManager.getInstance(context).openOrDownLoadApps((Activity) context, data, isSign ? 1 : 0);
+                AdManager.getInstance(SheepApp.getInstance()).openOrDownLoadApps((Activity) context, data, isSign ? 1 : 0);
             }
         });
         holder.itemView.setOnClickListener(new View.OnClickListener() {

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

@@ -51,7 +51,7 @@ public class PlayGameItemAdapter extends AdbCommonRecycler<GameEntity>{
                 @Override
                 public boolean onLongClick(View view) {
                     IDownload download = gameEntity.getDownload();
-                    DownloadUtil downloadUtil = new DownloadUtil(activity);
+                    DownloadUtil downloadUtil = new DownloadUtil();
                     final DownLoadInfo downLoadInfo = downloadUtil.getDownloadTaskByUrl(download);
                     downloadUtil.delete(downLoadInfo);
                     downloadUtil.start(downloadUtil.getDownloadTaskByUrl(download));

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

@@ -254,7 +254,7 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
                 //领取任务
                 final boolean isInstall = PackageUtil.isAppInstalled(SheepApp.getInstance(), item.getPackage_name());
                 boolean isExistApk = !TextUtils.isEmpty(PackageUtil.isExistsFile(item.getPackage_name(), item.getDownload_url()));
-                final DownloadUtil mDownloadTaskService = new DownloadUtil(context);
+                final DownloadUtil mDownloadTaskService = new DownloadUtil();
 
                 String taskTypeTvValue;
                 if(isInstall){//已经安装

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/view/dialog/DialogAccountAbnormal.java

@@ -57,7 +57,7 @@ public class DialogAccountAbnormal {
     public static boolean showDialog(final Activity activity, String title, String content, String cancel, String sure, final DownLoadInfo downLoadInfo) {
         final boolean[] flag = {false};
 
-        final DownloadUtil mDownloadTaskService = new DownloadUtil(activity);
+        final DownloadUtil mDownloadTaskService = new DownloadUtil();
 
             View view = View.inflate(activity, R.layout.diag_account_abnormal, null);
         final AlertDialog mAlertDialog = new AlertDialog.Builder(activity)

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/view/dialog/DialogMidong.java

@@ -101,7 +101,7 @@ public class DialogMidong {
                 /**
                  * 签到任务传1,非签到任务传0
                  */
-                AdManager.getInstance(activity).openOrDownLoadApps(activity, data, isSign ? 1 : 0);
+                AdManager.getInstance(SheepApp.getInstance()).openOrDownLoadApps(activity, data, isSign ? 1 : 0);
 
             }
         });

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

@@ -7,6 +7,7 @@ import com.mdad.sdk.mdsdk.GetAdListListener;
 import com.mdad.sdk.mdsdk.common.AdData;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.view.adapter.AdpMiDong;
+import com.sheep.jiuyan.samllsheep.SheepApp;
 
 import java.util.List;
 
@@ -26,7 +27,7 @@ public class FgtMiDongAdTskList extends BaseListFragment<AdData> {
     public void initData() {
         if (page == 1)
             list.clear();
-        AdManager.getInstance(activity).getAdListAsync(activity, new GetAdListListener() {
+        AdManager.getInstance(SheepApp.getInstance()).getAdListAsync(activity, new GetAdListListener() {
             @Override
             public void onLoadAdSuccess(final List<AdData> newList) {
                 activity.runOnUiThread(new Runnable() {

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

@@ -7,6 +7,7 @@ import com.mdad.sdk.mdsdk.GetAdListListener;
 import com.mdad.sdk.mdsdk.common.AdData;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.view.adapter.AdpMiDong;
+import com.sheep.jiuyan.samllsheep.SheepApp;
 
 import java.util.List;
 
@@ -26,7 +27,7 @@ public class FgtMiDongSignTskList extends BaseListFragment<AdData> {
     public void initData() {
         if (page == 1)
             list.clear();
-        AdManager.getInstance(activity).getSignListAsync(activity, new GetAdListListener() {
+        AdManager.getInstance(SheepApp.getInstance()).getSignListAsync(activity, new GetAdListListener() {
             @Override
             public void onLoadAdSuccess(final List<AdData> newList) {
                 activity.runOnUiThread(new Runnable() {

+ 3 - 2
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtMiDongWeChatTaskList.java

@@ -15,6 +15,7 @@ import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
 
 import java.util.List;
 
@@ -42,7 +43,7 @@ public class FgtMiDongWeChatTaskList extends BaseListFragment<AdData> {
                 holder.itemView.findViewById(R.id.item_midong_wechat_btn).setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View view) {
-                        AdManager.getInstance(activity).openMiniProgram(activity, item);
+                        AdManager.getInstance(SheepApp.getInstance()).openMiniProgram(activity, item);
                     }
                 });
             }
@@ -57,7 +58,7 @@ public class FgtMiDongWeChatTaskList extends BaseListFragment<AdData> {
             view_list.setNoMore(true);
             return;
         }
-        AdManager.getInstance(activity).getWeChatTaskList(activity, new GetAdListListener() {
+        AdManager.getInstance(SheepApp.getInstance()).getWeChatTaskList(activity, new GetAdListListener() {
 
             @Override
             public void onLoadAdSuccess(final List<AdData> newList) {

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

@@ -166,8 +166,8 @@ public class SheepApp extends MultiDexApplication {
             detectFileUriExposure();
             ChannelContent.getInstance().initChannelContent(this);
 
-            refWatcher = LeakCanary.install(this);
         }
+        refWatcher = LeakCanary.install(this);
     }
 
     /**

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

@@ -52,7 +52,7 @@ public class AutoCheckService extends Service {
                                 final ProcessRecord processRecord = new ProcessRecord();
                                 processRecord.setPackageName(packageName);
                                 processRecord.setUserId(userId);
-                                DDProviderHelper.getInstance().addOrUpdateProcessRecord(getApplicationContext(), processRecord, new Action1<ProcessRecord>() {
+                                DDProviderHelper.getInstance().addOrUpdateProcessRecord(processRecord, new Action1<ProcessRecord>() {
                                     @Override
                                     public void call(ProcessRecord lastProcessRecord) {
                                         if(lastProcessRecord == null){

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

@@ -56,7 +56,7 @@ public class DownloadService extends Service {
     @Override
     public void onCreate() {
         super.onCreate();
-        downloadUtil = new DownloadUtil(this);
+        downloadUtil = new DownloadUtil();
     }
 
     @Override

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

@@ -191,7 +191,7 @@ public class ListenerShotNewService extends Service {
             screenShotRecord.setPackageName(packageName);
             screenShotRecord.setPath(imagePath);
             screenShotRecord.setUserId(userId);
-            DDProviderHelper.getInstance().addScreenShotRecord(getApplicationContext(), screenShotRecord);
+            DDProviderHelper.getInstance().addScreenShotRecord(screenShotRecord);
         } else {
             delayCopyImage(imagePath, packageName);
         }

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

@@ -178,7 +178,7 @@ public class ListenerShotService extends Service {
             screenShotRecord.setPackageName(packageName);
             screenShotRecord.setPath(imagePath);
             screenShotRecord.setUserId(userId);
-            DDProviderHelper.getInstance().addScreenShotRecord(getApplicationContext(), screenShotRecord);
+            DDProviderHelper.getInstance().addScreenShotRecord(screenShotRecord);
         } else {
             delayCopyImage(imagePath, packageName);
         }

+ 2 - 1
app/src/main/java/com/youmi/android/offer/YmPermissionUtil.java

@@ -16,6 +16,7 @@ import android.util.Log;
 import android.widget.Toast;
 
 import com.sheep.gamegroup.util.DataUtil;
+import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
 
 import org.afinal.simplecache.DataKey;
@@ -87,7 +88,7 @@ public class YmPermissionUtil implements PointsChangeNotify, PointsEarnNotify {
     private void initYoumi() {
         // 自v6.3.0起,所有其他代码必须在初始化接口调用之后才能生效
         // 初始化接口,应用启动的时候调用,参数:appId, appSecret, isEnableYoumiLog
-        AdManager.getInstance(activity).init(YmConfig.getAppId(), YmConfig.getAppSecret(), YmConfig.isShowLog());
+        AdManager.getInstance(SheepApp.getInstance()).init(YmConfig.getAppId(), YmConfig.getAppSecret(), YmConfig.isShowLog());
 
         // 有米android 积分墙sdk 5.0.0之后支持定制浏览器顶部标题栏的部分UI
          setOfferBrowserConfig();