视频上传修改完成

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

@@ -919,9 +919,8 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
    private void requestPublishServer(String urls) {
        String url = MainApplication.urlNew + "/topic/publish.do";
        Map<String, String> map = new HashMap<>();
        map.put("content", et_context.getText().toString());
        map.put("content", et_context.getText().toString().trim());
        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 + "");
        }

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

@@ -34,13 +34,17 @@ import com.electric.chargingpile.data.AuthSignBean;
import com.electric.chargingpile.data.ChatRecommendBean;
import com.electric.chargingpile.data.PublishItemSerializable;
import com.electric.chargingpile.data.TalkRecommendBean;
import com.electric.chargingpile.data.VideoUploadResult;
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.JsonUtils;
import com.electric.chargingpile.util.LoadingDialog;
import com.electric.chargingpile.util.ToastUtil;
import com.electric.chargingpile.util.Util;
import com.luck.picture.lib.PictureSelector;
import com.luck.picture.lib.compress.Luban;
import com.luck.picture.lib.config.PictureConfig;
@@ -59,6 +63,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import cn.jpush.android.api.JPushInterface;
import okhttp3.Call;
public class PublishVideoTopicActivity extends Activity implements OnClickListener {
@@ -230,11 +235,13 @@ public class PublishVideoTopicActivity extends Activity implements OnClickListen
    }
    private void getYouPaiData() {
        String fileNames = media.getPath().substring(media.getPath().lastIndexOf("/") + 1);
        String url = MainApplication.urlNew + "/topic/sign.do";
        if (TextUtils.isEmpty(media.fName)) {
            ToastUtil.showToast(getApplicationContext(), "请重新选择视频", Toast.LENGTH_SHORT);
            return;
        }
        Map<String, String> map = new HashMap<>();
        map.put("fileNames", fileNames);
        Log.e("fileNameDir fileName", fileNames);
        map.put("fileNames", media.fName);
        map.put("targetType", ChatRecommendBean.TARGET_TYPE_VIDEO + "");
        CommonParams.addCommonParams(map);
@@ -287,7 +294,8 @@ public class PublishVideoTopicActivity extends Activity implements OnClickListen
            @Override
            public void onComplete(boolean isSuccess, String result) {
                if (isSuccess) {
                    requestPublishServer("[" + result + "]");
                    VideoUploadResult videoUploadResult = new VideoUploadResult(result);
                    requestPublishServer("[" + videoUploadResult.formatResult() + "]");
                } else {
                    ToastUtil.showToast(getApplicationContext(), "发布失败，请重试", Toast.LENGTH_SHORT);
                    uploadDialog.dismiss();
@@ -302,24 +310,15 @@ public class PublishVideoTopicActivity extends Activity implements OnClickListen
    }
    private void requestPublishServer(String urls) {
        File file = new File(media.getPath());
        long size = 0L;
        if (file.exists()) {
            size = file.length();
        }
        String url = MainApplication.urlNew + "/topic/publish.do";
        Map<String, String> map = new HashMap<>();
        map.put("content", mPublishtopicCon.getText().toString().trim());
        map.put("urls", urls);
        map.put("urls", Base64.encode(urls.getBytes()).replaceAll("\\s*", ""));
        if (chatRecommendBean != null) {
            map.put("topicId", chatRecommendBean.topicId + "");
        }
        map.put("targetType", ChatRecommendBean.TARGET_TYPE_VIDEO + "");
        map.put("coverImgW", media.getWidth() + "");
        map.put("coverImgH", media.getHeight() + "");
        map.put("duration", media.getDuration() + "");
        map.put("size", size + "");
        CommonParams.addCommonParams(map);
        OkHttpUtils.post().params(map).url(url).build().connTimeOut(6000).readTimeOut(6000).execute(new StringCallback() {
@@ -365,9 +364,26 @@ public class PublishVideoTopicActivity extends Activity implements OnClickListen
            List<LocalMedia> selectList = PictureSelector.obtainMultipleResult(data);
            if (selectList != null && selectList.size() > 0) {
                media = selectList.get(0);
                String deviceId = JPushInterface.getUdid(MainApplication.context);
                media.fName = DateUtils.getSimpleCurrentDate();
                if (TextUtils.isEmpty(deviceId)) {
                    media.fName += "_" + Util.getRandom(15);
                } else {
                    media.fName += "_" + deviceId;
                }
                String path = media.getPath();
                if (TextUtils.isEmpty(path)) {
                    media.fName = "";
                } else {
                    String suffix = path.substring(path.lastIndexOf(".") + 1);
                    media.fName += "." + suffix;
                }
                if (TextUtils.isEmpty(media.getPath())) {
                    return;
                }
                if (!fileIsExists(media.getPath())) {
                    Log.e("yopic", "文件可能不存在了~");
                    return;

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

@@ -0,0 +1,32 @@
package com.electric.chargingpile.data;
import com.electric.chargingpile.util.JsonUtils;
import com.google.gson.Gson;
import java.util.HashMap;
import java.util.Map;
public class VideoUploadResult {
    private String result;
    public VideoUploadResult(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("mimetype"));
        resultMap.put("size", map.get("file_size"));
        resultMap.put("url", map.get("url"));
        resultMap.put("w", "0");
        resultMap.put("h", "0");
        resultMap.put("duration", "0");
        return JsonUtils.mapToJson(resultMap);
    }
}

videolibrary/picture_library/src/main/java/com/luck/picture/lib/entity/LocalMedia.java

@@ -25,6 +25,7 @@ public class LocalMedia implements Serializable {
    private boolean compressed;
    private int width;
    private int height;
    public String fName;
    public LocalMedia() {