add topic

app/build.gradle

@@ -215,8 +215,7 @@ MobSDK {
}
dependencies {
//    compile files('libs/badgeview.jar')
    //    compile files('libs/badgeview.jar')
    compile files('libs/mframework.jar')
    compile files('libs/picasso-2.5.2.jar')
    compile project(':autolayout')
@@ -237,11 +236,11 @@ dependencies {
    compile files('libs/jpush-android_v3.0.6.jar')
    compile files('libs/jcore-android_v1.1.3.jar')
    compile 'com.blankj:utilcode:1.9.8'
//    compile project(':xrichtextt')
    //    compile project(':xrichtextt')
    compile 'com.android.support:multidex:1.0.1'
    compile 'com.umeng.analytics:analytics:latest.integration'
    compile 'com.google.code.gson:gson:2.2.4'
//    compile 'com.squareup.okhttp:okhttp:3.14.0'
    //    compile 'com.squareup.okhttp:okhttp:3.14.0'
    compile 'com.squareup.okhttp:okhttp:2.0.0'
    compile 'com.zhy:okhttputils:2.4.1'
    compile 'com.android.support:support-v4:26.1.0'
@@ -258,7 +257,7 @@ dependencies {
    compile 'com.yinglan.scrolllayout:scrolllayout:1.0.0'
    compile 'com.android.support:appcompat-v7:26.1.0'
    compile 'com.android.support:design:26.1.0'
//    compile 'com.nineoldandroids:library:2.4.0'
    //    compile 'com.nineoldandroids:library:2.4.0'
    compile 'com.github.bumptech.glide:glide:4.1.1'
    compile 'me.iwf.photopicker:PhotoPicker:0.9.12@aar'
    compile 'top.zibin:Luban:1.1.2'
@@ -280,4 +279,5 @@ dependencies {
    compile 'com.github.Aspsine:IRecyclerView:0.0.7'
    compile project(':ijkplayer-java')
    compile 'com.upyun:upyun-android-sdk:+'
//    compile project(':SmallVideoLib2')
}

app/lint.xml

@@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<lint>
</lint>

app/src/main/AndroidManifest.xml

@@ -989,6 +989,7 @@
        <activity
            android:name=".activity.VideoDetaislActivity"
            android:screenOrientation="portrait"
            android:keepScreenOn="true"
            android:windowSoftInputMode="adjustPan" />
        <activity
            android:name=".activity.PublishTopicActivity"

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

@@ -50,7 +50,6 @@ import android.widget.Toast;
import com.electric.chargingpile.R;
import com.electric.chargingpile.application.MainApplication;
import com.electric.chargingpile.data.AuthSignBean;
import com.electric.chargingpile.data.HomePageBean;
import com.electric.chargingpile.data.TalkRecommendBean;
import com.electric.chargingpile.data.UploadPic;
import com.electric.chargingpile.util.BarColorUtil;
@@ -64,11 +63,8 @@ import com.electric.chargingpile.util.ScreenUtils;
import com.electric.chargingpile.util.SystemTypeUtil;
import com.electric.chargingpile.util.ToastUtil;
import com.electric.chargingpile.util.UploadUtil;
import com.electric.chargingpile.view.footer.LoadMoreFooterView;
import com.umeng.analytics.MobclickAgent;
import com.upyun.library.common.ParallelUploader;
import com.upyun.library.common.Params;
import com.upyun.library.common.SerialUploader;
import com.upyun.library.common.UploadEngine;
import com.upyun.library.listener.UpCompleteListener;
import com.upyun.library.listener.UpProgressListener;
@@ -76,10 +72,6 @@ import com.upyun.library.utils.UpYunUtils;
import com.zhy.http.okhttp.OkHttpUtils;
import com.zhy.http.okhttp.callback.StringCallback;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileNotFoundException;
@@ -157,15 +149,13 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
    private TextView publishtopic_choose_topic, mPublishtopicChooseTopic;
    //空间名
    public static String SPACE = "formtest";
    public static String SPACE = "d1evcom01-fs";
    private String policy = "";
    private String OPERATER = "d1evvideo01";
//    private String signature = "CuThEAj+xqwwtPotif1l2dT6P8w=";
    public static String KEY = "GqSu2v26RI+Xu3yLdsWfynTS/LM=";
    @SuppressLint("SdCardPath")
//    private static final String SAMPLE_PIC_FILE = "/mnt/sdcard/tdtest.mp4";
    private ParallelUploader parallelUploader;
//    private SerialUploader serialUploader;
    //    private SerialUploader serialUploader;
    private String picSavePath;
@@ -189,15 +179,14 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
    }
    /**
     *
     * 初始化 又拍云
     * */
     */
    private void initYouPaiYun() {
        //初始化断点续传 (服务端签名可用)
        if(parallelUploader == null){
        if (parallelUploader == null) {
            parallelUploader = new ParallelUploader();
            picSavePath = "/d/file/liaoliao/img/" + SystemTypeUtil.stampToDate(System.currentTimeMillis()+"");
            picSavePath = "/d/file/liaoliao/img/" + SystemTypeUtil.stampToDate(System.currentTimeMillis() + "");
        }
        //图文路径
//        String p = "/d/file/liaoliao/img/" + y + "/" + m + "/" + d;
@@ -308,7 +297,7 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
            String fileNameDir = Bimp.tempSelectBitmap.get(i).getImagePath();
            Log.e("fileNameDir", fileNameDir);
            String fileName = fileNameDir.substring(fileNameDir.lastIndexOf("/")+1);
            String fileName = fileNameDir.substring(fileNameDir.lastIndexOf("/") + 1);
            Log.e("fileNameDir fileName", fileName);
            if (TextUtils.isEmpty(fileNames))
                fileNames = fileName;
@@ -334,17 +323,19 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
                    String rtnMsg = JsonUtils.getKeyResult(response, "data");
                    ArrayList<AuthSignBean> signBeans = (ArrayList<AuthSignBean>) JsonUtils.parseToObjectList(rtnMsg, AuthSignBean.class);
                    if(null != signBeans && signBeans.size()>0){
                        File tempFile =new File(Bimp.tempSelectBitmap.get(0).getImagePath().trim());
                    if (null != signBeans && signBeans.size() > 0) {
                        File tempFile = new File(Bimp.tempSelectBitmap.get(0).getImagePath().trim());
                        String fileName = tempFile.getName();
                        //生产policy传的参数
                        Map<String, Object> map = new HashMap<>();
                        map.put("bucket", "d1evcom01-fs");
                        map.put("expiration", (System.currentTimeMillis()+1800)+"");
                        map.put("save-key", picSavePath+"/"+tempFile.getName());
                        map.put("expiration", (System.currentTimeMillis() + 1800) + "");
                        map.put("save-key", picSavePath + "/" + tempFile.getName());
                        policy = UpYunUtils.getPolicy(map);
                        String sign = signBeans.get(0).sign;
                        formUpload(Bimp.tempSelectBitmap.get(0).getImagePath(),signBeans.get(0).sign, signBeans.get(0).fname);
                        formUpload(Bimp.tempSelectBitmap.get(0).getImagePath(), sign,
                                signBeans.get(0).fname);
                    }
                }
            }
@@ -1025,36 +1016,28 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
    /**
     *
     * 表单上传
     *
     * @param sign
     * @param saveName
     *
     * */
     */
    private void formUpload(String SAMPLE_PIC_FILE, String sign, String saveName) {
        File temp = null;
//        try {
//            temp = getTempFile();
//        } catch (IOException e) {
//            e.printStackTrace();
//        }
        temp = new File(SAMPLE_PIC_FILE);
        final Map<String, Object> paramsMap = new HashMap<>();
        //上传空间
        paramsMap.put(Params.BUCKET, SPACE);
        //保存路径，任选其中一个
        paramsMap.put(Params.SAVE_KEY, picSavePath);
        //添加 CONTENT_LENGTH 参数使用大文件表单上传
        paramsMap.put(Params.CONTENT_LENGTH, temp.length());
        paramsMap.put(Params.CONTENT_MD5, UpYunUtils.md5Hex(temp));
//        paramsMap.put(Params.PATH, savePath);
        //可选参数（详情见api文档介绍）
        paramsMap.put(Params.RETURN_URL, "httpbin.org/post");
        //进度回调，可为空
        File temp = new File(SAMPLE_PIC_FILE);
//
//        final Map<String, Object> paramsMap = new HashMap<>();
//        //上传空间
//        paramsMap.put(Params.BUCKET, SPACE);
//        //保存路径，任选其中一个
//        paramsMap.put(Params.SAVE_KEY, picSavePath);
//        //添加 CONTENT_LENGTH 参数使用大文件表单上传
//        paramsMap.put(Params.CONTENT_LENGTH, temp.length());
//
//
//        paramsMap.put(Params.CONTENT_MD5, UpYunUtils.md5Hex(temp));
////        paramsMap.put(Params.PATH, savePath);
//        //可选参数（详情见api文档介绍）
//        paramsMap.put(Params.RETURN_URL, "httpbin.org/post");
//        //进度回调，可为空
        UpProgressListener progressListener = new UpProgressListener() {
            @Override
            public void onRequestProgress(long bytesWrite, long contentLength) {
@@ -1073,37 +1056,10 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
                Log.e(TAG, isSuccess + ":" + result);
            }
        };
        //初始化JSONArray，上传预处理（异步）参数详见 http://docs.upyun.com/cloud/image/#_6，
        JSONArray array = new JSONArray();
        //初始化JSONObject
        JSONObject json = new JSONObject();
        //json 添加 name 属性
        try {
            json.put("name", "thumb");
            //json 添加 X_GMKERL_THUMB 属性
//            json.put("x-gmkerl-thumb", "/fw/300/unsharp/true/quality/80/format/png");
//            json.put("x-gmkerl-thumb", "/watermark/url/L2dta2VybC5qcGc=/align/center");
            json.put("x-gmkerl-thumb", picSavePath);
            //json 添加 save_as 属性
            json.put("save_as", saveName);
            //json 添加 notify_url 属性
            json.put("notify_url", "http://httpbin.org/post");
        } catch (JSONException e) {
            e.printStackTrace();
        }
        //将json 对象放入 JSONArray
        array.put(json);
        //添加异步作图参数 APPS
        paramsMap.put("apps", array);
        //表单上传（本地签名方式）
//        UploadEngine.getInstance().formUpload(temp, paramsMap, OPERATER, sign, completeListener, progressListener);
        //表单上传（服务器签名方式）
        UploadEngine.getInstance().formUpload(temp, policy, OPERATER, sign, completeListener, progressListener);
    }
    }
}

app/src/main/java/com/electric/chargingpile/adapter/VideoCommentAdapter.java

@@ -95,6 +95,12 @@ public class VideoCommentAdapter extends RecyclerView.Adapter<VideoCommentAdapte
    public void cleanData() {
    }
    public void addDataSingle(VideoCommentBean qadata) {
        if (qadata != null) {
            dataList.add(qadata);
        }
        notifyDataSetChanged();
    }
    public void addData(List<VideoCommentBean> qadata) {
        if (qadata != null) {

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

@@ -5,9 +5,13 @@ package com.electric.chargingpile.data;
 */
public class VideoCommentBean {
    public int id;
    public long targetId;
    public int targetType;
    public int level;
    public int parentId;
    public int toCommentsId;
    public int platformSource;
    public String userId;
    public String nickNameFromUser;
    public String headImgFromUser;
@@ -15,6 +19,7 @@ public class VideoCommentBean {
    public String nickNameToUser;
    public String headImgToUser;
    public String content;
    public String addDate;
    public int likeNums;
    public int likeFlg;
    public long addTime;

app/src/main/java/com/electric/chargingpile/view/VideoCommentDialog.java

@@ -14,6 +14,7 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.Window;
import android.view.WindowManager;
import android.view.inputmethod.InputMethodManager;
import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.TextView;
@@ -31,7 +32,6 @@ import com.zhy.http.okhttp.callback.StringCallback;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import okhttp3.Call;
@@ -54,6 +54,8 @@ public class VideoCommentDialog extends Dialog implements View.OnClickListener {
        super(context, R.style.bottomDialogStyle);
        this.context = context;
        this.talkRecommendBean = talkRecommendBean;
        imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
    }
@@ -152,17 +154,18 @@ public class VideoCommentDialog extends Dialog implements View.OnClickListener {
            @Override
            public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
            }
            @Override
            public void afterTextChanged(Editable editable) {
                int i2 = editable.length();
                if (i2 > 0) {
                    showCommentPublish.setTextColor(Color.parseColor("#00edb2"));
                } else {
                    showCommentPublish.setTextColor(Color.parseColor("#7E7E7E"));
                }
            }
            @Override
            public void afterTextChanged(Editable editable) {
            }
        });
        videoCommentAdapter = new VideoCommentAdapter(context);
        showCommentLv.setAdapter(videoCommentAdapter);
@@ -205,11 +208,11 @@ public class VideoCommentDialog extends Dialog implements View.OnClickListener {
        map.put("toUserId", toUserId);
        map.put("parentId", parentId);
        map.put("level", level + "");
        map.put("toCommentIds", toCommentIds);
        map.put("commentCon", commentCon);
        map.put("toCommentsId", toCommentIds);
        map.put("content", commentCon);
        if (MainApplication.isLogin()) {
            map.put("user_id", MainApplication.userId);
            map.put("userId", MainApplication.userId);
        }
        OkHttpUtils
@@ -231,19 +234,34 @@ public class VideoCommentDialog extends Dialog implements View.OnClickListener {
                        String rtnCode = JsonUtils.getKeyResult(response, "code");
                        if ("1000".equals(rtnCode)) {
                            String rtnMsg = JsonUtils.getKeyResult(response, "data");
                            List<VideoCommentBean> qadata = JsonUtils.parseToObjectList(rtnMsg, VideoCommentBean.class);
                            VideoCommentBean qadata = JsonUtils.parseToObjectBean(rtnMsg, VideoCommentBean.class);
                            showCommentPublish.setText("");
                            hideKeyboard(showCommentPublish);
                            if (videoCommentAdapter != null) {
                                if (qadata.size() > 0) {
                                    showCommentTitle.setText("全部评论 " + qadata.size());
                                } else {
                                    show_comment_no.setVisibility(View.VISIBLE);
                                videoCommentAdapter.addDataSingle(qadata);
                                int count = videoCommentAdapter.getItemCount();
                                if (count > 0) {
                                    showCommentTitle.setText("全部评论 " + count);
                                    show_comment_no.setVisibility(View.GONE);
                                }
                                videoCommentAdapter.addData(qadata);
                            }
                        }
                    }
                });
    }
    InputMethodManager imm;
    public boolean hideKeyboard(View v) {
        if (imm.isActive(v)) {
            //因为是在fragment下，所以用了getView()获取view，也可以用findViewById（）来获取父控件
            getCurrentFocus().requestFocus();//强制获取焦点，不然getActivity().getCurrentFocus().getWindowToken()会报错
            imm.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
            imm.restartInput(v);
            return true;
        }
        return false;
    }
}

settings.gradle

@@ -1 +1,2 @@
include ':app', ':autolayout',   ':zxing', ':XRefreshView',':ijkplayer-java',':library'
include ':app', ':autolayout', ':zxing', ':XRefreshView', ':ijkplayer-java', ':library'
//, ':SmallVideoLib2'