修改冲突1

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

@@ -374,7 +374,7 @@ public class TaskDetailAct extends BaseActivity implements TaskDetailContract.Vi
     }
 
     @Override
-    public void Success(String msg) {
+    public void Success(String msg, int index) {
         String json;
         if (TextUtils.isEmpty(msg)) {
             updateError("失败");
@@ -420,7 +420,7 @@ public class TaskDetailAct extends BaseActivity implements TaskDetailContract.Vi
     }
 
     @Override
-    public void Progress(String progress) {
+    public void Progress(String progress, int index) {
         dialogShowLoading.getTextView().setText(progress);
         dialogShowLoading.getTextView().append("%");
 

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

@@ -357,7 +357,7 @@ public class TaskDetailCreditCardAct extends BaseActivity implements UpFileListe
     }
 
     @Override
-    public void Success(String msg) {
+    public void Success(String msg, int index) {
         String json;
         if (TextUtils.isEmpty(msg)) {
             updateError("失败");
@@ -421,7 +421,7 @@ public class TaskDetailCreditCardAct extends BaseActivity implements UpFileListe
     }
 
     @Override
-    public void Progress(String progress) {
+    public void Progress(String progress, int index) {
         dialogShowLoading.getTextView().setText(progress);
         dialogShowLoading.getTextView().append("%");
 

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

@@ -205,7 +205,7 @@ public class TaskListAct extends BaseActivity implements TaskListContract.View,
     }
 
     @Override
-    public void Success(String msg) {
+    public void Success(String msg, int index) {
         String json;
         if (TextUtils.isEmpty(msg)) {
             updateError("失败");
@@ -249,7 +249,7 @@ public class TaskListAct extends BaseActivity implements TaskListContract.View,
         dialogShowLoading.getAlertDialog().dismiss();
     }
     @Override
-    public void Progress(String progress) {
+    public void Progress(String progress, int index) {
         dialogShowLoading.getTextView().setText(progress);
         dialogShowLoading.getTextView().append("%");