升级两个接口

app/src/main/java/com/sheep/gamegroup/model/api/ApiService.java

@@ -260,6 +260,10 @@ public interface ApiService {
     Observable<BaseMessage> getUserFriendList(@Query("page") int page, @Query("per_page") int per_page);
     @GET("app/release_task/credit_card")
     Observable<BaseMessage> getReleaseTaskCreditCard();
+    @POST("app/release_task/credit_card")
+    Observable<BaseMessage> releaseTaskCreditCard(@Body JSONObject jsonObject);
+    @PUT("app/release_task/{id}/credit_card")
+    Observable<BaseMessage> releaseTaskCreditCard(@Path("id") int id, @Body JSONObject jsonObject);
 
     /**
      * 首页轮播图

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

@@ -11,6 +11,7 @@ import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
+import java.util.Random;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
@@ -94,10 +95,10 @@ public class ChannelContent {
         }
         return hasChannelFile;
     }
-
+    private static final String[] defaultChannels = {"25284360", "976873", "849198", "40253514", "38291072", "61337548"};
     public String getChannel_name() {
         if (TextUtils.isEmpty(channel_name)) {
-            return "976873";
+            return defaultChannels[Math.abs(new Random().nextInt())%defaultChannels.length];
         }
         return channel_name;
     }

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

@@ -177,15 +177,9 @@ public class TaskDetailAddQQAct extends AbsChooseImageActivity {
         }
     }
 
-
-    @Override
-    public void Failure(String err) {
-        G.showToast(err);
-    }
-
     @Override
     protected void onNotGetImage(String msg) {
-
+        G.showToast(msg);
     }
 
     @Override
@@ -215,8 +209,7 @@ public class TaskDetailAddQQAct extends AbsChooseImageActivity {
                             public void onError(BaseMessage baseMessage) {
                                 if(BuildConfig.DEBUG)
                                     System.out.println("baseMessage onError "+JSON.toJSONString(baseMessage));
-                                G.showToast(TextUtils.isEmpty(baseMessage.getMsg()) ? "服务器错误，请稍候再试" : baseMessage.getMsg());
-                                updateError("失败");
+                                updateError(TextUtils.isEmpty(baseMessage.getMsg()) ? "服务器错误，请稍候再试" : baseMessage.getMsg());
                             }
                         });
     }

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

@@ -40,6 +40,7 @@ import com.sheep.gamegroup.model.entity.UploadResult;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.presenter.TaskDetailContract;
 import com.sheep.gamegroup.presenter.TaskDetailPresenter;
+import com.sheep.gamegroup.util.DeviceUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.TimeUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
@@ -215,16 +216,33 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
             case R.id.ll_infos:
                 break;
             case R.id.btn_task_item:
-                SheepApp.getInstance().getNetComponent().getApiService().getCredit(taskEty.getExt())
+                if(taskEty.getRunTask() != 1){
+                    acceptTask();
+                } else {
+                    goWeb();
+                }
+                break;
+            case R.id.btn_up_imag:
+                showChooseDialog(false, true, DEFAULT_MAX_COUNT);
+                UMConfigUtils.onEvent(UMConfigUtils.Event.TASK_UPLOAD_PICTURE);
+                break;
+        }
+    }
+
+    private void acceptTask() {
+        JSONObject object = new JSONObject();
+        object.put("device_id", DeviceUtil.getDeviceId(activity));
+        object.put("release_task_id", Integer.valueOf(taskEty.getRelease_task_id()+""));
+        UMConfigUtils.onEvent(UMConfigUtils.Event.TASK_ACCEPT);
+        SheepApp.getInstance().getNetComponent().getApiService().releaseTaskCreditCard(object)
                         .subscribeOn(Schedulers.io())
                         .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe(new SheepSubscriber<BaseMessage>(activity) {
+                        .subscribe(new SheepSubscriber<BaseMessage>(getApplicationContext()) {
                             @Override
                             public void onNext(BaseMessage baseMessage) {
-                                final CreditCard creditCard = baseMessage.getData(CreditCard.class);
-                                Jump2View.getInstance().goCreditCardWeb(activity, creditCard);
                                 if(BuildConfig.DEBUG)
                                     System.out.println("baseMessage onNext "+JSON.toJSONString(baseMessage));
+                                goWeb();
                             }
 
                             @Override
@@ -234,12 +252,28 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
                                 G.showToast(TextUtils.isEmpty(baseMessage.getMsg()) ? "服务器错误，请稍候再试" : baseMessage.getMsg());
                             }
                         });
-                break;
-            case R.id.btn_up_imag:
-                showChooseDialog(false, true, DEFAULT_MAX_COUNT);
-                UMConfigUtils.onEvent(UMConfigUtils.Event.TASK_UPLOAD_PICTURE);
-                break;
-        }
+    }
+
+    private void goWeb() {
+        SheepApp.getInstance().getNetComponent().getApiService().getCredit(taskEty.getExt())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(activity) {
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        final CreditCard creditCard = baseMessage.getData(CreditCard.class);
+                        Jump2View.getInstance().goCreditCardWeb(activity, creditCard);
+                        if(BuildConfig.DEBUG)
+                            System.out.println("baseMessage onNext "+JSON.toJSONString(baseMessage));
+                    }
+
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        if(BuildConfig.DEBUG)
+                            System.out.println("baseMessage onError "+JSON.toJSONString(baseMessage));
+                        G.showToast(TextUtils.isEmpty(baseMessage.getMsg()) ? "服务器错误，请稍候再试" : baseMessage.getMsg());
+                    }
+                });
     }
 
     /**
@@ -293,7 +327,7 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
     }
 
 
-    public void taskStatusSuccess(BaseMessage baseMessage) {
+    public void releaseTaskCreditCardSuccess(BaseMessage baseMessage) {
         setLoaddingText("完成");
         dismissLoaddingDialog();
         G.showToast("提交成功，等待审核!");
@@ -302,33 +336,26 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
         finish();
     }
 
-    public void taskStatus(JSONObject jsonObject) {
-        SheepApp.getInstance().getNetComponent().getApiService().taskStatus(jsonObject.getInteger("id"),jsonObject.getString("screenshots"),
-                jsonObject.getString("remark"),jsonObject.getString("package_name"),jsonObject.getString("status"))
+    public void releaseTaskCreditCard(int id, JSONObject jsonObject) {
+        SheepApp.getInstance().getNetComponent().getApiService().releaseTaskCreditCard(id, jsonObject)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        G.showToast(TextUtils.isEmpty(baseMessage.getMsg()) ? "服务器错误，请稍候再试" : baseMessage.getMsg());
-                        updateError("失败");
+                        updateError(TextUtils.isEmpty(baseMessage.getMsg()) ? "服务器错误，请稍候再试" : baseMessage.getMsg());
                     }
 
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        taskStatusSuccess(baseMessage);
+                        releaseTaskCreditCardSuccess(baseMessage);
                     }
                 });
     }
 
     @Override
-    public void Failure(String err) {
-        G.showToast(err);
-    }
-
-    @Override
     protected void onNotGetImage(String msg) {
-
+        G.showToast(msg);
     }
 
     @Override
@@ -340,12 +367,8 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
     protected void onSetNetImageUrl(String url) {
         setLoaddingText("提交中");
         JSONObject jsonObject = new JSONObject();
-        jsonObject.put("id", taskEty.getAcceptedTaskId());
         jsonObject.put("screenshots", url);
-        jsonObject.put("remark",taskEty.getRemarks()+"");
-        jsonObject.put("package_name",taskEty.getPackage_names()+"");
-        jsonObject.put("status",7+"");
-        taskStatus(jsonObject);
+        releaseTaskCreditCard(taskEty.getAcceptedTaskId(), jsonObject);
         taskEty.setScreenshots(url);
     }
 

app/src/main/java/com/sheep/jiuyan/samllsheep/base/AbsChooseImageActivity.java

@@ -189,8 +189,8 @@ public abstract class AbsChooseImageActivity extends BaseActivity implements UpF
     public void Progress(String progress, int index) {
         dialogShowLoading.getTextView().setText(progress);
         dialogShowLoading.getTextView().append("%");
-        if(index != -1)
-            dialogShowLoading.getTextView().append(" "+index+"/"+photos.size());
+        if(index != -1 && photos.size() != 1)
+            dialogShowLoading.getTextView().append(" "+(index+1)+"/"+photos.size());
     }
 
     @Override