modift picture topic

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

@@ -19,7 +19,9 @@ import android.widget.EditText;
import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;
import com.blankj.utilcode.util.ToastUtils;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.DataSource;
import com.bumptech.glide.load.engine.GlideException;
@@ -27,17 +29,31 @@ import com.bumptech.glide.request.RequestListener;
import com.bumptech.glide.request.RequestOptions;
import com.bumptech.glide.request.target.Target;
import com.electric.chargingpile.R;
import com.electric.chargingpile.application.MainApplication;
import com.electric.chargingpile.data.AuthSignBean;
import com.electric.chargingpile.data.TalkRecommendBean;
import com.electric.chargingpile.util.BarColorUtil;
import com.electric.chargingpile.util.JsonUtils;
import com.electric.chargingpile.util.ToastUtil;
import com.luck.picture.lib.PictureSelector;
import com.luck.picture.lib.compress.Luban;
import com.luck.picture.lib.config.PictureConfig;
import com.luck.picture.lib.config.PictureMimeType;
import com.luck.picture.lib.entity.LocalMedia;
import com.umeng.analytics.MobclickAgent;
import com.upyun.library.common.UploadEngine;
import com.upyun.library.listener.UpCompleteListener;
import com.upyun.library.listener.UpProgressListener;
import com.zhy.http.okhttp.OkHttpUtils;
import com.zhy.http.okhttp.callback.StringCallback;
import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import okhttp3.Call;
public class PublishTopicActivity extends Activity implements OnClickListener {
    Context mContext;
@@ -59,7 +75,7 @@ public class PublishTopicActivity extends Activity implements OnClickListener {
    public static final String IMAGE_CACHE = CACHE_DIR + "/cache/image/";
    LocalMedia media;
    @Override
    protected void onCreate(Bundle savedInstanceState) {
@@ -126,6 +142,15 @@ public class PublishTopicActivity extends Activity implements OnClickListener {
                finish();
                break;
            case R.id.publishtopic_publish:
                if (media == null) {
                    ToastUtils.showLong("请选择视频！");
                    return;
                }
                if (talkRecommendBean == null) {
                    ToastUtils.showLong("请选择话题！");
                    return;
                }
                getYouPaiData();
                break;
            case R.id.publishtopic_choose_topic:
@@ -167,19 +192,121 @@ public class PublishTopicActivity extends Activity implements OnClickListener {
            case R.id.item_video_delete:
                mItemVideoLl.setVisibility(View.GONE);
                mPublishtopicGv.setVisibility(View.VISIBLE);
                media = null;
                break;
            default:
                break;
        }
    }
    final int reqTopic = -100;
    private void getYouPaiData() {
        String fileNames = media.getPath().substring(media.getPath().lastIndexOf("/") + 1);
        String url = MainApplication.urlNew + "/topic/sign.do";
        Map<String, String> map = new HashMap<>();
        map.put("fileNames", fileNames);
        Log.e("fileNameDir fileName", fileNames);
        map.put("targetType", "23");//23视频/24图片
        OkHttpUtils
                .post()
                .params(map)
                .url(url)
                .build()
                .connTimeOut(6000)
                .readTimeOut(6000)
                .execute(new StringCallback() {
                    @Override
                    public void onError(Call call, Exception e) {
                    }
                    @Override
                    public void onResponse(String response) {
                        String rtnCode = JsonUtils.getKeyResult(response, "code");
                        if ("1000".equals(rtnCode)) {
                            String rtnMsg = JsonUtils.getKeyResult(response, "data");
                            ArrayList<AuthSignBean> signBeans = (ArrayList<AuthSignBean>) JsonUtils.parseToObjectList(rtnMsg, AuthSignBean.class);
                            if (null != signBeans && signBeans.size() > 0) {
                                    String sign = signBeans.get(0).sign;
                                    String policy = signBeans.get(0).policy;
                                    formUpload(media.getPath(), sign, policy);
                            }
                        }
                    }
                });
    }
    /**
     * 表单上传
     *
     * @param SAMPLE_PIC_FILE
     * @param sign
     * @param policyServer
     */
    private void formUpload(String SAMPLE_PIC_FILE, String sign, String policyServer) {
        File temp = new File(SAMPLE_PIC_FILE);
//        //进度回调，可为空
        UpProgressListener progressListener = new UpProgressListener() {
            @Override
            public void onRequestProgress(long bytesWrite, long contentLength) {
            }
        };
        //结束回调，不可为空
        UpCompleteListener completeListener = new UpCompleteListener() {
            @Override
            public void onComplete(boolean isSuccess, String result) {
                if (isSuccess) {
                    requestPublishServer("["+result+"]");
                }
            }
        };
        //表单上传（服务器签名方式）
        UploadEngine.getInstance().formUpload(temp, policyServer, "d1evvideo01", sign, completeListener,
                progressListener);
    }
    private void requestPublishServer(String urls) {
        String url = MainApplication.urlNew + "/topic/publish.do";
        Map<String, String> map = new HashMap<>();
        map.put("content", mPublishtopicCon.getText().toString());
        map.put("urls", urls);
        map.put("topicId", talkRecommendBean.targetId + "");
        if (MainApplication.isLogin()) {
            map.put("userId", MainApplication.userId);
            map.put("appToken", MainApplication.messageToken);
        }
        OkHttpUtils.post().params(map).url(url).build().connTimeOut(6000).readTimeOut(6000).execute(new StringCallback() {
            @Override
            public void onError(Call call, Exception e) {
                ToastUtil.showToast(getApplicationContext(), "发布失败，请重试", Toast.LENGTH_SHORT);
            }
            @Override
            public void onResponse(String response) {
                String rtnCode = JsonUtils.getKeyResult(response, "code");
                if ("1000".equals(rtnCode)) {
                    ToastUtil.showToast(getApplicationContext(), "发布成功", Toast.LENGTH_SHORT);
                } else {
                    String message = JsonUtils.getKeyResult(response, "desc");
                    ToastUtil.showToast(getApplicationContext(), message, Toast.LENGTH_SHORT);
                }
            }
        });
    }
    final int reqTopic = 100;
    TalkRecommendBean talkRecommendBean = null;
    @Override
    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
        if (requestCode == -100 && resultCode == -100) {
        super.onActivityResult(requestCode, resultCode, data);
        if (requestCode == reqTopic && resultCode == -100) {
            talkRecommendBean = (TalkRecommendBean) data.getSerializableExtra("topic");
            if (talkRecommendBean != null) {
                mPublishtopicChooseTopic.setText("# " + talkRecommendBean.name);
@@ -188,7 +315,7 @@ public class PublishTopicActivity extends Activity implements OnClickListener {
        } else if (requestCode == PictureConfig.CHOOSE_REQUEST && resultCode == RESULT_OK) {
            List<LocalMedia> selectList = PictureSelector.obtainMultipleResult(data);
            if (selectList != null && selectList.size() > 0) {
                LocalMedia media = selectList.get(0);
                media = selectList.get(0);
                if (TextUtils.isEmpty(media.getPath())) {
                    return;
                }

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

@@ -21,6 +21,8 @@ import com.electric.chargingpile.gen.DaoMaster;
import com.electric.chargingpile.gen.DaoSession;
import com.electric.chargingpile.manager.ProfileManager;
import com.electric.chargingpile.util.SharedPreferencesHelper;
import com.mabeijianxi.smallvideorecord2.DeviceUtils;
import com.mabeijianxi.smallvideorecord2.JianXiCamera;
import com.mob.MobSDK;
import com.nostra13.universalimageloader.cache.disc.naming.Md5FileNameGenerator;
import com.nostra13.universalimageloader.core.DisplayImageOptions;
@@ -201,7 +203,7 @@ public class MainApplication extends MultiDexApplication {
        loginRemind();
        setFestival();
        initSmallVideo();
    }
    public static MainApplication getInstance() {
@@ -219,11 +221,28 @@ public class MainApplication extends MultiDexApplication {
        return mCurrentCity;
    }
    private static void setSph() {
    /**
     * 视频的初始化
     */
    public static void initSmallVideo() {
        // 设置拍摄视频缓存路径
        File dcim = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM);
        if (DeviceUtils.isZte()) {
            if (dcim.exists()) {
                JianXiCamera.setVideoCachePath(dcim + "/mabeijianxi/");
            } else {
                JianXiCamera.setVideoCachePath(dcim.getPath().replace("/sdcard/",
                        "/sdcard-ext/") + "/mabeijianxi/");
            }
        } else {
            JianXiCamera.setVideoCachePath(dcim + "/mabeijianxi/");
        }
        // 初始化拍摄，遇到问题可选择开启此标记，以方便生成日志
        //JianXiCamera.initialize(false, null);
    }
    public static void initImageLoader(Context context) {
        ImageLoaderConfiguration config = new ImageLoaderConfiguration.Builder(context).threadPoolSize(5).threadPriority(Thread.NORM_PRIORITY - 2).denyCacheImageMultipleSizesInMemory()
                .discCacheFileNameGenerator(new Md5FileNameGenerator()).discCacheSize(50 * 1024 * 1024).memoryCacheSize(5 * 1024 * 1024).build();

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

@@ -49,7 +49,6 @@
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:orientation="vertical"
            android:layout_marginBottom="50dp"
            android:padding="15dp">
            <EditText
@@ -72,17 +71,17 @@
            <RelativeLayout
                android:id="@+id/item_video_ll"
                android:visibility="gone"
                android:layout_marginBottom="20dp"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content">
                android:layout_height="wrap_content"
                android:layout_marginBottom="100dp"
                android:visibility="gone">
                <ImageView
                    android:id="@+id/item_video"
                    android:layout_width="wrap_content"
                    android:minHeight="220dp"
                    android:layout_height="wrap_content"
                    android:minWidth="206dp"
                    android:layout_height="wrap_content"   />
                    android:minHeight="220dp" />
                <View
                    android:layout_width="40dp"

videolibrary/picture_library/src/main/java/com/luck/picture/lib/PictureEditAudioActivity.java

@@ -63,9 +63,9 @@ import static com.luck.picture.lib.tools.Constant.VIDEO_LENGTH_BYTE;
 */
public class PictureEditAudioActivity extends PictureBaseActivity implements View.OnClickListener {
    private static final long MIN_CUT_DURATION = 1000L;// 最小剪辑时间1s
    private static final long MIN_CUT_DURATION = 1500L;// 最小剪辑时间1s
    private static final long MAX_CUT_DURATION = 15 * 1000L;//视频最多剪切多长时间
    private static final int MAX_COUNT_RANGE = 10;//seekBar的区域内一共有多少张图片
    private static final int MAX_COUNT_RANGE = 15;//seekBar的区域内一共有多少张图片
    private static final String TAG = PictureEditAudioActivity.class.getSimpleName();
@@ -427,28 +427,6 @@ public class PictureEditAudioActivity extends PictureBaseActivity implements Vie
                Log.e(TAG, "TANHQ===> ffmpeg裁剪 花时间： " + (System.currentTimeMillis() - startCropTime)
                        + ",  getVideoPath() = " + onlyCompressOverBean.getVideoPath());
//                startCompressTime = System.currentTimeMillis();
//                if (onlyCompressOverBean.getVideoPath() == null || TextUtils.isEmpty(onlyCompressOverBean.getVideoPath())) {
//                    return;
//                }
//                //压缩本地视频
//                LocalMediaConfig.Buidler builder = new LocalMediaConfig.Buidler();
//                LocalMediaConfig config = builder
//                        .setVideoPath(onlyCompressOverBean.getVideoPath())
//                        .captureThumbnailsTime(1)
//                        .doH264Compress(new AutoVBRMode(Constant.AutoVBRMode))
//                        .setFramerate(Constant.FRAMERATE)
//                        .setScale(Constant.SCALE)
//                        .build();
//
//
//                LocalMediaCompress localMediaCompress = new LocalMediaCompress(config);
//                final OnlyCompressOverBean onlyCompressOverBean11 = localMediaCompress.startCompress();
//
//                Log.e(TAG, "TANHQ===> ffmpeg 压缩花时间： " + (System.currentTimeMillis() - startCompressTime));
                runOnUiThread(new Runnable() {
                    @Override
                    public void run() {
@@ -650,6 +628,7 @@ public class PictureEditAudioActivity extends PictureBaseActivity implements Vie
                        .setScale(Constant.SCALE_15)
                        .build();
                LocalMediaCompress localMediaCompress = new LocalMediaCompress(config);
                localMediaCompress.setVideoOriginalWitdhHeight(videoWidth, videoHeight);
                final OnlyCompressOverBean onlyCompressOverBean = localMediaCompress.startCompress();

videolibrary/picture_library/src/main/java/com/luck/picture/lib/PicturePreviewActivity.java

@@ -475,7 +475,7 @@ public class PicturePreviewActivity extends PictureBaseActivity implements View.
            rlSelectBarLayout.setVisibility(View.VISIBLE);
            if (media.getDuration() > 10 * 1000) {
            if (media.getDuration() > 15 * 1000) {
                video_layout.setVisibility(View.GONE);
                video_layout10.setVisibility(View.VISIBLE);

videolibrary/picture_library/src/main/res/layout/activity_picture_edit_audio.xml

@@ -47,7 +47,7 @@
            android:orientation="horizontal">
            <View
                android:layout_width="35dp"
                android:layout_width="25dp"
                android:layout_height="match_parent"
                android:background="#66000000" />
@@ -60,7 +60,7 @@
                android:orientation="vertical" />
            <View
                android:layout_width="35dp"
                android:layout_width="25dp"
                android:layout_height="match_parent"
                android:background="#66000000" />
        </LinearLayout>