提升版本号到2.2.0

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

@@ -95,21 +95,6 @@ public class TaskDetailAddQQAct extends AbsChooseImageActivity {
     private Activity activity;
 
     private NewbieTask taskEty;
-    private DialogShowLoading dialogShowLoading;
-
-    /**
-     * 上传进度
-     */
-    private boolean isUpload = true;
-
-    public void showChooseDialog() {
-        PhotoPicker.builder()
-                .setPhotoCount(7)
-                .setShowCamera(true)
-                .setShowGif(false)
-                .setPreviewEnabled(false)
-                .start(this, PhotoPicker.REQUEST_CODE);
-    }
 
     @Override
     protected int getLayoutId() {
@@ -186,7 +171,7 @@ public class TaskDetailAddQQAct extends AbsChooseImageActivity {
             case R.id.ll_infos:
                 break;
             case R.id.btn_up_imag:
-                showChooseDialog();
+                showChooseDialog(false, true, DEFAULT_MAX_COUNT);
                 UMConfigUtils.onEvent(UMConfigUtils.Event.TASK_UPLOAD_PICTURE);
                 break;
         }
@@ -194,89 +179,6 @@ public class TaskDetailAddQQAct extends AbsChooseImageActivity {
 
 
     @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-
-        //获取图片路径
-        if (requestCode == 1 && resultCode == Activity.RESULT_OK && data != null) {
-            Uri selectedImage = data.getData();
-            String[] filePathColumns = {MediaStore.Images.Media.DATA};
-            Cursor c = getContentResolver().query(selectedImage, filePathColumns, null, null, null);
-            c.moveToFirst();
-            int columnIndex = c.getColumnIndex(filePathColumns[0]);
-            String imagePath = c.getString(columnIndex);
-            if (isUpload) {
-                dialogShowLoading = DialogShowLoading.showDialog(activity);
-                UpFileUtils.upImage(new File(imagePath), TaskDetailAddQQAct.this);
-           }
-            c.close();
-        }
-    }
-
-    public void taskStatusSuccess(BaseMessage baseMessage) {
-        dialogShowLoading.getTextView().setText("完成");
-//                            onGetNetImageUrl(data);
-        dialogShowLoading.getAlertDialog().dismiss();
-        G.showToast("提交成功，等待审核!");
-        EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.ONFRESH_TRYMAKEMANY_PAGE));
-        UMConfigUtils.finishTask();
-        finish();
-    }
-
-    public void taskStatusFaile(BaseMessage baseMessage) {
-        updateError("失败");
-        G.showToast(baseMessage.getMsg()+"");
-
-    }
-
-    @Override
-    public void Success(String msg, int index) {
-        String json;
-        if (TextUtils.isEmpty(msg)) {
-            updateError("失败");
-            return;
-        }
-        if (msg.startsWith("{")) {
-            json = msg;
-        } else {
-            try {
-                byte[] bytes = HexUtils.hexStr2Bytes(msg);
-                byte[] byteDecode = Kfzssafe.XByteDecode(bytes);
-                json = new String(byteDecode);
-            } catch (Exception e) {
-                e.printStackTrace();
-                updateError("失败");
-                return;
-            }
-        }
-        UploadResult uploadResult = JSON.parseObject(json, UploadResult.class);
-        if (uploadResult != null) {
-            final String data = uploadResult.getData().getUrl();
-            dialogShowLoading.getTextView().setText("提交中");
-            newbieTaskAddQq(data);
-        }
-    }
-
-    public void newbieTaskAddQq(String ext) {
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("ext", ext);
-        SheepApp.getInstance().getNetComponent().getApiService().newbieTaskAddQq(jsonObject)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
-                    @Override
-                    public void onError(BaseMessage baseMessage) {
-                        taskStatusFaile(baseMessage);
-                    }
-
-                    @Override
-                    public void onNext(BaseMessage baseMessage) {
-                        taskStatusSuccess(baseMessage);
-                    }
-                });
-    }
-
-    @Override
     public void Failure(String err) {
         G.showToast(err);
     }
@@ -292,8 +194,31 @@ public class TaskDetailAddQQAct extends AbsChooseImageActivity {
     }
 
     @Override
-    protected void onSetNetImageUrl(String url) {
-
+    protected void onSetNetImageUrl(final String url) {
+        setLoaddingText("更新中");
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("ext", url);
+        SheepApp.getInstance().getNetComponent().getApiService().newbieTaskAddQq(jsonObject)
+                        .subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe(new SheepSubscriber<BaseMessage>(getApplicationContext()) {
+                            @Override
+                            public void onNext(BaseMessage baseMessage) {
+                                if(BuildConfig.DEBUG)
+                                    System.out.println("baseMessage onNext "+JSON.toJSONString(baseMessage));
+                                setLoaddingText("完成");
+                                onGetNetImageUrl(url);
+                                dismissLoaddingDialog();
+                            }
+
+                            @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());
+                                updateError("失败");
+                            }
+                        });
     }
 
     @Override

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

@@ -47,6 +47,7 @@ import com.sheep.gamegroup.view.dialog.DialogShowLoading;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.base.AbsChooseImageActivity;
 import com.sheep.jiuyan.samllsheep.page.WebActivity;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
@@ -71,7 +72,7 @@ import rx.schedulers.Schedulers;
  * Created by realicing on 2018/4/26.
  */
 
-public class TaskDetailCreditCardAct extends BaseActivity implements UpFileListener {
+public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
 
     @BindView(R.id.icon_iv)
     ImageView iconIv;
@@ -96,25 +97,6 @@ public class TaskDetailCreditCardAct extends BaseActivity implements UpFileListe
     private Activity activity;
 
     private TaskEty taskEty;
-    private DialogShowLoading dialogShowLoading;
-
-    /**
-     * 上传进度
-     */
-    private boolean isUpload = true;
-    public void showChooseDialog() {
-        showChooseDialog(true, true);
-    }
-
-    public void showChooseDialog(boolean isCrop, boolean isUpload) {
-        this.isUpload = isUpload;
-        PhotoPicker.builder()
-                .setPhotoCount(1)
-                .setShowCamera(true)
-                .setShowGif(false)
-                .setPreviewEnabled(false)
-                .start(this, PhotoPicker.REQUEST_CODE);
-    }
 
     @Override
     protected int getLayoutId() {
@@ -254,7 +236,7 @@ public class TaskDetailCreditCardAct extends BaseActivity implements UpFileListe
                         });
                 break;
             case R.id.btn_up_imag:
-                uploadImag();
+                showChooseDialog(false, true, DEFAULT_MAX_COUNT);
                 UMConfigUtils.onEvent(UMConfigUtils.Event.TASK_UPLOAD_PICTURE);
                 break;
         }
@@ -310,93 +292,16 @@ public class TaskDetailCreditCardAct extends BaseActivity implements UpFileListe
         return view;
     }
 
-    /**
-     * update file
-     */
-    private void uploadImag() {
-//        Intent intent = new Intent(Intent.ACTION_PICK,
-//                android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
-        Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
-        startActivityForResult(intent, 1);
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-
-        //获取图片路径
-        if (requestCode == 1 && resultCode == Activity.RESULT_OK && data != null) {
-            Uri selectedImage = data.getData();
-            String[] filePathColumns = {MediaStore.Images.Media.DATA};
-            Cursor c = getContentResolver().query(selectedImage, filePathColumns, null, null, null);
-            c.moveToFirst();
-            int columnIndex = c.getColumnIndex(filePathColumns[0]);
-            String imagePath = c.getString(columnIndex);
-            if (isUpload) {
-                dialogShowLoading = DialogShowLoading.showDialog(activity);
-                UpFileUtils.upImage(new File(imagePath), TaskDetailCreditCardAct.this);
-           }
-            c.close();
-        }
-    }
 
     public void taskStatusSuccess(BaseMessage baseMessage) {
-        dialogShowLoading.getTextView().setText("完成");
-//                            onGetNetImageUrl(data);
-        dialogShowLoading.getAlertDialog().dismiss();
+        setLoaddingText("完成");
+        dismissLoaddingDialog();
         G.showToast("提交成功，等待审核!");
         EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.ONFRESH_TRYMAKEMANY_PAGE));
         UMConfigUtils.finishTask();
         finish();
     }
 
-    public void taskStatusFaile(BaseMessage baseMessage) {
-        updateError("失败");
-        G.showToast(baseMessage.getMsg()+"");
-
-    }
-
-    @Override
-    public void Success(String msg, int index) {
-        String json;
-        if (TextUtils.isEmpty(msg)) {
-            updateError("失败");
-            return;
-        }
-        if (msg.startsWith("{")) {
-            json = msg;
-        } else {
-            try {
-                byte[] bytes = HexUtils.hexStr2Bytes(msg);
-                byte[] byteDecode = Kfzssafe.XByteDecode(bytes);
-                json = new String(byteDecode);
-            } catch (Exception e) {
-                e.printStackTrace();
-                updateError("失败");
-                return;
-            }
-        }
-        UploadResult uploadResult = JSON.parseObject(json, UploadResult.class);
-        if (uploadResult != null) {
-            final String data = uploadResult.getData().getUrl();
-            dialogShowLoading.getTextView().setText("提交中");
-            JSONObject jsonObject = new JSONObject();
-            jsonObject.put("id", taskEty.getAcceptedTaskId());
-            jsonObject.put("screenshots",data+"");
-            jsonObject.put("remark",taskEty.getRemarks()+"");
-            jsonObject.put("package_name",taskEty.getPackage_names()+"");
-            jsonObject.put("status",7+"");
-            taskStatus(jsonObject);
-            taskEty.setScreenshots(data);
-//            try{
-//                MyDbManager.getInstance()
-//                        .saveOrUpdateUser(taskEty);
-//            }catch (Exception e){
-//                e.printStackTrace();
-//            }
-        }
-    }
-
     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"))
@@ -405,7 +310,8 @@ public class TaskDetailCreditCardAct extends BaseActivity implements UpFileListe
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        taskStatusFaile(baseMessage);
+                        G.showToast(TextUtils.isEmpty(baseMessage.getMsg()) ? "服务器错误，请稍候再试" : baseMessage.getMsg());
+                        updateError("失败");
                     }
 
                     @Override
@@ -414,21 +320,37 @@ public class TaskDetailCreditCardAct extends BaseActivity implements UpFileListe
                     }
                 });
     }
-    private void updateError(String msg) {
-        dialogShowLoading.getTextView().setText(msg);
-//        onNotGetImage(msg);
-        dialogShowLoading.getAlertDialog().dismiss();
+
+    @Override
+    public void Failure(String err) {
+        G.showToast(err);
     }
 
     @Override
-    public void Progress(String progress, int index) {
-        dialogShowLoading.getTextView().setText(progress);
-        dialogShowLoading.getTextView().append("%");
+    protected void onNotGetImage(String msg) {
 
     }
 
     @Override
-    public void Failure(String err) {
-        G.showToast(err);
+    protected void onGetImage(String path) {
+
+    }
+
+    @Override
+    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);
+        taskEty.setScreenshots(url);
+    }
+
+    @Override
+    protected void onGetNetImageUrl(String url) {
+
     }
 }

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

@@ -38,6 +38,7 @@ public abstract class AbsChooseImageActivity extends BaseActivity implements UpF
     private boolean isCrop = true;
     private int photoCount = 1;
     private DialogShowLoading dialogShowLoading;
+    public static final int DEFAULT_MAX_COUNT = 7;//上传任务截图的最大个数
 
     public void showChooseDialog() {
         showChooseDialog(true, true,1);
@@ -94,8 +95,8 @@ public abstract class AbsChooseImageActivity extends BaseActivity implements UpF
                 notCrop();
         }
     }
-    private ArrayList<String> photos;
-    private String path;
+    protected ArrayList<String> photos;
+    protected String path;
 
     private void notCrop() {
         if(photoCount == 1) {
@@ -105,13 +106,13 @@ public abstract class AbsChooseImageActivity extends BaseActivity implements UpF
                 UpFileUtils.upImage(new File(path), AbsChooseImageActivity.this);
             }
         } else if(photos != null && !photos.isEmpty()){
-            StringBuffer stringBuffer = new StringBuffer();
+            StringBuilder sb = new StringBuilder();
             for (int i = 0; i < photos.size(); i++) {
                 if(i != 0)
-                    stringBuffer.append(";");
-                stringBuffer.append(photos.get(i));
+                    sb.append(";");
+                sb.append(photos.get(i));
             }
-            path = stringBuffer.toString();
+            path = sb.toString();
             onGetImage(path);
             if (isUpload) {
                 AbsChooseImageActivity.this.dialogShowLoading = DialogShowLoading.showDialog(AbsChooseImageActivity.this);
@@ -122,10 +123,17 @@ public abstract class AbsChooseImageActivity extends BaseActivity implements UpF
         }
     }
 
-    private List<String> urls = new ArrayList<>();
+    protected List<String> urls = new ArrayList<>();
     @Override
     public void Success(String msg, int index) {
-        if(index == -1) {
+        if(index == -1 && !urls.isEmpty()) {//多图
+            StringBuilder sb = new StringBuilder();
+            for (int i = 0; i < urls.size(); i++) {
+                if(i != 0)
+                    sb.append(";");
+                sb.append(urls.get(i));
+            }
+            onSetNetImageUrl(sb.toString());
         } else {
             final String data = parseMsg(msg);
 
@@ -181,6 +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());
     }
 
     @Override

gradle.properties

@@ -17,8 +17,8 @@
 # org.gradle.parallel=true
 #android.injected.build.model.only.versioned = 3
 
-VERSION_NAME=2.1.0
-VERSION_CODE=2001000
+VERSION_NAME=2.2.0
+VERSION_CODE=2002000
 ANDROID_COMPILE_SDK_VERSION=27
 ANDROID_BUILD_TOOLS_VERSION=27.0.2
 ANDROID_MIN_SDK_VERSION=18