homeList中可直接启动h5中的龙猫app;

下载进度中添加速度；
加载数据时显示无数据图片修改为显示加载中图片

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

@@ -436,6 +436,7 @@ public class CommonUtil {
             e.printStackTrace();
         }
     }
+
     public static final int JUMP_NEW_USER_TASK = -1;//新手任务
     public static final int JUMP_TRY_PLAY = 1;//试玩赚钱
     public static final int JUMP_ASK_FRIEND = 2;//邀请赚钱
@@ -461,6 +462,7 @@ public class CommonUtil {
     public static final int JUMP_FIND_ACT = 19;//活动
     public static final int JUMP_FIND_INFORMATION = 20;//资讯
     public static final int JUMP_FIND_GMAE = 21;//发现中的游戏
+
     /**
      * 点击主页HomeList跳转
      */
@@ -499,10 +501,12 @@ public class CommonUtil {
                 Jump2View.getInstance().goSignCardAct(context, null);
                 break;
             case JUMP_H5_INNER://内部WebView加载H5
-                Jump2View.getInstance().goWeb(context, entity.getUrl(), entity.getTitle());
+                if (checkLongMao((Activity) context, entity))
+                    Jump2View.getInstance().goWeb(context, entity.getUrl(), entity.getTitle());
                 break;
             case JUMP_H5_OUTER://外部浏览器加载H5
-                Jump2View.getInstance().goWeb(context, entity.getUrl());
+                if (checkLongMao((Activity) context, entity))
+                    Jump2View.getInstance().goWeb(context, entity.getUrl());
                 break;
             case JUMP_GAME_TASK://游戏任务
                 Jump2View.getInstance().goGameMakeMoney(context, 0);
@@ -533,6 +537,36 @@ public class CommonUtil {
         }
     }
 
+    public static final String LONG_MAO_APP_NAME = "龙猫竞猜";
+    public static final String LONG_MAO_APP_PACKAGE_NAME = "com.cfyl.galesaur.guess";
+    public static final String LONG_MAO_APP_URI = "guess://longmao";
+
+    /**
+     * 尝试跳转到龙猫竞猜
+     *
+     * @param activity
+     * @param entity
+     * @return 判断到已经安装，返回false
+     */
+    private boolean checkLongMao(Activity activity, HomeListEntity entity) {
+        if (TextUtils.equals(entity.getTitle(), LONG_MAO_APP_NAME) && PackageUtil.isAppInstalled(SheepApp.getInstance(), LONG_MAO_APP_PACKAGE_NAME)) {
+
+            try {
+                PackageUtil.startApp(SheepApp.getInstance(), LONG_MAO_APP_PACKAGE_NAME);
+            } catch (Exception ignore) {
+                try {
+                    Intent intent = Intent.parseUri(LONG_MAO_APP_URI, Intent.URI_INTENT_SCHEME);
+                    intent.setComponent(null);
+                    activity.startActivity(intent);
+                } catch (Exception ignore2) {
+                    return true;
+                }
+            }
+            return false;
+        }
+        return true;
+    }
+
     /**
      * 注销账户
      */
@@ -592,6 +626,7 @@ public class CommonUtil {
     }
 
     private boolean isLoadingAcceptedTaskList = false;
+
     /**
      * 添加应用自动审核任务
      */
@@ -602,7 +637,7 @@ public class CommonUtil {
             if (task != null && task.isAppAutoCommitTask() && !TextUtils.isEmpty(task.getPackage_names())) {//接受自动审核任务才记录
                 AcceptTaskRecord lastAcceptTaskRecord = DDProviderHelper.getInstance().getAcceptTaskRecord(SheepApp.getInstance(), task.getPackage_names());
                 long runTime = AppUsageManager.getInstance().getTotalTimeInForeground(task.getPackage_names());
-                if(lastAcceptTaskRecord == null){
+                if (lastAcceptTaskRecord == null) {
                     AcceptTaskRecord acceptTaskRecord = new AcceptTaskRecord();
                     acceptTaskRecord.setPackageName(task.getPackage_names());
                     acceptTaskRecord.setUserId(DataUtil.getInstance().getUserId());
@@ -616,9 +651,10 @@ public class CommonUtil {
             }
         }
     }
+
     //5.0及以下设备，不管取消还是接受任务都重新更新正在运行的自动审核任务列表
     public void reloadAutoTaskList() {
-        if (AutoCheckService.IS_USE_THIS_SERVICE){
+        if (AutoCheckService.IS_USE_THIS_SERVICE) {
             if (isLoadingAcceptedTaskList) {
                 return;
             }
@@ -645,7 +681,7 @@ public class CommonUtil {
 
     //5.0及以下设备，正在运行的任务列表发生变化就要通知后台服务
     public void reloadAutoTaskList(List<TaskAcceptedEty> list) {
-        if(AutoCheckService.IS_USE_THIS_SERVICE && !ListUtil.isEmpty(list)) {
+        if (AutoCheckService.IS_USE_THIS_SERVICE && !ListUtil.isEmpty(list)) {
             ArrayList<String> packageNameList = ListUtil.emptyList();
             for (TaskAcceptedEty item : list) {
                 TaskReleaseEty taskReleaseEty;
@@ -1905,7 +1941,7 @@ public class CommonUtil {
 
                         empty_view_msg.setText(R.string.wushuju);
                     }
-                },1000);
+                }, 1000);
             } else {
                 if (isNetImg) {
                     GlideImageLoader.setImage(empty_view_img, ViewUtil.getNetImgByName("wushuju_net_error"));
@@ -2035,11 +2071,10 @@ public class CommonUtil {
                     try {
                         int p = task.getPercent();    //任务进度百分比
                         String speed = task.getConvertSpeed();    //转换单位后的下载速度，单位转换需要在配置文件中打开
-                        System.out.println("Aria " + task.getKey() + ",p " + p + ", speed = " + speed);
                         if (tvProgress == null) {
                             return;
                         }
-                        tvProgress.setText(String.format(Locale.CHINA, "%d%%", Math.abs(p)));
+                        tvProgress.setText(String.format(Locale.CHINA, "%d%%(%s)", Math.abs(p), speed));//添加下载速度
 
                     } catch (Exception e) {
                         e.printStackTrace();
@@ -2088,16 +2123,16 @@ public class CommonUtil {
                 .execute(new FileCallBack(DIR, name) {
                     @Override
                     public void onError(Call call, Exception e, int id) {
-                        G.showToast("下载文件失败："+e.getMessage());
+                        G.showToast("下载文件失败：" + e.getMessage());
                     }
 
                     @Override
                     public void onResponse(File response, int id) {
                         Activity curActivity = ActivityManager.getInstance().currentActivity();
-                        if(curActivity == null)
+                        if (curActivity == null)
                             curActivity = activity;
                         String suffix = name.substring(name.lastIndexOf(".") + 1);
-                        switch (suffix){
+                        switch (suffix) {
                             case ".png":
                             case ".jpg"://图片
                                 Intent intent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
@@ -2272,7 +2307,7 @@ public class CommonUtil {
                 break;
             case 2:
                 ext = EntityUtils.getExtInfo(clickedGameObj.getExt());
-                if(ext == null){
+                if (ext == null) {
                     G.showToast(R.string.error_data);
                     return;
                 }
@@ -2285,7 +2320,7 @@ public class CommonUtil {
             case 4:
                 if (!TextUtils.isEmpty(clickedGameObj.getObjects())) {
                     ext = EntityUtils.getExtInfo(clickedGameObj.getExt());
-                    if(ext == null){
+                    if (ext == null) {
                         G.showToast(R.string.error_data);
                         return;
                     }
@@ -2329,7 +2364,7 @@ public class CommonUtil {
                 break;
             case JUMP_GMAE://游戏详情
                 ext = EntityUtils.getExtInfo(clickedGameObj.getExt());
-                if(ext == null){
+                if (ext == null) {
                     G.showToast(R.string.error_data);
                     return;
                 }
@@ -2340,7 +2375,7 @@ public class CommonUtil {
             case JUMP_FIND_INFORMATION://webView资讯
             case JUMP_FIND_GMAE://发现中的游戏详情
                 ext = EntityUtils.getExtInfo(clickedGameObj.getExt());
-                if(ext == null){
+                if (ext == null) {
                     G.showToast(R.string.error_data);
                     return;
                 }
@@ -2348,7 +2383,7 @@ public class CommonUtil {
                 break;
             case JUMP_WATCH_FOCUS://看点
                 ext = EntityUtils.getExtInfo(clickedGameObj.getExt());
-                if(ext == null){
+                if (ext == null) {
                     G.showToast(R.string.error_data);
                     return;
                 }
@@ -2588,9 +2623,9 @@ public class CommonUtil {
     /**
      * 给任务设置标签
      */
-    public void setTaskTag(Context context, View itemView, TaskReleaseEty taskReleaseEty, String show_type ){
-        if(!TextUtils.isEmpty(show_type)){
-            switch (show_type){
+    public void setTaskTag(Context context, View itemView, TaskReleaseEty taskReleaseEty, String show_type) {
+        if (!TextUtils.isEmpty(show_type)) {
+            switch (show_type) {
                 case TASK_AUDIT:
                     TaskHelper.setTaskTagText((TextView) itemView.findViewById(R.id.item_num_tv), taskReleaseEty);
                     break;

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

@@ -78,6 +78,13 @@ public class DataUtil {
         userEntity = null;
         aCache.clear();
     }
+    /**
+     * 清除aCache
+     */
+    public void clearACache() {
+        userEntity = null;
+        aCache.clear();
+    }
 
     //-----------------------------------------用户信息部分-----------------------------------------------------开始
     private UserEntity userEntity;

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

@@ -98,6 +98,7 @@ public class TestUtil {
                         return;
                     }
                     final List<Object> list = ListUtil.emptyList();
+                    list.add("清理清除aCache");
                     list.add("清理图片");
                     list.add("下载小绵羊");
                     ListUtil.addAll(list, loginUserList);
@@ -133,6 +134,9 @@ public class TestUtil {
                                             case "下载小绵羊":
                                                 downloadApkFromJenkins();
                                                 break;
+                                            case "清理清除aCache":
+                                                DataUtil.getInstance().clearACache();
+                                                break;
                                         }
                                     }
                                 }

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

@@ -573,7 +573,7 @@ public class ActFindGame extends BaseActivity {
     protected void running(DownloadTask task) {
         TextView textView = getTextViewByTask(task);
         if (textView != null) {
-            textView.setText(String.format(Locale.CHINA, "%d%%", Math.abs(task.getPercent())));
+            textView.setText(String.format(Locale.CHINA, "%d%%(%s)", Math.abs(task.getPercent()), task.getConvertSpeed()));//添加下载速度
         }
     }
 

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

@@ -561,7 +561,7 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
     protected void running(DownloadTask task) {
         TextView textView = getTextViewByTask(task);
         if (textView != null) {
-            textView.setText(String.format(Locale.CHINA, "%d%%", Math.abs(task.getPercent())));
+            textView.setText(String.format(Locale.CHINA, "%d%%(%s)", Math.abs(task.getPercent()), task.getConvertSpeed()));//添加下载速度
         }
     }
 

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

@@ -372,7 +372,7 @@ public class ActPlayGameDetail extends BaseActivity implements Action1<Integer>
             return;
         }
         if (find_game_down_tv != null && gameEntity.downLinks().equals(task.getKey())) {
-            find_game_down_tv.setText(String.format(Locale.CHINA, "%d%%", Math.abs(task.getPercent())));
+            find_game_down_tv.setText(String.format(Locale.CHINA, "%d%%(%s)", Math.abs(task.getPercent()), task.getConvertSpeed()));//添加下载速度
         }
     }
 

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

@@ -307,7 +307,7 @@ public class ActReservation extends BaseActivity {
     @Download.onTaskRunning protected void running(DownloadTask task) {
         TextView textView = getTextViewByTask(task);
         if(textView != null) {
-            textView.setText(String.format(Locale.CHINA, "%d%%", Math.abs(task.getPercent())));
+            textView.setText(String.format(Locale.CHINA, "%d%%(%s)", Math.abs(task.getPercent()), task.getConvertSpeed()));//添加下载速度
         }
     }
 

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

@@ -252,7 +252,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         ViewUtil.setDefaultText(priceTv);
         ViewUtil.setDefaultText(dateTv);
         ViewUtil.setDefaultText(num_tv);
-        if(DataUtil.IS_LISTEN_SCREEN_SHOT){//监听小绵羊截图功能需要开启查看应用使用情况的权限
+        if (DataUtil.IS_LISTEN_SCREEN_SHOT) {//监听小绵羊截图功能需要开启查看应用使用情况的权限
             AppUsageManager.getInstance().tryOpenLookAppUsageStatsPermission(false);
         }
     }
@@ -273,7 +273,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         detail_shrae_friend_layout.setVisibility(View.VISIBLE);
 
         taskEty = taskReleaseEty.getTask();
-        if(onResumeCount == 0){
+        if (onResumeCount == 0) {
             if (DataUtil.IS_USE_SCREEN_SHOT && taskEty.needShotScreen()) {
                 //如果要使用小绵羊截图方案，则在进入任务详情界面启动FloatShotScreenService，并获取截屏权限，并把intent data传递给FloatShotScreenService
                 Jump2View.getInstance().startShotScreenFloat(SheepApp.getInstance(), null);
@@ -329,8 +329,8 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
             detailTaskTv.setBackground(activity.getResources().getDrawable(R.drawable.selector_button_full_main));
         }
         //设置是否显示取消任务按钮
-        if(gettaskAcceptedEty != null && (gettaskAcceptedEty.getStatus() == 1 || gettaskAcceptedEty.getStatus() == 2) &&
-                taskEty.canCancelTask()){
+        if (gettaskAcceptedEty != null && (gettaskAcceptedEty.getStatus() == 1 || gettaskAcceptedEty.getStatus() == 2) &&
+                taskEty.canCancelTask()) {
             task_detail_reward.setVisibility(View.GONE);
             task_detail_cancel.setVisibility(View.VISIBLE);
         } else {
@@ -339,11 +339,13 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         }
         updateBottom();
     }
+
     private static final int TASK_TYPE_INIT = -1;//初始化状态，可能是未领取，如果不是请让第一按钮处于不可见或者不可操作状态
     private static final int TASK_TYPE_COMMON_H5 = 10;//h5任务标志
     private static final int TASK_TYPE_SUCCESSION_H5_OUT = 13;//连续任务中的h5任务标志
     private static final int TASK_TYPE_SUCCESSION_H5_IN = 12;//连续任务中的h5任务标志
     private static final int TASK_TYPE_RESERVATION = 11;//游戏任务中还不可以下载任务(预约任务)-->预约游戏
+
     /**
      * 用户操作按钮状态与文字设置
      */
@@ -357,7 +359,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         btnUpImag.setEnabled(true);
         //判断任务是否下线
         if (taskReleaseEty.isOffline()) {//任务已经下线
-            if(gettaskAcceptedEty == null) {//无任务记录
+            if (gettaskAcceptedEty == null) {//无任务记录
                 btnUpImag.setText(CommonUtil.TASK_OFFLINE);//第二按钮不可点击且显示状态
                 btnUpImag.setEnabled(false);
                 switch (taskEty.getTask_type()) {// 1时间试玩任务 2 信用卡任务 3应用下载 4h5业务 1001畅思 1000连续任务， 1002 1003游戏任务 1004 小米游戏任务
@@ -439,7 +441,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
 
             }
         } else {//任务未下线
-            if(gettaskAcceptedEty == null) {//无任务记录-->显示领取任务按钮
+            if (gettaskAcceptedEty == null) {//无任务记录-->显示领取任务按钮
                 btnUpImag.setVisibility(View.GONE);//不显示第二按钮
                 btnTaskItem.setText(CommonUtil.GET_TASK);
             } else {//有任务记录
@@ -492,7 +494,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     case TASK_TYPE_GAME_SHEEP:
                     case TASK_TYPE_GAME_TECENT:
                     case TASK_TYPE_GAME_XIAO_MI://游戏任务
-                        if(taskEty.isGameReservationCantDownload()) {//游戏任务中还不可以下载任务(预约任务)-->预约游戏
+                        if (taskEty.isGameReservationCantDownload()) {//游戏任务中还不可以下载任务(预约任务)-->预约游戏
                             type = TASK_TYPE_RESERVATION;
                             btnTaskItem.setText(CommonUtil.GAME_RESERVATION);
                             btnUpImag.setVisibility(View.GONE);//不显示第二按钮
@@ -502,7 +504,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                         }
                         break;
                     case TASK_TYPE_SUCCESSION://连续任务
-                        switch (taskEty.getOpen_mode()){//连续任务的打开方式 1:打开应用 2:H5内部 3:H5外部
+                        switch (taskEty.getOpen_mode()) {//连续任务的打开方式 1:打开应用 2:H5内部 3:H5外部
                             case OPEN_MODE_TYPE_H5_OUT:
                             case OPEN_MODE_TYPE_H5_IN:
                                 type = TASK_TYPE_COMMON_H5 + taskEty.getOpen_mode();
@@ -523,6 +525,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
             }
         }
     }
+
     //设置第二按钮重新提交相关状态
     private void setSecondBtnResubmit(int failChildPosition) {
         switch (gettaskAcceptedEty.getAllowSubmit()) {
@@ -538,6 +541,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                 break;
         }
     }
+
     //设置第二按钮重新提交相关状态
     private void setSecondBtnResubmit() {
         switch (gettaskAcceptedEty.getAllowSubmit()) {
@@ -571,6 +575,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
             btnUpImag.setVisibility(View.GONE);
         }
     }
+
     /**
      * 设置应用自动审核的任务底部按钮的状态（任务未下线且有任务记录且已经安装游戏）
      * 注：前提是gettaskAcceptedEty不为空哦
@@ -578,6 +583,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     private void setAutoTaskSecondBtnState() {
         setSecondBtnState();
     }
+
     /**
      * 设置非应用自动审核的连续任务底部按钮的状态（任务未下线且有任务记录且已经安装游戏）
      * 注：前提是gettaskAcceptedEty不为空哦
@@ -612,7 +618,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                 btnUpImag.setEnabled(false);
                 break;
             case INSPECT_TYPE_PERSION:
-                switch (type){
+                switch (type) {
                     case DownloadUtil.STATUS_INIT:
                     case DownloadUtil.STATUS_FINISH:
                         btnUpImag.setVisibility(View.GONE);
@@ -624,13 +630,13 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                 break;
             case INSPECT_TYPE_SHEEP:
                 btnUpImag.setText("领取奖励");
-                switch (type){
+                switch (type) {
                     case DownloadUtil.STATUS_INIT:
                     case DownloadUtil.STATUS_FINISH:
                         btnUpImag.setVisibility(View.GONE);
                         break;
                     default:
-                        if(taskEty.isSuccession())//连续任务
+                        if (taskEty.isSuccession())//连续任务
                             setAutoSuccessionTaskBottomState();
                         else
                             setAutoTaskSecondBtnState();
@@ -646,7 +652,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
      */
     private void setOtherNormalTaskBtnState() {
         boolean isSuccession = taskEty.isSuccession();
-        if(isSuccession){//连续任务
+        if (isSuccession) {//连续任务
             setSuccessionTaskBottomState();
         } else {
             setSecondBtnState();
@@ -766,7 +772,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         action1.call(true);
         if (isInstalled) {
             action1.call(DownloadUtil.STATUS_INSTALLED);
-            switch (taskEty.getTask_type()){// 1时间试玩任务 3应用下载 1000连续任务， 1002 1003游戏任务 1002平台游戏，1003 腾讯游戏，1004 小米游戏
+            switch (taskEty.getTask_type()) {// 1时间试玩任务 3应用下载 1000连续任务， 1002 1003游戏任务 1002平台游戏，1003 腾讯游戏，1004 小米游戏
                 case TASK_TYPE_APP:
                     buttonStr = CommonUtil.OPEN_APPLY;
                     break;
@@ -841,7 +847,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     Jump2View.getInstance().tryShare(activity, "task_desc_url", "task_id", releaseTaskId);
                     break;
                 case R.id.task_detail_cancel://尝试取消任务
-                    if(gettaskAcceptedEty != null && gettaskAcceptedEty.getId() > 0)
+                    if (gettaskAcceptedEty != null && gettaskAcceptedEty.getId() > 0)
                         取消任务(gettaskAcceptedEty.getId(), new Action1<Integer>() {
                             @Override
                             public void call(Integer integer) {
@@ -1006,10 +1012,10 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                 break;
         }
         if (commitScreenShotTaskId > 0) {
-            if(DataUtil.IS_USE_ALL_IMAGE) {//可以上传任意图片
+            if (DataUtil.IS_USE_ALL_IMAGE) {//可以上传任意图片
                 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){//使用记录的方式来获取用户的截图
+                if (ListenerShotService.IS_RECORD_PATH) {//使用记录的方式来获取用户的截图
                     List<ScreenShotRecord> list = DDProviderHelper.getInstance().getScreenShotRecordList(activity, taskEty.getPackage_names());
                     showChooseListDialog(false, true, DEFAULT_MAX_COUNT, ListUtil.asList(new ListUtil.CallBack<ScreenShotRecord, String>() {
                         @Override
@@ -1049,7 +1055,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
             String gps = LocationUtils.getInstance().getLongitudeLatitude();
             JSONObject object = new JSONObject();
             object.put("gps", gps);
-            if(AutoCheckService.IS_USE_THIS_SERVICE) {
+            if (AutoCheckService.IS_USE_THIS_SERVICE) {
                 ProcessRecord processRecord = DDProviderHelper.getInstance().getProcessRecord(SheepApp.getInstance(), taskEty.getPackage_names());
                 object.put("task_time", processRecord.getRunTime());
                 LogUtil.println(1, "checkAndCommitTask", processRecord.getRunTime());
@@ -1059,12 +1065,12 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                 }
             } else {
                 long runTime = AppUsageManager.getInstance().getTotalTimeInForeground(taskEty.getPackage_names());
-                if(runTime == AppUsageManager.NOT_OPEN_USAGE_STATS){//获取不到应用使用情况，提示用户开启权限
+                if (runTime == AppUsageManager.NOT_OPEN_USAGE_STATS) {//获取不到应用使用情况，提示用户开启权限
                     AppUsageManager.getInstance().showAccessibilityDialog();
                     return;
                 }
                 AcceptTaskRecord acceptTaskRecord = DDProviderHelper.getInstance().getAcceptTaskRecord(SheepApp.getInstance(), taskEty.getPackage_names());
-                if(acceptTaskRecord == null){
+                if (acceptTaskRecord == null) {
                     object.put("task_time", 0);
                     LogUtil.println(2, "checkAndCommitTask", 0);
                     acceptTaskRecord = new AcceptTaskRecord();
@@ -1130,6 +1136,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                 break;
         }
     }
+
     /**
      * 连续任务在自动审核任务领取奖励时添加子任务id参数
      *
@@ -1140,7 +1147,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         switch (taskEty.getTask_type()) {
             case TASK_TYPE_SUCCESSION://连续任务
                 TaskChild task_child = taskEty.getCanCommitChild(STATUS_RUNNING);
-                if(task_child != null)
+                if (task_child != null)
                     object.put("task_child_id", task_child.getId());
                 break;
         }
@@ -1204,7 +1211,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         dismissLoaddingDialog();
         G.showToast("提交成功，等待审核!");
         if ((DataUtil.IS_USE_SCREEN_SHOT || DataUtil.IS_LISTEN_SCREEN_SHOT) && taskEty.needShotScreen()) {//小绵羊截图方案或者监听方案：上传截图成功后删除之前的截图
-            if(!TextUtils.isEmpty(taskEty.getPackage_names())){
+            if (!TextUtils.isEmpty(taskEty.getPackage_names())) {
                 DataUtil.getInstance().clearScreenShots(taskEty.getPackage_names());
             }
         }
@@ -1252,13 +1259,14 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     protected void onGetImage(String path) {
 
     }
+
     private ICallBack<Boolean> callBack = new ICallBack<Boolean>() {
         @Override
         public Boolean call(@CALL_BACK_TYPE int type, Object... args) {
             String imagePath = (String) args[0];
-            switch (type){
+            switch (type) {
                 case IS_RECORD:
-                    if(DDProviderHelper.getInstance().getScreenShotRecord(activity.getApplication(), taskEty.getPackage_names(), imagePath) != null){
+                    if (DDProviderHelper.getInstance().getScreenShotRecord(activity.getApplication(), taskEty.getPackage_names(), imagePath) != null) {
                         return true;
                     }
                     break;
@@ -1277,16 +1285,19 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
             return false;
         }
     };
+
     /**
      * 上传图片前的回调
+     *
      * @return
      */
-    protected ICallBack<Boolean> getCallBack(){
+    protected ICallBack<Boolean> getCallBack() {
         if ((DataUtil.IS_USE_SCREEN_SHOT || DataUtil.IS_LISTEN_SCREEN_SHOT) && taskEty.needShotScreen()) {//小绵羊截图方案或者监听方案：上传截图成功后删除之前的截图
             return callBack;
         }
         return null;
     }
+
     private int commitScreenShotTaskId;
 
     @Override
@@ -1353,7 +1364,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
 
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        if(action1 != null)
+                        if (action1 != null)
                             action1.call(1);
                     }
                 });
@@ -1442,9 +1453,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
             if (task.getKey().equals(taskEty.getDownload_link())) {
                 int p = task.getPercent();    //任务进度百分比
                 String speed = task.getConvertSpeed();    //转换单位后的下载速度，单位转换需要在配置文件中打开
-//                long speed1 = task.getSpeed(); //原始byte长度速度
-                btnTaskItem.setText(String.format(Locale.CHINA, "%d%%", Math.abs(p)));
-                System.out.println("Aria p " + p + ", speed = " + speed);
+                btnTaskItem.setText(String.format(Locale.CHINA, "%d%%(%s)", Math.abs(p), speed));//添加下载速度
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -1502,10 +1511,11 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     }
 
     private int onResumeCount = 0;
+
     @Override
     protected void onResume() {
         super.onResume();
-        if(onResumeCount > 0) {//第一次不加载
+        if (onResumeCount > 0) {//第一次不加载
             if (taskReleaseEty == null || isFresh) {
                 isFresh = true;
                 freshData();
@@ -1595,7 +1605,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
             detail_task_listview.setVisibility(View.GONE);
             sonListviewAdp = new TaskdetailSonListviewAdp(descEntityArrayList, activity);
             detail_task_recyclerview.setAdapter(sonListviewAdp);
-            if(taskEty.isApplet()){
+            if (taskEty.isApplet()) {
                 sonListviewAdp.addTaskEntity(taskReleaseEty);
             }
         }
@@ -1670,7 +1680,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     initTaskReleaseEty();
                 } else {
                     hideProgress();
-                    if(empty_view == null){
+                    if (empty_view == null) {
                         return;
                     }
                     empty_view.setVisibility(View.GONE);
@@ -1684,7 +1694,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         taskReleaseEty = DataUtil.getInstance().getCacheResult(ApiKey.releaseTaskDesc(releaseTaskId), TaskReleaseEty.class);
         hideProgress();
         if (taskReleaseEty != null) {
-            if(empty_view == null){
+            if (empty_view == null) {
                 return;
             }
             empty_view.setVisibility(View.GONE);

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

@@ -142,6 +142,7 @@ public class FgtAudit extends BaseFragment {
         etyList.clear();
         adp.notifyDataSetChanged();
         page = 1;
+        CommonUtil.getInstance().resetEmptyView(empty_view);
         initData();
     }
     public void initData() {
@@ -171,6 +172,9 @@ public class FgtAudit extends BaseFragment {
     }
 
     private void notifyDataSetChanged(){
+        if(empty_view == null){
+            return;
+        }
         CommonUtil.getInstance().updateEmptyView(empty_view, etyList.isEmpty());
         hideProgress();
         swipe_container.setRefreshing(false);

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

@@ -300,7 +300,7 @@ public class FgtFindChild extends BaseListFragment2<FindItem> {
     @Download.onTaskRunning protected void running(DownloadTask task) {
         TextView textView = getTextViewByTask(task);
         if(textView != null) {
-            textView.setText(String.format(Locale.CHINA, "%d%%", Math.abs(task.getPercent())));
+            textView.setText(String.format(Locale.CHINA, "%d%%(%s)", Math.abs(task.getPercent()), task.getConvertSpeed()));//添加下载速度
         }
     }
 

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

@@ -206,13 +206,12 @@ public class FgtMyGame extends BaseFragment {
         try {
             int p = task.getPercent();    //任务进度百分比
             String speed = task.getConvertSpeed();    //转换单位后的下载速度，单位转换需要在配置文件中打开
-            System.out.println("Aria "+task.getKey()+",p " + p + ", speed = " + speed);
             String url = task.getKey();
             TextView tvProgress = recyclerview.findViewWithTag(TryMakeMoneyAdp.PUBLIC_TAG_PREFIX_TEXTVIEW_LIST + url);
             if (tvProgress == null) {
                 return;
             }
-            tvProgress.setText(String.format(Locale.CHINA, "%d%%",Math.abs(p)));
+            tvProgress.setText(String.format(Locale.CHINA, "%d%%(%s)", Math.abs(p), speed));//添加下载速度
 
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -86,6 +86,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         }
     };
     private void notifyDataSetChanged() {
+        progress++;
         if(empty_view == null || view_list == null){
             return;
         }
@@ -100,7 +101,11 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
             tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.BEGIN_TASK, releaseEtyListsBegin));
         tryMakeMoneyAdp.refreshAdapter();
         boolean showEmpty = acceptedEtyList.isEmpty() && releaseEtyLists.isEmpty() && releaseEtyListsBegin.isEmpty();
-        CommonUtil.getInstance().updateEmptyView(empty_view, showEmpty);
+        if(progress != 6 && showEmpty){
+            //每次刷新数据有6处地方调用notifyDataSetChanged，progress都会+1，没有数据的情况下，没有到最后一步不调用空view
+        } else {
+            CommonUtil.getInstance().updateEmptyView(empty_view, showEmpty);
+        }
         view_list.refreshComplete();
         view_list.loadMoreComplete();
         notifyBottomLine(false);
@@ -308,8 +313,9 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     //是否获取即将开始的列表
     private boolean isGetReleaseBegin = false;
 
+    private int progress = 0;//数据加载进度
     public void mInitData() {
-        LogUtil.println("mInitData");
+        progress = 0;
         if (!acceptedEtyList.isEmpty()) {
             acceptedEtyList.clear();
             notifyDataSetChanged();