Merge remote-tracking branch 'origin/master'

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

@@ -5,7 +5,6 @@ import android.content.Intent;
import android.support.v4.view.PagerAdapter;
import android.support.v4.view.ViewPager;
import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
@@ -86,21 +85,23 @@ public class SvVideoShowView implements View.OnClickListener {
    }
    public void setInfo(TalkRecommendBean talkRecommendBean) {
        this.talkRecommendBean = talkRecommendBean;
        int targetType = talkRecommendBean.targetType;
        if (view == null) {
            if (targetType == 23) {
                view = LayoutInflater.from(activity).inflate(R.layout.view_show_view, null);
                initPlayer(view);
            } else if (targetType == 24) {
                view = LayoutInflater.from(activity).inflate(R.layout.view_show_zoom, null);
                initZoomPhoto(view);
            }
            initBottom(view);
            viewGroup.addView(view);
        if (viewGroup != null) {
            this.talkRecommendBean = talkRecommendBean;
            int targetType = talkRecommendBean.targetType;
            if (view == null) {
                if (targetType == 23) {
                    view = LayoutInflater.from(activity).inflate(R.layout.view_show_view, null);
                    initPlayer(view);
                } else if (targetType == 24) {
                    view = LayoutInflater.from(activity).inflate(R.layout.view_show_zoom, null);
                    initZoomPhoto(view);
                }
                initBottom(view);
                viewGroup.addView(view);
            setData();
                setData();
            }
        }
    }
@@ -163,8 +164,6 @@ public class SvVideoShowView implements View.OnClickListener {
    private void setData() {
        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);
        String time = "" + talkRecommendBean.addTime;
        sv_show_user_time.setText(time);
@@ -198,13 +197,6 @@ public class SvVideoShowView implements View.OnClickListener {
        } else {
            // 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) {
            sv_show_tvcon_more.setVisibility(View.VISIBLE);
        } else {
            sv_show_tvcon_more.setVisibility(View.GONE);
        }
    }
@@ -391,7 +383,25 @@ public class SvVideoShowView implements View.OnClickListener {
    }
    public void updateView() {
//        ToastUtil.showToast(activity, "updateView", Toast.LENGTH_LONG);
        String title = talkRecommendBean.title;
        if (TextUtils.isEmpty(title)) {
            sv_show_tvcon_more.setVisibility(View.GONE);
        } else {
            int length = title.length();
            if (length > 100) {
                sv_show_tvcon.setMaxLines(3);
                sv_show_tvcon.setEllipsize(TextUtils.TruncateAt.END);
                sv_show_tvcon_more.setVisibility(View.VISIBLE);
                sv_show_tvcon.setText(talkRecommendBean.title);
            } else {
                sv_show_tvcon_more.setVisibility(View.GONE);
                sv_show_tvcon.setMaxLines(100);
            }
        }
    }
    public void initAndPlay() {
@@ -512,7 +522,10 @@ public class SvVideoShowView implements View.OnClickListener {
                                chargingShareBean.setIcon(talkRecommendBean.coverImgUrl);
                                chargingShareBean.setTitle(talkRecommendBean.title);
                                chargingShareBean.setUrl(shareUrl);
                                showSimpleBottomSheetGrid(chargingShareBean);
                            }
                        } else {
                            ToastUtil.showToast(activity, "获取分享信息失败，请重试", Toast.LENGTH_SHORT);
                        }
                    }
                });

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

@@ -123,8 +123,6 @@
        android:layout_marginRight="39dp"
        android:layout_marginBottom="23dp"
        android:textColor="#E2E2E2"
        android:ellipsize="end"
        android:maxLines="3"
        android:textSize="14sp" />
    <ImageView