fix bug

app/build.gradle

@@ -32,7 +32,6 @@ android {
        targetSdkVersion 26
        multiDexEnabled true
//        multiDexKeepProguard file('multiDexKeep.pro')
        ndk {
            abiFilters "armeabi"

app/src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="com.electric.chargingpile"
    android:versionCode="74"
    android:versionName="3.2.2beta">
    android:versionName="3.3">
    <!-- 极光 -->
    <permission

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

@@ -40,9 +40,11 @@ import com.zhy.http.okhttp.callback.StringCallback;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import okhttp3.Call;
import tv.danmaku.ijk.media.player.IMediaPlayer;
public class SvVideoShowView implements View.OnClickListener {
@@ -79,19 +81,20 @@ public class SvVideoShowView implements View.OnClickListener {
            if (targetType == 23) {
                view = LayoutInflater.from(activity).inflate(R.layout.view_show_view, null);
                initPlayer(view);
                initBottom(view);
                viewGroup.addView(view);
                setData();
            } else if (targetType == 24) {
                view = LayoutInflater.from(activity).inflate(R.layout.view_show_zoom, null);
                initZoomPhoto(view);
                initBottom(view);
                viewGroup.addView(view);
                setData();
            }
            initBottom(view);
            viewGroup.addView(view);
        }
        getDate();
    }
    public void getDate() {
        setData();
//            requestHeaderData(talkRecommendBean.targetType, talkRecommendBean.targetId);
    }
@@ -135,9 +138,25 @@ public class SvVideoShowView implements View.OnClickListener {
                });
    }
    private String num4(int num) {
        String re = "";
        if (num < 999) {
            re = re + num;
        } else {
            float result = num / 1000;
            int sl = num % 1000;
            if (sl == 0) {
                re = String.format(Locale.CHINESE, "%f", result) + "W";
            } else {
                re = String.format(Locale.CHINESE, "%.1f", result) + "W";
            }
        }
        return re;
    }
    private void setData() {
        sv_show_comment_count_tv.setText(talkRecommendBean.commentNums + "");
        sv_show_like_tv.setText(talkRecommendBean.likeNums + "");
        sv_show_comment_count_tv.setText(num4(talkRecommendBean.commentNums));
        sv_show_like_tv.setText(num4(talkRecommendBean.likeNums));
        sv_show_tvcon.setText(talkRecommendBean.content);
        sv_show_tvcon.setText(talkRecommendBean.title);
        sv_show_user_name.setText(talkRecommendBean.nickName);
@@ -174,8 +193,8 @@ public class SvVideoShowView implements View.OnClickListener {
            // sv_show_like_img  not like
        }
        int length = sv_show_tvcon.length();
        Log.e("length", "setData: length: "+length);
        if (sv_show_tvcon.getLineCount() >= 3 && sv_show_tvcon.getText().length()> 100) {
        Log.e("length", "setData: length: " + length);
        if (sv_show_tvcon.getLineCount() >= 3 && sv_show_tvcon.getText().length() > 100) {
            sv_show_tvcon_more.setVisibility(View.VISIBLE);
        } else {
            sv_show_tvcon_more.setVisibility(View.GONE);
@@ -262,6 +281,18 @@ public class SvVideoShowView implements View.OnClickListener {
    private void initPlayer(View view) {
        playIcon = view.findViewById(R.id.view_show_icon);
        upVideoView2 = view.findViewById(R.id.view_show_video);
        upVideoView2.setOnPreparedListener(new IMediaPlayer.OnPreparedListener() {
            @Override
            public void onPrepared(IMediaPlayer mp) {
                int videoWidth = mp.getVideoWidth();
                int videoHeight = mp.getVideoHeight();
                if (videoHeight > videoWidth) {
                    upVideoView2.setAspectRatio(1);
                } else {
                    upVideoView2.setAspectRatio(0);
                }
            }
        });
        upVideoView2.setOnTouchListener(new View.OnTouchListener() {
            @Override
            public boolean onTouch(View view, MotionEvent motionEvent) {
@@ -365,18 +396,23 @@ public class SvVideoShowView implements View.OnClickListener {
            case NETWORK_2G:
            case NETWORK_3G:
            case NETWORK_4G:
                playIcon.setVisibility(View.VISIBLE);
                new AlertDialog(activity)
                        .builder()
                        .setMsg("您当前使用的是流量，是否播放视频？")
                        .setPositiveButton("确定", new View.OnClickListener() {
                            @Override
                            public void onClick(View view) {
                                playIcon.setVisibility(View.GONE);
                                upVideoView2.start();
                            }
                        })
                        .setNegativeButton("取消", null);
                break;
            default:
                playIcon.setVisibility(View.GONE);
                upVideoView2.start();
                break;
        }
@@ -453,18 +489,8 @@ public class SvVideoShowView implements View.OnClickListener {
    public void onResume(String url) {
        if (upVideoView2 != null) {
//            pauseTime=0;
//            if (status==STATUS_PLAYING) {
//                if (isLive) {
//                    videoView.seekTo(0);
//                } else {
//                    if (currentPosition>0) {
//                        videoView.seekTo(currentPosition);
//                    }
//                }
            playIcon.setVisibility(View.GONE);
            upVideoView2.start();
//            } else if (status == STATUS_IDLE) {
//                play(url);
        }
    }

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

@@ -2,6 +2,7 @@ package com.electric.chargingpile.view;
import android.app.Dialog;
import android.content.Context;
import android.content.Intent;
import android.graphics.Color;
import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager;
@@ -21,6 +22,7 @@ import android.widget.TextView;
import android.widget.Toast;
import com.electric.chargingpile.R;
import com.electric.chargingpile.activity.LoginActivity;
import com.electric.chargingpile.adapter.VideoCommentAdapter;
import com.electric.chargingpile.application.MainApplication;
import com.electric.chargingpile.data.TalkRecommendBean;
@@ -181,13 +183,19 @@ public class VideoCommentDialog extends Dialog implements View.OnClickListener {
                dismiss();
                break;
            case R.id.show_comment_publish:
                String commentCon = showCommentEd.getText().toString();
                if (TextUtils.isEmpty(commentCon)) {
                    Toast.makeText(context, "请输入评论内容！", Toast.LENGTH_SHORT).show();
                    return;
                if (MainApplication.isLogin()) {
                    String commentCon = showCommentEd.getText().toString();
                    if (TextUtils.isEmpty(commentCon)) {
                        Toast.makeText(context, "请输入评论内容！", Toast.LENGTH_SHORT).show();
                        return;
                    }
                    publishComment(commentCon, talkRecommendBean.targetId, talkRecommendBean.targetType,
                            "0", "0", 1, "0");
                }else {
                    Toast.makeText(context, "请登录！", Toast.LENGTH_SHORT).show();
                    context.startActivity(new Intent(context, LoginActivity.class));
                }
                publishComment(commentCon, talkRecommendBean.targetId, talkRecommendBean.targetType,
                        "0", "0", 1, "0");
                break;
            case R.id.show_comment_network_retry:
                show_comment_progress_ll.setVisibility(View.VISIBLE);

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

@@ -67,6 +67,7 @@
        android:layout_below="@+id/item_user_time"
        android:layout_alignStart="@+id/item_user_name"
        android:layout_marginStart="5dp"
        android:layout_marginEnd="37dp"
        android:layout_marginTop="10dp"
        android:text="12sp12sp12sp"
        android:textColor="#fff"