修复bug

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

@@ -4,6 +4,11 @@ import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
import android.view.WindowManager;
import android.widget.ImageView;
import android.widget.ProgressBar;
import android.widget.Toast;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
@@ -11,10 +16,14 @@ import androidx.appcompat.app.AppCompatActivity;
import com.electric.chargingpile.R;
import com.electric.chargingpile.application.MainApplication;
import com.electric.chargingpile.data.SingleCommentBean;
import com.electric.chargingpile.manager.ProfileManager;
import com.electric.chargingpile.util.ImageDisplayUtils;
import com.electric.chargingpile.util.JsonUtils;
import com.electric.chargingpile.util.LoadingDialog;
import com.electric.chargingpile.video.VideoPlayer;
import com.electric.chargingpile.util.ToastUtil;
import com.electric.chargingpile.video.DetailVideo;
import com.google.gson.Gson;
import com.shuyu.gsyvideoplayer.listener.VideoAllCallBack;
import com.shuyu.gsyvideoplayer.video.base.GSYVideoView;
import com.zhy.http.okhttp.OkHttpUtils;
import com.zhy.http.okhttp.callback.StringCallback;
@@ -26,7 +35,9 @@ import okhttp3.Call;
public class CommentVideoDetailActivity extends AppCompatActivity {
    private VideoPlayer mVideoPlayer;
    private DetailVideo mVideoPlayer;
    private ImageView mPlayIcon,mBackIcon;
    private ProgressBar mProgressBar;
    private Gson mGson=new Gson();
    private String pid;
    private LoadingDialog mLoadingDialog = null ;
@@ -34,6 +45,8 @@ public class CommentVideoDetailActivity extends AppCompatActivity {
    protected void onCreate(@Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        setContentView(R.layout.activity_video_detail);
        //透明状态栏
        getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
        initView();
        pid = getIntent().getStringExtra("id");
        if (null != pid && !pid.equals("")) {
@@ -48,7 +61,13 @@ public class CommentVideoDetailActivity extends AppCompatActivity {
        mLoadingDialog.setCanceledOnTouchOutside(false);
        mVideoPlayer = findViewById(R.id.videoPlayer);
        mBackIcon = findViewById(R.id.backIcon);
        mPlayIcon = findViewById(R.id.playIcon);
        mProgressBar = findViewById(R.id.progressBar);
        mBackIcon.setOnClickListener(v->{
            finish();
        });
    }
@@ -76,13 +95,9 @@ public class CommentVideoDetailActivity extends AppCompatActivity {
                    try {
                        JSONObject jsonObj = new JSONObject(response);
                        String commentData = jsonObj.getString("data");
                        Log.e("commentBean==", commentData);
                        JSONObject obj = new JSONObject(commentData);
                        SingleCommentBean singleCommentBean = mGson.fromJson(commentData, SingleCommentBean.class);
                        String fileUrl = singleCommentBean.getFileUrl();
                        String url = MainApplication.CDN + fileUrl;
                        mVideoPlayer.setUp(url, true, "");
                        mVideoPlayer.startPlayLogic();
                        initPlayer(singleCommentBean);
                    } catch (JSONException e) {
                        e.printStackTrace();
@@ -95,23 +110,154 @@ public class CommentVideoDetailActivity extends AppCompatActivity {
        });
    }
    @Override
    protected void onResume() {
        super.onResume();
        playOrPause();
    private void initPlayer(SingleCommentBean bean) {
        String fileUrl = bean.getFileUrl();
        String url = MainApplication.CDN + fileUrl;
        setVideoAllCallBack();
        ImageView thumbImageView = new ImageView(this);
        thumbImageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
        ImageDisplayUtils.dispalyImg(this, url, thumbImageView);
        mVideoPlayer.setThumbImageView(thumbImageView);
        mVideoPlayer.setLooping(true);
        mVideoPlayer.setGSYVideoProgressListener((progress, secProgress, currentPosition, duration) -> mProgressBar.setProgress(Math.toIntExact(progress)));
        mVideoPlayer.setUp(url, true, "");
        mVideoPlayer.startPlayLogic();
    }
    private void setVideoAllCallBack() {
        mVideoPlayer.setVideoAllCallBack(new VideoAllCallBack() {
            @Override
            public void onAutoComplete(String s, Object... objects) {
                if (ProfileManager.getInstance().getMakeSureNetworkForView(CommentVideoDetailActivity.this)) {
                    mVideoPlayer.startPlayLogic();
                }
            }
            @Override
            public void onComplete(String url, Object... objects) {
            }
            @Override
            public void onClickStartError(String s, Object... objects) {
                mPlayIcon.setVisibility(View.VISIBLE);
                ToastUtil.showToast(CommentVideoDetailActivity.this, s, Toast.LENGTH_SHORT);
            }
            @Override
            public void onPlayError(String s, Object... objects) {
                mPlayIcon.setVisibility(View.VISIBLE);
                ToastUtil.showToast(CommentVideoDetailActivity.this, s, Toast.LENGTH_SHORT);
            }
            @Override
            public void onStartPrepared(String s, Object... objects) {
            }
            @Override
            public void onPrepared(String s, Object... objects) {
            }
            @Override
            public void onClickResume(String s, Object... objects) {
            }
            @Override
            public void onClickBlank(String s, Object... objects) {
            }
            @Override
            public void onClickBlankFullscreen(String s, Object... objects) {
            }
            @Override
            public void onClickStartIcon(String s, Object... objects) {
            }
            @Override
            public void onClickStop(String s, Object... objects) {
            }
            @Override
            public void onClickStopFullscreen(String s, Object... objects) {
            }
            @Override
            public void onClickResumeFullscreen(String s, Object... objects) {
            }
            @Override
            public void onClickSeekbar(String s, Object... objects) {
            }
            @Override
            public void onClickSeekbarFullscreen(String s, Object... objects) {
            }
            @Override
            public void onEnterFullscreen(String s, Object... objects) {
            }
            @Override
            public void onQuitFullscreen(String s, Object... objects) {
            }
            @Override
            public void onQuitSmallWidget(String s, Object... objects) {
            }
            @Override
            public void onEnterSmallWidget(String s, Object... objects) {
            }
            @Override
            public void onTouchScreenSeekVolume(String s, Object... objects) {
            }
            @Override
            public void onTouchScreenSeekPosition(String s, Object... objects) {
            }
            @Override
            public void onTouchScreenSeekLight(String s, Object... objects) {
            }
            @Override
            public void onClickStartThumb(String s, Object... objects) {
            }
        });
    }
    private void playOrPause() {
        int currentStatue = mVideoPlayer.getCurrentState();
        if (currentStatue == GSYVideoView.CURRENT_STATE_PLAYING) {
            mPlayIcon.setVisibility(View.VISIBLE);
            mVideoPlayer.onVideoPause();
        } else if (currentStatue == GSYVideoView.CURRENT_STATE_PAUSE) {
            mPlayIcon.setVisibility(View.GONE);
            mVideoPlayer.onVideoResume(false);
        } else {
            mPlayIcon.setVisibility(View.GONE);
            mVideoPlayer.startPlayLogic();
        }
    }
    @Override
    protected void onResume() {
        super.onResume();
        playOrPause();
    }
    @Override
    protected void onPause() {
        super.onPause();
        playOrPause();

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

@@ -99,7 +99,7 @@ public class SelectTopicActivity  extends AppCompatActivity {
                        String data = JsonUtils.getKeyResult(response, "data");
                        ArrayList<TopicBean> list = mGson.fromJson(data, new TypeToken<ArrayList<TopicBean>>() {
                        }.getType());
                        if (list!=null && list.size()>0){
                        if (list != null && list.size()>0){
                            mAdapter.setDatas(list);
                            mRecyclerView.setVisibility(View.VISIBLE);
                            noDataText.setVisibility(View.GONE);

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

@@ -158,7 +158,7 @@ public class NewPingLunAdapter extends BaseAdapter {
            try {
                String is_play = TextUtils.isEmpty( datas.get(position).getString("is_play"))?"": datas.get(position).getString("is_play")  ; //0 审核未通过 item隐藏，1 审核通过，item显示
                if (TextUtils.isEmpty(is_play) && is_play.equals("1")){
                if (!TextUtils.isEmpty(is_play) && is_play.equals("1")){
                    convertView.setVisibility(View.VISIBLE);
                }else{
                    convertView.setVisibility(View.GONE);

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

@@ -435,7 +435,7 @@ public class ZhanCommentsAapter extends BaseAdapter {
                String is_play = TextUtils.isEmpty( datas.get(position).getString("is_play"))?"": datas.get(position).getString("is_play")  ; //0 审核未通过 item隐藏，1 审核通过，item显示
                if (TextUtils.isEmpty(is_play) && is_play.equals("1")){
                if (!TextUtils.isEmpty(is_play) && is_play.equals("1")){
                    convertView.setVisibility(View.VISIBLE);
                }else{
                    convertView.setVisibility(View.GONE);

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

@@ -6,6 +6,8 @@ import android.content.SharedPreferences;
import android.os.Bundle;
import android.os.Handler;
import androidx.fragment.app.Fragment;
import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
@@ -133,7 +135,10 @@ public class NewMyMessageFragment extends Fragment {
                                for (int j = 0; j < jsonArray.length(); j++) {
                                    JSONObject jsonObject4 = (JSONObject) jsonArray
                                            .opt(j);
                                    datas.add(jsonObject4);
                                    String is_play = TextUtils.isEmpty( jsonObject4.getString("is_play"))?"": jsonObject4.getString("is_play")  ; //0 审核未通过 item隐藏，1 审核通过，item显示
                                    if (is_play.equals("1")){
                                        datas.add(jsonObject4);
                                    }
                                }
                                Log.d("comments_size", datas.size() + "");
                                if (datas.size() == 0) {

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

@@ -7,6 +7,7 @@ import android.os.Handler;
import androidx.fragment.app.Fragment;
import androidx.core.content.ContextCompat;
import android.text.TextUtils;
import android.util.Log;
import android.util.TypedValue;
import android.view.LayoutInflater;
@@ -254,7 +255,10 @@ public class ZhanCommentFragment extends Fragment {
                                for (int j = 0; j < jsonArray.length(); j++) {
                                    JSONObject jsonObject = (JSONObject) jsonArray.opt(j);
                                    datas.add(jsonObject);
                                    String is_play = TextUtils.isEmpty( jsonObject.getString("is_play"))?"": jsonObject.getString("is_play")  ; //0 审核未通过 item隐藏，1 审核通过，item显示
                                    if (is_play.equals("1")){
                                        datas.add(jsonObject);
                                    }
                                }
//                                Log.e(TAG, "dealData: size=" + datas.size());
                                if (datas.size() == 0) {
@@ -305,7 +309,11 @@ public class ZhanCommentFragment extends Fragment {
                                JSONArray jsonArray = new JSONArray(commentData);
                                for (int j = 0; j < jsonArray.length(); j++) {
                                    JSONObject jsonObject = (JSONObject) jsonArray.opt(j);
                                    datas.add(jsonObject);
                                    String is_play = TextUtils.isEmpty( jsonObject.getString("is_play"))?"": jsonObject.getString("is_play")  ; //0 审核未通过 item隐藏，1 审核通过，item显示
                                    if (is_play.equals("1")){
                                        datas.add(jsonObject);
                                    }
                                }
                                if (datas.size() == 0) {
                                    ll_tishi.setVisibility(View.VISIBLE);

app/src/main/java/com/electric/chargingpile/video/DetailVideo.java

@@ -0,0 +1,140 @@
package com.electric.chargingpile.video;
import android.content.Context;
import android.util.AttributeSet;
import android.view.MotionEvent;
import com.electric.chargingpile.R;
import com.shuyu.gsyvideoplayer.video.StandardGSYVideoPlayer;
public class DetailVideo extends StandardGSYVideoPlayer {
    public DetailVideo(Context context) {
        this(context,null);
    }
    public DetailVideo(Context context, AttributeSet attrs) {
        super(context, attrs);
    }
    @Override
    protected void init(Context context) {
        super.init(context);
    }
    @Override
    public int getLayoutId() {
        return R.layout.layout_video_detail;
    }
    @Override
    protected void touchSurfaceMoveFullLogic(float absDeltaX, float absDeltaY) {
        super.touchSurfaceMoveFullLogic(absDeltaX, absDeltaY);
        //不给触摸快进，如果需要，屏蔽下方代码即可
        mChangePosition = false;
        //不给触摸音量，如果需要，屏蔽下方代码即可
        mChangeVolume = false;
        //不给触摸亮度，如果需要，屏蔽下方代码即可
        mBrightness = false;
    }
    @Override
    protected void touchDoubleUp(MotionEvent e) {
//        super.touchDoubleUp(e);
    }
/*
    @Override
    protected void touchDoubleUp() {
        // super.touchDoubleUp();
        // 不需要双击暂停
    }
*/
    @Override
    protected void changeUiToPreparingShow() {
        super.changeUiToPreparingShow();
        setViewShowState(mTopContainer, INVISIBLE);
        setViewShowState(mBottomContainer, INVISIBLE);
        setViewShowState(mLoadingProgressBar, INVISIBLE);
        setViewShowState(mStartButton, INVISIBLE);
    }
    @Override
    protected void changeUiToPlayingBufferingShow() {
        super.changeUiToPlayingBufferingShow();
        setViewShowState(mTopContainer, INVISIBLE);
        setViewShowState(mBottomContainer, INVISIBLE);
        setViewShowState(mLoadingProgressBar, INVISIBLE);
        setViewShowState(mStartButton, INVISIBLE);
    }
    @Override
    protected void changeUiToPlayingShow() {
        super.changeUiToPlayingShow();
        setViewShowState(mTopContainer, INVISIBLE);
        setViewShowState(mBottomContainer, INVISIBLE);
        setViewShowState(mLoadingProgressBar, INVISIBLE);
        setViewShowState(mStartButton, INVISIBLE);
    }
    @Override
    protected void changeUiToCompleteShow() {
        super.changeUiToCompleteShow();
        setViewShowState(mTopContainer, INVISIBLE);
        setViewShowState(mBottomContainer, INVISIBLE);
        setViewShowState(mLoadingProgressBar, INVISIBLE);
        setViewShowState(mStartButton, INVISIBLE);
    }
    @Override
    protected void changeUiToPauseShow() {
        super.changeUiToPauseShow();
        setViewShowState(mTopContainer, INVISIBLE);
        setViewShowState(mBottomContainer, INVISIBLE);
        setViewShowState(mLoadingProgressBar, INVISIBLE);
        setViewShowState(mStartButton, INVISIBLE);
    }
    @Override
    protected void changeUiToNormal() {
        super.changeUiToNormal();
        setViewShowState(mTopContainer, INVISIBLE);
        setViewShowState(mBottomContainer, INVISIBLE);
        setViewShowState(mLoadingProgressBar, INVISIBLE);
        setViewShowState(mStartButton, INVISIBLE);
    }
    @Override
    public void startAfterPrepared() {
        super.startAfterPrepared();
        setViewShowState(mTopContainer, INVISIBLE);
        setViewShowState(mBottomContainer, INVISIBLE);
        setViewShowState(mLoadingProgressBar, INVISIBLE);
        setViewShowState(mStartButton, INVISIBLE);
    }
    @Override
    protected void changeUiToPlayingBufferingClear() {
        super.changeUiToPlayingBufferingClear();
        setViewShowState(mTopContainer, INVISIBLE);
        setViewShowState(mBottomContainer, INVISIBLE);
        setViewShowState(mLoadingProgressBar, INVISIBLE);
        setViewShowState(mStartButton, INVISIBLE);
    }
    @Override
    protected void changeTextureViewShowType() {
        super.changeTextureViewShowType();
        setViewShowState(mTopContainer, INVISIBLE);
        setViewShowState(mBottomContainer, INVISIBLE);
        setViewShowState(mLoadingProgressBar, INVISIBLE);
        setViewShowState(mStartButton, INVISIBLE);
    }
}

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

@@ -1487,6 +1487,7 @@
        android:orientation="vertical">
        <RelativeLayout
            tools:visibility="visible"
            android:id="@+id/rl_charging_notice"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
@@ -1605,6 +1606,7 @@
            </LinearLayout>
            <ImageView
                android:id="@+id/second_hand_car"
                android:layout_width="80dp"
                android:layout_height="80dp"
@@ -1615,7 +1617,7 @@
                android:layout_marginBottom="9dp"
                android:visibility="gone"
                tools:background="#ff0000"
                tools:visibility="gone" />
                tools:visibility="visible" />
            <ImageView
                android:id="@+id/iv_route"

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

@@ -3,14 +3,51 @@
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent">
    android:layout_height="match_parent"
   >
    <com.electric.chargingpile.video.VideoPlayer
    <com.electric.chargingpile.video.DetailVideo
        android:id="@+id/videoPlayer"
        android:layout_width="match_parent"
        android:layout_height="0dp"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintTop_toTopOf="parent" />
    <ImageView
        android:id="@+id/playIcon"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:clickable="false"
        android:src="@drawable/app_talk_video_icon"
        app:layout_constraintBottom_toBottomOf="@+id/videoPlayer"
        app:layout_constraintEnd_toEndOf="@+id/videoPlayer"
        app:layout_constraintStart_toStartOf="@+id/videoPlayer"
        app:layout_constraintTop_toTopOf="@+id/videoPlayer" />
    <!-- 自定义进度条 -->
    <ProgressBar
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent" />
        android:layout_marginBottom="10dp"
        app:layout_constraintBottom_toBottomOf="parent"
        android:id="@+id/progressBar"
        style="@android:style/Widget.ProgressBar.Horizontal"
        android:layout_width="match_parent"
        android:layout_height="1dp"
        android:max="100"
        android:progressDrawable="@drawable/video_player_progressbar"
        tools:progress="50" />
    <ImageView
        android:layout_marginTop="25dp"
        app:layout_constraintTop_toTopOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        android:padding="16dp"
        android:id="@+id/backIcon"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:paddingLeft="20dp"
        android:paddingRight="20dp"
        android:src="@drawable/app_white_back_icon"
        app:layout_constraintLeft_toLeftOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@android:color/black">
    <FrameLayout
        android:id="@+id/surface_container"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:gravity="center">
    </FrameLayout>
    <moe.codeest.enviews.ENDownloadView
        android:id="@+id/loading"
        android:layout_width="28dp"
        android:layout_height="28dp"
        android:layout_centerHorizontal="true"
        android:layout_centerVertical="true"
        android:visibility="invisible" />
    <moe.codeest.enviews.ENPlayView
        android:id="@+id/start"
        android:layout_width="60dp"
        android:layout_height="60dp"
        android:layout_centerHorizontal="true"
        android:layout_centerVertical="true"
        android:layout_gravity="center_vertical" />
</RelativeLayout>