问题描述修改完成

app/src/main/java/com/electric/chargingpile/activity/EditQuestionTwoActivity.java

@@ -7,6 +7,7 @@ import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Matrix;
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
@@ -28,6 +29,7 @@ import com.electric.chargingpile.R;
import com.electric.chargingpile.application.MainApplication;
import com.electric.chargingpile.util.AndroidBug5497Workaround;
import com.electric.chargingpile.util.BarColorUtil;
import com.electric.chargingpile.util.FileUtils;
import com.electric.chargingpile.util.ImageUitl;
import com.electric.chargingpile.util.JsonUtils;
import com.electric.chargingpile.util.ScreenUtils;
@@ -86,6 +88,7 @@ public class EditQuestionTwoActivity extends AppCompatActivity implements View.O
    public static android.view.animation.Animation animation;
    private static final int RC_ALBUM_PERM = 123;
    public static final int REQUEST_CODE_CHOOSE = 339;
    private Bitmap insertBitmap;
    @Override
    protected void onCreate(Bundle savedInstanceState) {
@@ -351,22 +354,18 @@ public class EditQuestionTwoActivity extends AppCompatActivity implements View.O
                try {
                    et_new_content.measure(0, 0);
                    int width = ScreenUtils.getScreenWidth(EditQuestionTwoActivity.this);
                    int height = ScreenUtils.getScreenHeight(EditQuestionTwoActivity.this);
                    ArrayList<String> photos = data.getStringArrayListExtra(PhotoPicker.KEY_SELECTED_PHOTOS);
                    //可以同时插入多张图片
                    for (String imagePath : photos) {
                        Bitmap bitmap = ImageUitl.getSmallBitmap(imagePath, width, height);//压缩图片
                        if (com.electric.chargingpile.util.ImageUtils.readPictureDegree(imagePath) != 0) {
                            bitmap = imageZoom(com.electric.chargingpile.util.ImageUtils.toturn(bitmap));
                        } else {
                            bitmap = imageZoom(bitmap);
                        }
                        c_path = imagePath;
                        imagePath = SDCardUtil.saveToSdCard(bitmap);
                        u_path = imagePath;
                        subscriber.onNext(imagePath);
                    }
                    List<Uri> uriList = Matisse.obtainResult(data);
                    Uri uri = uriList.get(0);
                    Bitmap bitmap = BitmapFactory.decodeStream(getContentResolver().openInputStream(uri));
                    File file = FileUtils.from(EditQuestionTwoActivity.this, uri);
                    bitmap = FileUtils.rotateIfRequired(file, bitmap);
                    bitmap = imageZoom(bitmap);
                    insertBitmap = bitmap;
                    u_path = SDCardUtil.saveToSdCard(bitmap);
                    subscriber.onNext(u_path);
                    subscriber.onComplete();
                } catch (Exception e) {
                    e.printStackTrace();
@@ -380,7 +379,8 @@ public class EditQuestionTwoActivity extends AppCompatActivity implements View.O
                    @Override
                    public void onComplete() {
                        insertDialog.dismiss();
                        compressAndUpload(c_path, u_path);
//                        compressAndUpload(c_path, u_path);
                        uploadPic(insertBitmap, u_path);
                    }
                    @Override
@@ -461,6 +461,34 @@ public class EditQuestionTwoActivity extends AppCompatActivity implements View.O
    }
    private void uploadPic(Bitmap bitmap, final String path) {
        String url = MainApplication.url + "/zhannew/basic/web/index.php/fileupload/uploadone";
        OkHttpUtils.post().url(url).
                addParams("file", FileUtils.bitmapToString(bitmap)).
                addParams("filename", "android.jpg").
                addParams("id", creat_id)
                .build().execute(new StringCallback() {
            @Override
            public void onError(Call call, Exception e) {
                e.printStackTrace();
            }
            @Override
            public void onResponse(String response) {
                loadingDialog.dismiss();
                String rtnCode = JsonUtils.getKeyResult(response, "rtnCode");
                if ("01".equals(rtnCode)) {
                    String fileUrl = JsonUtils.getKeyResult(response, "fileUrl");
                    map.put(path, fileUrl);
                    et_new_content.addEditTextAtIndex(et_new_content.getLastIndex(), " ");
                    ToastUtil.showToast(getApplicationContext(), "图片插入成功", Toast.LENGTH_SHORT);
                } else {
                    ToastUtil.showToast(getApplicationContext(), "图片插入失败", Toast.LENGTH_SHORT);
                }
            }
        });
    }
    @Override
    public void onClick(View v) {
        switch (v.getId()) {