修改bug

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

@@ -44,13 +44,17 @@ import androidx.appcompat.app.AppCompatActivity;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.andview.refreshview.utils.Utils;
import com.blankj.utilcode.util.CacheUtils;
import com.blankj.utilcode.util.EmptyUtils;
import com.blankj.utilcode.util.LogUtils;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.DataSource;
import com.bumptech.glide.load.engine.GlideException;
import com.bumptech.glide.load.resource.bitmap.CenterCrop;
import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
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.adapter.GridImageAdapter;
@@ -213,8 +217,6 @@ public class ChargingCommentActivity extends AppCompatActivity implements View.O
            super.handleMessage(msg);
        }
    };
    private List<LocalMedia> mSelectionData =new ArrayList<LocalMedia>();
    private int mInsterType = -1; //1 插入图片 2 插入视频 -1 未插入数据
@@ -254,9 +256,10 @@ public class ChargingCommentActivity extends AppCompatActivity implements View.O
        findViewById(R.id.imgUpload).setOnClickListener(this);
        findViewById(R.id.videoUpLoad).setOnClickListener(this);
        commentHint = (TextView) findViewById(R.id.commentHint);
        topicText = (TextView) findViewById(R.id.topicText);
        imgAd = (ImageView) findViewById(R.id.imgAd);
        commentHint.setText(Html.fromHtml("30字以上+图片或15s视频有机会被<font color='#3EC34C'>评为优质评论获得充电优惠券</font>", FROM_HTML_MODE_LEGACY));
        topicText = (TextView) findViewById(R.id.topicText);
        topicText.setText(Html.fromHtml("<font color='#6AB650'>╋</font>  话题", FROM_HTML_MODE_LEGACY));
        rl_comment = (RelativeLayout) findViewById(R.id.rl_comment);
@@ -448,21 +451,12 @@ public class ChargingCommentActivity extends AppCompatActivity implements View.O
        });
        if (MainApplication.mAdComment!=null){
            String icon = MainApplication.mAdComment.getIcon();
            String adUrl = MainApplication.mAdComment.getUrl();
            Glide.with(this).load(MainApplication.url + "/zhannew/uploadfile/" + icon).listener(new RequestListener<Drawable>() {
                @Override
                public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) {
                    imgAd.setVisibility(View.GONE);
                    return false;
                }
                @Override
                public boolean onResourceReady(Drawable resource, Object model, Target<Drawable> target, DataSource dataSource, boolean isFirstResource) {
                    imgAd.setVisibility(View.VISIBLE);
                    return false;
                }
            }).into(imgAd);
            Glide.with(this).load(MainApplication.url + "/zhannew/uploadfile/" + icon)
                    .into(imgAd);
            imgAd.setVisibility(View.VISIBLE);
            imgAd.setOnClickListener(v->{
                Intent adfloatIntent = new Intent(this, MyWebViewActivity.class);
                adfloatIntent.putExtra("url", adUrl);
@@ -514,7 +508,7 @@ public class ChargingCommentActivity extends AppCompatActivity implements View.O
        } else if (requestCode == REQUEST_TOPIC_CODE && resultCode == SelectTopicActivity.REESULT_CODE) {
            String name = data.getStringExtra("topicBean");
            mTopicbean = mGson.fromJson(name, TopicBean.class);
            topicText.setText(mTopicbean.getMeg());
            topicText.setText(Html.fromHtml("<font color='#6AB650'>#</font>  "+mTopicbean.getMeg(), FROM_HTML_MODE_LEGACY));
        }
    }

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

@@ -37,7 +37,7 @@ public class CommentVideoDetailActivity extends AppCompatActivity {
    private DetailVideo mVideoPlayer;
    private ImageView mPlayIcon,mBackIcon;
    private ProgressBar mProgressBar;
    private Gson mGson=new Gson();
    private String pid;
    private LoadingDialog mLoadingDialog = null ;
@@ -63,7 +63,6 @@ public class CommentVideoDetailActivity extends AppCompatActivity {
        mVideoPlayer = findViewById(R.id.videoPlayer);
        mBackIcon = findViewById(R.id.backIcon);
        mPlayIcon = findViewById(R.id.playIcon);
        mProgressBar = findViewById(R.id.progressBar);
        mBackIcon.setOnClickListener(v->{
            finish();
@@ -121,7 +120,6 @@ public class CommentVideoDetailActivity extends AppCompatActivity {
        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();

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

@@ -447,6 +447,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                case 2:
                    try {
                        String data = JsonUtils.getKeyResult(msg.obj.toString(), "data");
                        Log.e(TAG, "handleMessage: "+data );
                        if (!data.equals("")) {
                            String ad_comment = JsonUtils.getKeyResult(data, "ad_comment");
                            if (EmptyUtils.isNotEmpty(ad_comment)){

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

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

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

@@ -53,6 +53,7 @@ import com.zhy.view.flowlayout.TagFlowLayout;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import org.w3c.dom.Text;
import java.net.URLEncoder;
import java.util.ArrayList;
@@ -149,7 +150,7 @@ public class SingleCommentActivity extends Activity implements View.OnClickListe
    public void getCommentData(RankinglistRefreshEvent rankinglistRefreshEvent) {
//        String url = "http://59.110.68.162/zhannew/basic/web/index.php/tpappcomments/get-sub-comments?id="+pid;
        String url = MainApplication.url + "/zhannew/basic/web/index.php/tpappcomments/get-sub-comments?id=" + pid;
        Log.e("getCommentData_url=", url);
//        Log.e("getCommentData_url=", url);
        OkHttpUtils.get().url(url).build().execute(new StringCallback() {
            @Override
            public void onError(Call call, Exception e) {
@@ -239,12 +240,19 @@ public class SingleCommentActivity extends Activity implements View.OnClickListe
        }
        //设置时间
        String addtime = JsonUtils.getKeyResult(data, "addtime");
        addtime= TextUtils.isEmpty(addtime)?"0":addtime;
        tv_ptime.setText(TimeStamp2Date(addtime, "yyyy-MM-dd"));
        //设置内容
        String content = JsonUtils.getKeyResult(data, "content");
        String  theme= JsonUtils.getKeyResult(data,"theme");
        if (!TextUtils.isEmpty(theme.trim())){
            content= "#"+theme+"#"+content;
        }
        if (content.equals("") || content.equals(" ")) {
            tv_pcontext.setVisibility(View.GONE);
        } else {
            tv_pcontext.setVisibility(View.VISIBLE);
            SpannableString ss = new SpannableString(content);
            Pattern pattern = Pattern.compile("#[0-9a-zA-Z,\\u4e00-\\u9fa5]+#");
@@ -252,7 +260,7 @@ public class SingleCommentActivity extends Activity implements View.OnClickListe
            while (matcher.find()) {
                int start = matcher.start();
                int end = matcher.end();
                ss.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.topic_blue)), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
                ss.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.topic_green)), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
            }
            tv_pcontext.setText(ss);
        }

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

@@ -22,6 +22,7 @@ import android.util.Base64;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.animation.AnimationUtils;
import android.view.inputmethod.InputMethodManager;
import android.widget.ImageView;
@@ -36,11 +37,15 @@ import androidx.appcompat.app.AppCompatActivity;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.andview.refreshview.utils.Utils;
import com.blankj.utilcode.util.CacheUtils;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.DataSource;
import com.bumptech.glide.load.engine.GlideException;
import com.bumptech.glide.load.resource.bitmap.CenterCrop;
import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
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.adapter.GridImageAdapter;
@@ -85,6 +90,7 @@ import com.upyun.library.common.SerialUploader;
import com.upyun.library.common.UploadEngine;
import com.upyun.library.listener.UpCompleteListener;
import com.upyun.library.listener.UpProgressListener;
import com.zhy.autolayout.AutoLinearLayout;
import com.zhy.http.okhttp.OkHttpUtils;
import com.zhy.http.okhttp.callback.StringCallback;
import com.zhy.view.flowlayout.FlowLayout;
@@ -431,25 +437,14 @@ public class ZhanCommentActivity extends AppCompatActivity implements View.OnCli
        if (MainApplication.mAdComment!=null){
            String icon = MainApplication.mAdComment.getIcon();
            String adUrl = MainApplication.mAdComment.getUrl();
            Glide.with(this).load(MainApplication.url + "/zhannew/uploadfile/" + icon).listener(new RequestListener<Drawable>() {
                @Override
                public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) {
                    imgAd.setVisibility(View.GONE);
                    return false;
                }
                @Override
                public boolean onResourceReady(Drawable resource, Object model, Target<Drawable> target, DataSource dataSource, boolean isFirstResource) {
                    imgAd.setVisibility(View.VISIBLE);
                    return false;
                }
            }).into(imgAd);
            Glide.with(this).load(MainApplication.url + "/zhannew/uploadfile/" + icon)
                    .into(imgAd);
            imgAd.setVisibility(View.VISIBLE);
            imgAd.setOnClickListener(v->{
                Intent adfloatIntent = new Intent(this, MyWebViewActivity.class);
                adfloatIntent.putExtra("url", adUrl);
                startActivity(adfloatIntent);
            });
        }
    }
@@ -546,7 +541,8 @@ public class ZhanCommentActivity extends AppCompatActivity implements View.OnCli
        } else if (requestCode == REQUEST_TOPIC_CODE && resultCode == SelectTopicActivity.REESULT_CODE) {
            String name = data.getStringExtra("topicBean");
            mTopicbean = mGson.fromJson(name, TopicBean.class);
            topicText.setText(mTopicbean.getMeg());
            topicText.setText(Html.fromHtml("<font color='#6AB650'>#</font>  "+mTopicbean.getMeg(), FROM_HTML_MODE_LEGACY));
        }
    }
@@ -618,7 +614,7 @@ public class ZhanCommentActivity extends AppCompatActivity implements View.OnCli
    private void getDatas() {
        zhan_id = getIntent().getStringExtra("zhan_id");
        show_txt = getIntent().getStringExtra("show_txt");
        et_pinglun.setHint(show_txt);
//        et_pinglun.setHint(show_txt);
    }
    private void addComment(ArrayList<String> fileUrlList, String thumUrl) throws Exception {

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

@@ -38,6 +38,8 @@ import com.nostra13.universalimageloader.core.DisplayImageOptions;
import com.nostra13.universalimageloader.core.ImageLoader;
import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
import com.nostra13.universalimageloader.core.assist.ImageScaleType;
import com.shuyu.gsyvideoplayer.GSYVideoManager;
import com.shuyu.gsyvideoplayer.model.VideoOptionModel;
import com.tencent.bugly.crashreport.CrashReport;
import com.zhy.http.okhttp.OkHttpUtils;
import com.zhy.http.okhttp.callback.StringCallback;
@@ -58,6 +60,7 @@ import java.util.Map;
import cn.jpush.android.api.JPushInterface;
import okhttp3.Call;
import tv.danmaku.ijk.media.player.IjkMediaPlayer;
public class MainApplication extends MultiDexApplication {
@@ -207,6 +210,13 @@ public class MainApplication extends MultiDexApplication {
        if (ProfileManager.getInstance().getPrivacyAgreement(this)) {
            MainApplication.initSDK();
        }
        //防止进度跳转不准确
        VideoOptionModel videoOptionModel =
               new VideoOptionModel(IjkMediaPlayer.OPT_CATEGORY_PLAYER, "enable-accurate-seek", 1);
        ArrayList<VideoOptionModel> list =new ArrayList<VideoOptionModel>();
        list.add(videoOptionModel);
        GSYVideoManager.instance().setOptionModelList(list);
    }
    public void initJPush() {

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

@@ -1405,13 +1405,17 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
                                    Glide.with(MainApplication.context)
                                            .load(MainApplication.CDN +thumUrl)
                                            .into(imgVideo);
                                }
                                    imgVideo.setOnClickListener(v->{
                                        CommentVideoDetailActivity.actioinStart(getContext(),jsonObject.optString("id"));
                                    });
                                }
                            }else {
                                imgVideo.setVisibility(View.GONE);
                                imgStart.setVisibility(View.GONE);
                                if (!fileUrl.equals("")) {
                                    iv_commentPic.setVisibility(View.VISIBLE);
                                    imgLayout.setVisibility(View.VISIBLE);
@@ -1440,6 +1444,56 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
                                } else {
                                    imgThree.setVisibility(View.GONE);
                                }
                                String[] fileUrlArray = null;
                                if (!TextUtils.isEmpty(fileUrl) && !TextUtils.isEmpty(file2Url) &&!TextUtils.isEmpty(file3Url)){
                                    fileUrlArray =new String[]{
                                            MainApplication.url + "/zhannew/uploadfile/"+fileUrl,
                                            MainApplication.url + "/zhannew/uploadfile/"+file2Url,
                                            MainApplication.url + "/zhannew/uploadfile/"+file3Url
                                    };
                                }else  if (!TextUtils.isEmpty(fileUrl) && !TextUtils.isEmpty(file2Url)){
                                    fileUrlArray =new String[]{
                                            MainApplication.url + "/zhannew/uploadfile/"+fileUrl,
                                            MainApplication.url + "/zhannew/uploadfile/"+file2Url
                                    };
                                }else  if (!TextUtils.isEmpty(fileUrl)){
                                    fileUrlArray =new String[]{ MainApplication.url + "/zhannew/uploadfile/"+fileUrl};
                                }
                                String[] finalFileUrlArray = fileUrlArray;
                                iv_commentPic.setOnClickListener(new View.OnClickListener() {
                                    @Override
                                    public void onClick(View v) {
                                        Intent intent = new Intent(getContext(), ImagePagerActivity.class);
                                        // 图片url,为了演示这里使用常量，一般从数据库中或网络中获取
                                        intent.putExtra(ImagePagerActivity.EXTRA_IMAGE_URLS, finalFileUrlArray);
                                        intent.putExtra(ImagePagerActivity.EXTRA_IMAGE_INDEX, 0);
                                        startActivity(intent);
                                    }
                                });
                                imgTwo.setOnClickListener(new View.OnClickListener() {
                                    @Override
                                    public void onClick(View v) {
                                        Intent intent = new Intent(getContext(), ImagePagerActivity.class);
                                        // 图片url,为了演示这里使用常量，一般从数据库中或网络中获取
                                        intent.putExtra(ImagePagerActivity.EXTRA_IMAGE_URLS, finalFileUrlArray);
                                        intent.putExtra(ImagePagerActivity.EXTRA_IMAGE_INDEX, 1);
                                        startActivity(intent);
                                    }
                                });
                                imgThree.setOnClickListener(new View.OnClickListener() {
                                    @Override
                                    public void onClick(View v) {
                                        Intent intent = new Intent(getContext(), ImagePagerActivity.class);
                                        // 图片url,为了演示这里使用常量，一般从数据库中或网络中获取
                                        intent.putExtra(ImagePagerActivity.EXTRA_IMAGE_URLS, finalFileUrlArray);
                                        intent.putExtra(ImagePagerActivity.EXTRA_IMAGE_INDEX, 2);
                                        startActivity(intent);
                                    }
                                });
                            }
                            //父级评分
                            String grade = jsonObject.optString("star_level");

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

@@ -87,7 +87,7 @@ public class NewMyMessageFragment extends Fragment {
    }
    private void sp() {
        SharedPreferences sharedPreferences = getActivity().getSharedPreferences("userInfo",
        SharedPreferences sharedPreferences = MainApplication.context.getSharedPreferences("userInfo",
                Activity.MODE_PRIVATE);
        password = sharedPreferences.getString("password", "");
        username = sharedPreferences.getString("yonghuming", "");
@@ -135,17 +135,8 @@ public class NewMyMessageFragment extends Fragment {
                                for (int j = 0; j < jsonArray.length(); j++) {
                                    JSONObject jsonObject4 = (JSONObject) jsonArray
                                            .opt(j);
                                    String is_play = TextUtils.isEmpty( jsonObject4.getString("is_play"))?"": jsonObject4.getString("is_play")  ; //0 审核未通过 item隐藏，1 审核通过，item显示
                                    String type = TextUtils.isEmpty(jsonObject4.getString("type"))?"":jsonObject4.getString("type"); //23 视频，24 图片
                                    if (type.equals("23")){
                                        if (is_play.equals("1")){
                                            datas.add(jsonObject4);
                                        }
                                    }else{
                                        datas.add(jsonObject4);
                                    }
                                    datas.add(jsonObject4);
                                }
                                Log.d("comments_size", datas.size() + "");
                                if (datas.size() == 0) {
                                    web_content.setVisibility(View.GONE);
                                    ll_tishi.setVisibility(View.VISIBLE);

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

@@ -3,10 +3,13 @@ package com.electric.chargingpile.video;
import android.content.Context;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.widget.ImageView;
import com.electric.chargingpile.R;
import com.shuyu.gsyvideoplayer.video.StandardGSYVideoPlayer;
import moe.codeest.enviews.ENPlayView;
public class DetailVideo extends StandardGSYVideoPlayer {
@@ -30,6 +33,7 @@ public class DetailVideo extends StandardGSYVideoPlayer {
    }
    @Override
    protected void touchSurfaceMoveFullLogic(float absDeltaX, float absDeltaY) {
        super.touchSurfaceMoveFullLogic(absDeltaX, absDeltaY);
@@ -60,27 +64,26 @@ public class DetailVideo extends StandardGSYVideoPlayer {
    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);
    }
@@ -88,53 +91,52 @@ public class DetailVideo extends StandardGSYVideoPlayer {
    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_charging_comment.xml

@@ -183,7 +183,7 @@
                android:paddingTop="12dp"
                android:paddingBottom="12dp"
                android:background="@color/white"
                android:hint="对本次充电感受如何？跟其他车友分享一下吧～"
                android:hint="有什么想吐槽的吗？来跟其他车友分享一下吧～"
                android:textColorHint="@color/ui_68"
                android:textColor="@color/ui_62"
                android:textSize="13sp"
@@ -249,6 +249,8 @@
                />
            <ImageView
                android:layout_marginEnd="12dp"
                android:layout_marginStart="12dp"
                android:visibility="gone"
                android:id="@+id/imgAd"
                android:layout_marginTop="30dp"

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

@@ -1542,7 +1542,7 @@
                android:layout_height="34dp"
                android:gravity="center"
                tools:text="您有一笔订，点击查看详情..."
                android:textColor="@color/huimain"
                android:textColor="#FA1C1C"
                android:textSize="13sp" />
            <ImageView

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

@@ -24,19 +24,7 @@
        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"
        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/src/main/res/layout/activity_zhan_comment.xml

@@ -189,7 +189,7 @@
                android:layout_marginBottom="7dp"
                android:background="@color/white"
                android:gravity="left|top"
                android:hint="您的充电体验、站点吐槽、充电趣事，来和其他车友分享吧~"
                android:hint="有什么想吐槽的吗？来跟其他车友分享一下吧～"
                android:paddingLeft="15dp"
                android:paddingTop="12dp"
                android:paddingRight="15dp"
@@ -258,6 +258,8 @@
                />
            <ImageView
                android:layout_marginEnd="12dp"
                android:layout_marginStart="12dp"
                android:visibility="gone"
                android:id="@+id/imgAd"
                android:layout_marginTop="30dp"

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

@@ -14,10 +14,90 @@
    </FrameLayout>
    <RelativeLayout
        android:id="@+id/thumb"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:layout_alignParentStart="true"
        android:layout_alignParentLeft="true"
        android:layout_alignParentTop="true"
        android:layout_alignParentEnd="true"
        android:layout_alignParentRight="true"
        android:layout_alignParentBottom="true"
        android:background="#000000"
        android:scaleType="fitCenter" />
    <LinearLayout
        android:id="@+id/layout_bottom"
        android:layout_width="match_parent"
        android:layout_height="40dp"
        android:layout_alignParentBottom="true"
        android:background="#99000000"
        android:gravity="center_vertical"
        android:orientation="horizontal"
        android:visibility="invisible"
        tools:visibility="visible">
        <ImageView
            tools:src="@drawable/video_click_pause_selector"
            android:layout_marginStart="10dp"
            android:id="@+id/start"
            android:layout_width="30dp"
            android:layout_height="30dp"
            android:layout_centerHorizontal="true"
            android:layout_centerVertical="true"
            android:layout_gravity="center_vertical" />
    <moe.codeest.enviews.ENDownloadView
        <TextView
            android:id="@+id/current"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginLeft="16dp"
            android:text="00:00"
            android:textColor="#ffffff" />
        <SeekBar
            android:id="@+id/progress"
            android:layout_width="0dp"
            android:layout_height="wrap_content"
            android:layout_gravity="center_vertical"
            android:layout_weight="1.0"
            android:background="@null"
            android:max="100"
            android:maxHeight="4dp"
            android:minHeight="4dp"
            android:paddingTop="8dp"
            android:paddingBottom="8dp"
            android:progressDrawable="@drawable/video_seek_progress"
            android:thumb="@drawable/video_seek_thumb" />
        <TextView
            android:id="@+id/total"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginRight="16dp"
            android:text="00:00"
            android:textColor="#ffffff" />
    </LinearLayout>
    <ProgressBar
        android:id="@+id/bottom_progressbar"
        style="?android:attr/progressBarStyleHorizontal"
        android:layout_width="match_parent"
        android:layout_height="1.5dp"
        android:layout_alignParentBottom="true"
        android:max="100"
        android:progressDrawable="@drawable/video_progress"
        tools:visibility="visible" />
    <ImageView
        android:id="@+id/back_tiny"
        android:layout_width="24dp"
        android:layout_height="24dp"
        android:layout_marginLeft="6dp"
        android:layout_marginTop="6dp"
        android:visibility="gone" />
    <moe.codeest.enviews.ENDownloadView
        android:id="@+id/loading"
        android:layout_width="28dp"
        android:layout_height="28dp"
@@ -25,14 +105,17 @@
        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" />
    <ImageView
        android:id="@+id/small_close"
        android:layout_width="30dp"
        android:layout_height="30dp"
        android:paddingLeft="10dp"
        android:paddingTop="10dp"
        android:scaleType="centerInside"
        android:src="@drawable/video_small_close"
        android:visibility="gone" />
</RelativeLayout>