Преглед на файлове

review
图片转webp;
任务详情中 重新提交情况下显示打开应用按钮;
修复bug

zengjiebin преди 7 години
родител
ревизия
3f966d87b4
променени са 32 файла, в които са добавени 14 реда и са изтрити 4 реда
  1. 1 1
      app/src/main/java/com/kfzs/duanduan/react/TabsHelper.java
  2. 13 3
      app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAct.java
  3. BIN
      app/src/main/res/drawable-mdpi/gift_icon.webp
  4. BIN
      app/src/main/res/drawable-xhdpi/index_download.png
  5. BIN
      app/src/main/res/drawable-xhdpi/invition_redpackage.png
  6. BIN
      app/src/main/res/drawable-xhdpi/invition_redpackage.webp
  7. BIN
      app/src/main/res/drawable-xhdpi/kaipin.png
  8. BIN
      app/src/main/res/drawable-xhdpi/kaipin.webp
  9. BIN
      app/src/main/res/drawable-xhdpi/tab_click_shenhe.png
  10. BIN
      app/src/main/res/drawable-xhdpi/tab_click_shenhe.webp
  11. BIN
      app/src/main/res/drawable-xhdpi/tab_click_yaoqing.png
  12. BIN
      app/src/main/res/drawable-xhdpi/tab_click_yaoqing.webp
  13. BIN
      app/src/main/res/drawable-xhdpi/tab_shenhe.png
  14. BIN
      app/src/main/res/drawable-xhdpi/tab_shenhe.webp
  15. BIN
      app/src/main/res/drawable-xhdpi/tab_yaoqing.png
  16. BIN
      app/src/main/res/drawable-xhdpi/tab_yaoqing.webp
  17. BIN
      app/src/main/res/drawable-xxhdpi/index_download.webp
  18. BIN
      app/src/main/res/drawable-xxhdpi/splash_bg_img.webp
  19. BIN
      app/src/main/res/drawable-xxhdpi/tab_click_shenhe.png
  20. BIN
      app/src/main/res/drawable-xxhdpi/tab_click_shenhe.webp
  21. BIN
      app/src/main/res/drawable-xxhdpi/tab_click_yaoqing.png
  22. BIN
      app/src/main/res/drawable-xxhdpi/tab_click_yaoqing.webp
  23. BIN
      app/src/main/res/drawable-xxhdpi/tab_shenhe.png
  24. BIN
      app/src/main/res/drawable-xxhdpi/tab_shenhe.webp
  25. BIN
      app/src/main/res/mipmap-xhdpi/homepage_chakangd.png
  26. BIN
      app/src/main/res/mipmap-xhdpi/homepage_chakangd.webp
  27. BIN
      app/src/main/res/mipmap-xhdpi/homepage_xinshourw.png
  28. BIN
      app/src/main/res/mipmap-xhdpi/homepage_xinshourw.webp
  29. BIN
      app/src/main/res/mipmap-xxhdpi/homepage_chakangd.png
  30. BIN
      app/src/main/res/mipmap-xxhdpi/homepage_chakangd.webp
  31. BIN
      app/src/main/res/mipmap-xxhdpi/homepage_xinshourw.png
  32. BIN
      app/src/main/res/mipmap-xxhdpi/homepage_xinshourw.webp

+ 1 - 1
app/src/main/java/com/kfzs/duanduan/react/TabsHelper.java

@@ -110,7 +110,7 @@ public class TabsHelper {
                         int auditPosition = MainTab.FgtMainAudit.ordinal();
                         FgtSmallSheep fgtSmallSheep = (FgtSmallSheep) fragmentList.get(sheepPosition);
                         FgtPersonalCenter personnalCenter = (FgtPersonalCenter) fragmentList.get(personnalPosition);
-                        FgtMainAudit auditFgt = (FgtMainAudit) fragmentList.get(personnalPosition);
+                        FgtMainAudit auditFgt = (FgtMainAudit) fragmentList.get(auditPosition);
                         if(position == sheepPosition){
                             fgtSmallSheep.onResume();
                         } else {

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

@@ -320,7 +320,6 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                 case 1001:
                     break;
                 default:
-                    setBottomState();
                     break;
             }
         } else if (taskEty.isGameReservationCantDownload()) {//游戏任务中还不可以下载的预约任务
@@ -353,6 +352,18 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                 setBottomState2();
                 break;
         }
+        if (gettaskAcceptedEty != null){//只要有任务记录就获取下载状态
+            switch (taskEty.getTask_type()) {// 1时间试玩任务 2 信用卡任务 3应用下载 4h5业务 1001畅思 1000连续任务, 1002 1003游戏任务 1004 小米游戏任务
+                case 4://h5业务
+                case 2:
+                case 1001:
+                case 1000://连续任务
+                    break;
+                default://只要有任务记录就获取下载状态
+                    setBottomState();
+                    break;
+            }
+        }
     }
 
     /**
@@ -413,7 +424,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     //审核失败
                     btnUpImag.setText("重新提交");
                     btnUpImag.setVisibility(View.VISIBLE);
-                    btnTaskItem.setVisibility(View.GONE);
+                    btnTaskItem.setVisibility(View.VISIBLE);
                     break;
                 //不可操作
                 case 7:// "提交审核";
@@ -447,7 +458,6 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
      * 正在进行的任务的状态设置
      */
     private void setBottomState() {
-        taskEty.setRunTask(1);
         setBtnStr(taskEty, mDownloadTaskService, new Action1<Object>() {
             @Override
             public void call(Object o) {

BIN
app/src/main/res/drawable-mdpi/gift_icon.webp


BIN
app/src/main/res/drawable-xhdpi/index_download.png


BIN
app/src/main/res/drawable-xhdpi/invition_redpackage.png


BIN
app/src/main/res/drawable-xhdpi/invition_redpackage.webp


BIN
app/src/main/res/drawable-xhdpi/kaipin.png


BIN
app/src/main/res/drawable-xhdpi/kaipin.webp


BIN
app/src/main/res/drawable-xhdpi/tab_click_shenhe.png


BIN
app/src/main/res/drawable-xhdpi/tab_click_shenhe.webp


BIN
app/src/main/res/drawable-xhdpi/tab_click_yaoqing.png


BIN
app/src/main/res/drawable-xhdpi/tab_click_yaoqing.webp


BIN
app/src/main/res/drawable-xhdpi/tab_shenhe.png


BIN
app/src/main/res/drawable-xhdpi/tab_shenhe.webp


BIN
app/src/main/res/drawable-xhdpi/tab_yaoqing.png


BIN
app/src/main/res/drawable-xhdpi/tab_yaoqing.webp


BIN
app/src/main/res/drawable-xxhdpi/index_download.webp


BIN
app/src/main/res/drawable-xxhdpi/splash_bg_img.webp


BIN
app/src/main/res/drawable-xxhdpi/tab_click_shenhe.png


BIN
app/src/main/res/drawable-xxhdpi/tab_click_shenhe.webp


BIN
app/src/main/res/drawable-xxhdpi/tab_click_yaoqing.png


BIN
app/src/main/res/drawable-xxhdpi/tab_click_yaoqing.webp


BIN
app/src/main/res/drawable-xxhdpi/tab_shenhe.png


BIN
app/src/main/res/drawable-xxhdpi/tab_shenhe.webp


BIN
app/src/main/res/mipmap-xhdpi/homepage_chakangd.png


BIN
app/src/main/res/mipmap-xhdpi/homepage_chakangd.webp


BIN
app/src/main/res/mipmap-xhdpi/homepage_xinshourw.png


BIN
app/src/main/res/mipmap-xhdpi/homepage_xinshourw.webp


BIN
app/src/main/res/mipmap-xxhdpi/homepage_chakangd.png


BIN
app/src/main/res/mipmap-xxhdpi/homepage_chakangd.webp


BIN
app/src/main/res/mipmap-xxhdpi/homepage_xinshourw.png


BIN
app/src/main/res/mipmap-xxhdpi/homepage_xinshourw.webp