首頁 探索 說明
註冊 登入
xmy_android
/
small_sheep_android
關註 3
讚好 0
複刻 0
檔案 問題管理 0 合併請求 0 Wiki
瀏覽代碼

下线并提交过截图的失败任务可以有最后一次机会重新提交截图

zengjiebin 8 年之前
父節點
fe95a5a937
當前提交
2a4481d85f
共有 8 個文件被更改，包括 82 次插入 和 4 次删除
分割檢視 顯示文件統計
  1. 1 1
      app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java
  2. 1 1
      app/src/main/java/com/sheep/gamegroup/model/api/ApiService.java
  3. 9 0
      app/src/main/java/com/sheep/gamegroup/model/entity/TaskAcceptedEty.java
  4. 1 1
      app/src/main/java/com/sheep/gamegroup/model/entity/TaskEty.java
  5. 8 0
      app/src/main/java/com/sheep/gamegroup/model/util/SheepSubscriber.java
  6. 46 0
      app/src/main/java/com/sheep/gamegroup/util/ConnectAddress.java
  7. 15 0
      app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAct.java
  8. 1 1
      app/src/main/java/com/sheep/gamegroup/view/fragment/FgtTryMakeMoney.java

+ 1 - 1
app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java
查看文件 

@@ -367,7 +367,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
                 CommonUtil.getInstance()
 
                         .setHashMap(1,
 
                                 100,
 
-                                1,
 
+                                SheepApp.getInstance().getConnectAddress().getPlatForm(),
 
                                 1,
 
                                 0,
 
                                 0,

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/model/api/ApiService.java
查看文件 

@@ -107,7 +107,7 @@ public interface ApiService {
 
     Observable<BaseMessage> bindWeixin(@Query("code") String code);
 
 
     /**
 
-     * 获取已接受任务
 
+     * 获取任务记录列表
 
      */
 
     @GET("app/accepted_task/")
 
     Observable<BaseMessage> acceptedTask(@Query("page") int page, @Query("per_page") int per_page);

+ 9 - 0
app/src/main/java/com/sheep/gamegroup/model/entity/TaskAcceptedEty.java
查看文件 

@@ -17,6 +17,7 @@ public class TaskAcceptedEty implements Serializable{
 
     private int status =1;// 0,--------1,已接受任务 2,正在进行中,3完成任务,4放弃任务,5任务失败,6审核失败,7提交审核,8任务已下线,9至少完成了一个任务了
 
     private String uid;// 0,
 
     private String update_time;// 0
 
+    private int lower_num;// 任务下线后提交的次数
 
 
     private long end_time;
 
 
@@ -119,6 +120,14 @@ public class TaskAcceptedEty implements Serializable{
 
         this.release_task = release_task;
 
     }
 
 
+    public int getLower_num() {
 
+        return lower_num;
 
+    }
 
+
 
+    public void setLower_num(int lower_num) {
 
+        this.lower_num = lower_num;
 
+    }
 
+
 
     @Override
 
     public boolean equals(Object obj) {
 
         return obj instanceof TaskAcceptedEty && ((TaskAcceptedEty) obj).id == id;

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/model/entity/TaskEty.java
查看文件 

@@ -25,7 +25,7 @@ public class TaskEty implements Serializable{
 
     private String remarks;//private String string",
 
     private String screenshots;//private String string",
 
     private String task_name;//private String string",
 
-    private int task_type = 1;// 1时间试玩任务 2 信用卡任务 3应用下载 4h5业务
 
+    private int task_type = 1;// 1时间试玩任务 2 信用卡任务 3应用下载 4h5业务 1001畅思
 
     private String update_time;// 0
 
     private String icon;
 
     private String package_size;

+ 8 - 0
app/src/main/java/com/sheep/gamegroup/model/util/SheepSubscriber.java
查看文件 

@@ -10,6 +10,7 @@ import com.sheep.gamegroup.model.entity.BaseMessage;
 
 import com.sheep.gamegroup.util.ActivityManager;
 
 import com.sheep.gamegroup.util.Jump2View;
 
 import com.sheep.gamegroup.util.NetUtil;
 
+import com.sheep.jiuyan.samllsheep.BuildConfig;
 
 import com.sheep.jiuyan.samllsheep.SheepApp;
 
 import com.sheep.jiuyan.samllsheep.utils.G;
 
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
@@ -66,6 +67,13 @@ public abstract class SheepSubscriber<T> extends Subscriber<T> {
 
                 BaseMessage baseMessage;
 
                 if(throwable.message.startsWith("{")){
 
                     baseMessage = JSONObject.parseObject(throwable.message, BaseMessage.class);
 
+                }else if(throwable.message.startsWith("<!DOCTYPE html>")){
 
+                    if(BuildConfig.DEBUG){
 
+                        Jump2View.getInstance().goNotice(ActivityManager.getInstance().currentActivity(), "服务器错误", throwable.message, 0);
 
+                        return;
 
+                    }
 
+                    baseMessage = new BaseMessage();
 
+                    baseMessage.setMsg("服务器错误");
 
                 }else {
 
                     try {
 
                         baseMessage = JSONObject.parseObject(BaseMessageConverter.decrypt(throwable.message), BaseMessage.class);

+ 46 - 0
app/src/main/java/com/sheep/gamegroup/util/ConnectAddress.java
查看文件 

@@ -47,6 +47,48 @@ public enum ConnectAddress {
 
         public String getName() {
 
             return "李抒阳";
 
         }
 
+    },
 
+    sheepzhangweiIOS {
 
+
 
+        @Override
 
+        public String getAppUrl() {
 
+            return "http://10.8.210.171:8080/";
 
+        }
 
+        @Override
 
+        public String getName() {
 
+            return "张伟IOS";
 
+        }
 
+    },sheeptestIOS {
 
+
 
+        @Override
 
+        public String getAppUrl() {
 
+            return "http://test.sheep.kfzs.com/";
 
+        }
 
+        @Override
 
+        public String getName() {
 
+            return "测试服IOS";
 
+        }
 
+    },sheepIOS {
 
+
 
+        @Override
 
+        public String getAppUrl() {
 
+            return "http://ss.kfzs.com/";
 
+        }
 
+
 
+        @Override
 
+        public String getName() {
 
+            return "正式服IOS";
 
+        }
 
+    },sheeplishuyangIOS {
 
+
 
+        @Override
 
+        public String getAppUrl() {
 
+            return "http://10.8.210.170:8080/";
 
+        }
 
+        @Override
 
+        public String getName() {
 
+            return "李抒阳IOS";
 
+        }
 
     };
 
     public abstract String getAppUrl();
 
 
@@ -56,4 +98,8 @@ public enum ConnectAddress {
 
     public String toString() {
 
         return getName();
 
     }
 
+
 
+    public int getPlatForm() {
 
+        return getName().endsWith("IOS") ? 0 : 1;//0 ios, 1 android
 
+    }
 
 }

+ 15 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAct.java
查看文件 

@@ -5,6 +5,7 @@ import android.content.Intent;
 
 import android.os.Build;
 
 import android.os.Bundle;
 
 import android.support.annotation.RequiresApi;
 
+import android.text.Html;
 
 import android.text.TextUtils;
 
 import android.view.View;
 
 import android.webkit.WebChromeClient;
 
@@ -304,6 +305,20 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
 
                     llInfos.addView(getStep("完成任务", "已完成", 0));
 
                     bottom_btn_layout.setVisibility(View.GONE);
 
                     return;
 
+                case 8://任务已经下线
 
+                    if(TextUtils.isEmpty(taskAcceptedEty.getScreenshots()) || taskAcceptedEty.getLower_num() > 0){//没有提交过截图或者已经提交过一次 下线失败后提交
 
+                        break;
 
+                    } else {//提交过一次，但是审核失败或者没有审核就下线了
 
+                        String sr = "重新提交（<font color='#e2271d'><big>最后一次机会</big></font>）";
 
+                        btnUpImag.setText(Html.fromHtml(sr));
 
+                        btnUpImag.setVisibility(View.VISIBLE);
 
+                        btnTaskItem.setVisibility(View.GONE);
 
+                        llInfos.removeAllViews();
 
+                        llInfos.addView(getStep("领取任务", "已完成", 0));
 
+                        llInfos.addView(getStep("APP下载", "已完成", 0));
 
+                        llInfos.addView(getStep("完成任务", "审核失败", 1));
 
+                        return;
 
+                    }
 
             }
 
             bottom_btn_layout.setVisibility(View.GONE);
 
             ((View)llInfos.getParent()).setVisibility(View.GONE);

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtTryMakeMoney.java
查看文件 

@@ -188,7 +188,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
 
                 CommonUtil.getInstance()
 
                         .setHashMap(1,
 
                                 100,
 
-                                1,
 
+                                SheepApp.getInstance().getConnectAddress().getPlatForm(),
 
                                 0,
 
                                 0,
 
                                 type==2 ? 1 : type,