图片上传修改

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

@@ -687,8 +687,12 @@ public class ChatContentListActivity extends AppCompatActivity {
                        .transform(new CircleTransform())
                        .into(headImage);
            }
            if (TextUtils.isEmpty(bean.carSeriesName)) {
                nickName.setText(bean.nickName);
            } else {
                nickName.setText(bean.nickName + " " + bean.carSeriesName);
            }
            nickName.setText(bean.nickName + " " + bean.carSeriesName);
            addDate.setText(bean.addDate);

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

@@ -49,12 +49,15 @@ import com.electric.chargingpile.R;
import com.electric.chargingpile.application.MainApplication;
import com.electric.chargingpile.data.AuthSignBean;
import com.electric.chargingpile.data.ChatRecommendBean;
import com.electric.chargingpile.data.PhotoUploadResult;
import com.electric.chargingpile.data.PublishItemSerializable;
import com.electric.chargingpile.data.UploadPic;
import com.electric.chargingpile.manager.ProfileManager;
import com.electric.chargingpile.util.BarColorUtil;
import com.electric.chargingpile.util.Base64;
import com.electric.chargingpile.util.Bimp;
import com.electric.chargingpile.util.CommonParams;
import com.electric.chargingpile.util.DateUtils;
import com.electric.chargingpile.util.DensityUtil;
import com.electric.chargingpile.util.ImageItem;
import com.electric.chargingpile.util.JsonUtils;
@@ -62,6 +65,8 @@ import com.electric.chargingpile.util.LoadingDialog;
import com.electric.chargingpile.util.PublicWay;
import com.electric.chargingpile.util.Res;
import com.electric.chargingpile.util.ToastUtil;
import com.electric.chargingpile.util.Util;
import com.google.gson.Gson;
import com.luck.picture.lib.tools.ScreenUtils;
import com.umeng.analytics.MobclickAgent;
import com.upyun.library.common.ParallelUploader;
@@ -79,6 +84,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import cn.jpush.android.api.JPushInterface;
import io.reactivex.Observable;
import io.reactivex.ObservableEmitter;
import io.reactivex.ObservableOnSubscribe;
@@ -281,12 +287,14 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
            return;
        String fileNames = "";
        for (int i = 0; i < Bimp.tempSelectBitmap.size(); i++) {
            String fileNameDir = Bimp.tempSelectBitmap.get(i).getImagePath();
            String fileName = fileNameDir.substring(fileNameDir.lastIndexOf("/") + 1);
            ImageItem imageItem = Bimp.tempSelectBitmap.get(i);
//            String fileNameDir = Bimp.tempSelectBitmap.get(i).getImagePath();
//            String fileName = fileNameDir.substring(fileNameDir.lastIndexOf("/") + 1);
            if (TextUtils.isEmpty(fileNames)) {
                fileNames = fileName;
                fileNames = imageItem.fName;
            } else {
                fileNames += "," + fileName;
                fileNames += "," + imageItem.fName;
            }
        }
@@ -294,7 +302,6 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
        Map<String, String> map = new HashMap<>();
        map.put("fileNames", fileNames);
        map.put("targetType", ChatRecommendBean.TARGET_TYPE_IMAGE_TEXT + "");
        map.put("appToken", ProfileManager.getInstance().getKeyMessageToken(getApplicationContext()));
        CommonParams.addCommonParams(map);
        OkHttpUtils.post().params(map).url(url).build().connTimeOut(6000).readTimeOut(6000).execute(new StringCallback() {
            @Override
@@ -531,14 +538,28 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
                try {
                    ArrayList<String> photos = data.getStringArrayListExtra(PhotoPicker.KEY_SELECTED_PHOTOS);
                    //可以同时插入多张图片
                    int i = 0;
                    for (String imagePath : photos) {
                        i++;
                        Log.e(TAG, "call: imagePath " + imagePath);
                        Bitmap bitmap = BitmapFactory.decodeFile(imagePath);//压缩图片
                        bitmap = imageZoom(bitmap);
                        ImageItem takePhoto = new ImageItem();
                        String deviceId = JPushInterface.getUdid(MainApplication.context);
                        takePhoto.fName = DateUtils.getSimpleCurrentDate();
                        if (TextUtils.isEmpty(deviceId)) {
                            takePhoto.fName += "_" + Util.getRandom(15);
                        } else {
                            takePhoto.fName += "_" + deviceId;
                        }
                        takePhoto.fName += "_00" + i;
                        String suffix = imagePath.substring(imagePath.lastIndexOf(".") + 1);
                        takePhoto.fName += "." + suffix;
                        takePhoto.setBitmap(bitmap);
                        takePhoto.setImagePath(imagePath);
                        Bimp.tempSelectBitmap.add(takePhoto);
                        subscriber.onNext(imagePath);
                    }
@@ -851,6 +872,7 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
     */
    private void formUpload(String SAMPLE_PIC_FILE, String sign, String policyServer) {
        File temp = new File(SAMPLE_PIC_FILE);
//        //进度回调，可为空
        UpProgressListener progressListener = new UpProgressListener() {
            @Override
@@ -868,9 +890,12 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
            @Override
            public void onComplete(boolean isSuccess, String result) {
//                tv_form.setText(isSuccess + ":" + result);
                Log.e(TAG, isSuccess + ":" + result);
                if (isSuccess)
                    publishArray.add(result);
                Log.e(TAG, isSuccess + result);
                if (isSuccess) {
                    PhotoUploadResult photoUploadResult = new PhotoUploadResult(result);
                    publishArray.add(photoUploadResult.formatResult());
                }
                if (publishCount == publishArray.size()) {
                    String urls = "";
                    for (int i = 0; i < publishArray.size(); i++) {
@@ -895,12 +920,12 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
        String url = MainApplication.urlNew + "/topic/publish.do";
        Map<String, String> map = new HashMap<>();
        map.put("content", et_context.getText().toString());
        map.put("urls", urls);
        map.put("urls", Base64.encode(urls.getBytes()).replaceAll("\\s*", ""));
        Log.d(TAG, "requestPublishServer: " + Base64.encode(urls.getBytes()).replaceAll("\\s*", ""));
        if (chatRecommendBean != null) {
            map.put("topicId", chatRecommendBean.topicId + "");
        }
        map.put("targetType", ChatRecommendBean.TARGET_TYPE_IMAGE_TEXT + "");
        map.put("coverImgUrl", "");
        CommonParams.addCommonParams(map);
        OkHttpUtils.post().params(map).url(url).build().connTimeOut(6000).readTimeOut(6000).execute(new StringCallback() {

app/src/main/java/com/electric/chargingpile/application/MainApplication.java

@@ -73,10 +73,10 @@ public class MainApplication extends MultiDexApplication {
    public static String firstPoint = "";
    public static Boolean firstSsyd;
    public static String password = "";
//    public static String url = "http://59.110.68.162";// 充电桩测试环境
    public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
//    public static String urlNew = "http://123.56.67.7:83/api/0200";// 一电测试环境
    public static String urlNew = "https://api.touchev.com:83/api/0200";// 一电正式环境
    public static String url = "http://59.110.68.162";// 充电桩测试环境
//    public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
    public static String urlNew = "http://123.56.67.7:83/api/0300";// 一电测试环境
//    public static String urlNew = "https://api.touchev.com:83/api/0200";// 一电正式环境
    public static String pic_url = "http://cdz.evcharge.cc/zhannew/uploadfile/";
    //	public static String url = "https://cdz.d1ev.com";
    public static String build_flag = "0";

app/src/main/java/com/electric/chargingpile/data/PhotoUploadResult.java

@@ -0,0 +1,35 @@
package com.electric.chargingpile.data;
import android.util.Log;
import com.electric.chargingpile.util.JsonUtils;
import com.google.gson.Gson;
import java.util.HashMap;
import java.util.Map;
public class PhotoUploadResult {
    private static final String TAG = "PhotoUploadResult";
    private String result;
    public PhotoUploadResult(String result) {
        this.result = result;
    }
    public String formatResult() {
        Gson gson = new Gson();
        Map<String, Object> map = new HashMap<>();
        map = gson.fromJson(result, map.getClass());
        Map<String, Object> resultMap = new HashMap<>();
        resultMap.put("type", map.get("image-type"));
        resultMap.put("size", map.get("file_size"));
        resultMap.put("w", map.get("image-width"));
        resultMap.put("h", map.get("image-height"));
        resultMap.put("url", map.get("url"));
        resultMap.put("frames", map.get("image-frames"));
        return JsonUtils.mapToJson(resultMap);
    }
}

app/src/main/java/com/electric/chargingpile/fragment/ChatPhotoFragment.java

@@ -3,7 +3,10 @@ package com.electric.chargingpile.fragment;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.util.Log;
import android.view.DragEvent;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
@@ -11,6 +14,7 @@ import com.electric.chargingpile.R;
import com.squareup.picasso.Picasso;
import uk.co.senab.photoview.PhotoView;
import uk.co.senab.photoview.PhotoViewAttacher;
public class ChatPhotoFragment extends Fragment {
    private static final String TAG = "ChatPhotoFragment";

app/src/main/java/com/electric/chargingpile/util/DateUtils.java

@@ -22,6 +22,12 @@ public class DateUtils {
        return sf.format(d);
    }
    public static String getSimpleCurrentDate() {
        Date d = new Date();
        sf = new SimpleDateFormat("yyyyMMddHHmmss");
        return sf.format(d);
    }
    /*时间戳转换成字符窜*/
    public static String getDateToString(long time) {
        Date d = new Date(time);

app/src/main/java/com/electric/chargingpile/util/ImageItem.java

@@ -11,6 +11,7 @@ public class ImageItem implements Serializable {
    public String thumbnailPath;
    public String imagePath;
    private Bitmap bitmap;
    public String fName = "";
    public boolean isSelected = false;
    public String getImageId() {

app/src/main/java/com/electric/chargingpile/util/Util.java

@@ -21,6 +21,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Random;
public class Util {
    private static final String PHONE_PATTERN = "[1]{1}[3,4,5,6,7,8,9]{1}[0-9]{9}";
@@ -49,6 +50,15 @@ public class Util {
    }
    public static String getRandom(int length) {
        String val  = "";
        Random random = new Random();
        for (int i=0;i<length;i++) {
            val += String.valueOf(random.nextInt(10));
        }
        return val;
    }
    public static String getPhone(Context context) {
        return ProfileManager.getInstance().getUsername(context);

app/src/main/res/layout/fragment_chat_content_pictures.xml

@@ -8,7 +8,7 @@
    <com.electric.chargingpile.iview.ChatPhotoViewPager
        android:id="@+id/photoPager"
        android:layout_width="match_parent"
        android:layout_width="0dp"
        android:layout_height="0dp"
        app:layout_constraintBottom_toTopOf="@+id/bottomView"
        app:layout_constraintLeft_toLeftOf="parent"

app/src/main/res/layout/fragment_chat_photo.xml

@@ -10,7 +10,7 @@
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:adjustViewBounds="true"
    android:scaleType="fitXY"
    android:scaleType="centerCrop"
    app:layout_constraintBottom_toBottomOf="parent"
    app:layout_constraintLeft_toLeftOf="parent"
    app:layout_constraintRight_toRightOf="parent"