任务详情修改

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

@@ -47,6 +47,7 @@ import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.gamegroup.view.dialog.DialogShowLoading;
 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;
@@ -69,7 +70,7 @@ import me.iwf.photopicker.PhotoPicker;
  * Created by ljy on 2018/4/2.
  */
 
-public class TaskDetailAct extends BaseActivity implements TaskDetailContract.View, UpFileListener {
+public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailContract.View{
 
     @BindView(R.id.icon_iv)
     ImageView iconIv;
@@ -97,27 +98,9 @@ public class TaskDetailAct extends BaseActivity implements TaskDetailContract.Vi
 
     private TaskEty taskEty;
     private TaskAcceptedEty task_accepted_entity;
-    private DialogShowLoading dialogShowLoading;
 
     private int taskId = -1;
 
-    /**
-     * 上传进度
-     */
-    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() {
@@ -258,7 +241,7 @@ public class TaskDetailAct extends BaseActivity implements TaskDetailContract.Vi
                 }
                 break;
             case R.id.btn_up_imag:
-                uploadImag();
+                showChooseDialog(false, true, DEFAULT_MAX_COUNT);
                 UMConfigUtils.onEvent(UMConfigUtils.Event.TASK_UPLOAD_PICTURE);
                 break;
         }
@@ -314,41 +297,13 @@ public class TaskDetailAct extends BaseActivity implements TaskDetailContract.Vi
         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), TaskDetailAct.this);
-           }
-            c.close();
-        }
-    }
 
     @Override
     public void taskStatusSuccess(BaseMessage baseMessage) {
-        dialogShowLoading.getTextView().setText("完成");
+        setLoaddingText("完成");
 //                            onGetNetImageUrl(data);
-        dialogShowLoading.getAlertDialog().dismiss();
+        dismissLoaddingDialog();
         G.showToast("提交成功，等待审核!");
         EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.ONFRESH_TRYMAKEMANY_PAGE));
         UMConfigUtils.finishTask();
@@ -373,61 +328,33 @@ public class TaskDetailAct extends BaseActivity implements TaskDetailContract.Vi
         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+"");
-            presenter.taskStatus(jsonObject);
-            taskEty.setScreenshots(data);
-//            try{
-//                MyDbManager.getInstance()
-//                        .saveOrUpdateUser(taskEty);
-//            }catch (Exception e){
-//                e.printStackTrace();
-//            }
-        }
-    }
-    private void updateError(String msg) {
-        dialogShowLoading.getTextView().setText(msg);
-//        onNotGetImage(msg);
-        dialogShowLoading.getAlertDialog().dismiss();
+    protected void onNotGetImage(String msg) {
+        G.showToast(msg);
+
     }
 
     @Override
-    public void Progress(String progress, int index) {
-        dialogShowLoading.getTextView().setText(progress);
-        dialogShowLoading.getTextView().append("%");
+    protected void onGetImage(String path) {
+
+    }
 
+    @Override
+    protected void onSetNetImageUrl(String data) {
+        setLoaddingText("提交中");
+        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+"");
+        presenter.taskStatus(jsonObject);
+        taskEty.setScreenshots(data);
     }
 
     @Override
-    public void Failure(String err) {
-        G.showToast(err);
+    protected void onGetNetImageUrl(String url) {
+
     }
 }