fix bug

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

@@ -87,14 +87,15 @@ public class PersonalPageActivity extends Activity implements View.OnClickListen
        map.put("limit", "20");
        if (MainApplication.isLogin()) {
            map.put("userId", MainApplication.userId);
            if(TextUtils.isEmpty(targetUserId)){
            if (TextUtils.isEmpty(targetUserId)) {
                user_edit.setVisibility(View.VISIBLE);
                map.put("targetUserId", MainApplication.userId);//说明是自己
            }
            else{
            } else {
                user_edit.setVisibility(View.GONE);
                map.put("targetUserId", targetUserId);
            }
        }else {
            map.put("targetUserId", targetUserId);
        }
        OkHttpUtils.get().params(map).url(url).build().connTimeOut(6000).readTimeOut(6000).execute(new StringCallback() {
            @Override
@@ -158,7 +159,7 @@ public class PersonalPageActivity extends Activity implements View.OnClickListen
        data_info.setText(qadata.userVo.topicNums + "");
        if (!"".equals(qadata.userVo.headImgUrl)) {
            Picasso.with(this)
                    .load("http://cdz.evcharge.cc/zhannew/uploadfile/"+qadata.userVo.headImgUrl)
                    .load("http://cdz.evcharge.cc/zhannew/uploadfile/" + qadata.userVo.headImgUrl)
                    .into(new Target() {
                        @Override
                        public void onBitmapLoaded(Bitmap bitmap, Picasso.LoadedFrom loadedFrom) {
@@ -226,12 +227,13 @@ public class PersonalPageActivity extends Activity implements View.OnClickListen
        waterFallAdapter.setOnRecyclerItemClickListener(new RecyclerItemTypeClickListener() {
            @Override
            public void onItemClickListener(int position, int index) {
                startActivity(new Intent(PersonalPageActivity.this, TopicDetailsActivity.class).putExtra("topicId", waterFallAdapter.getCurrentData().get(position).topicId+""));
                startActivity(new Intent(PersonalPageActivity.this, TopicDetailsActivity.class).putExtra("topicId", waterFallAdapter.getCurrentData().get(position).topicId + ""));
            }
        });
    }
    private ChargingShareBean chargingShareBean = new ChargingShareBean();
    @Override
    public void onClick(View v) {
        switch (v.getId()) {
@@ -246,13 +248,13 @@ public class PersonalPageActivity extends Activity implements View.OnClickListen
                break;
            case R.id.iv_more:
                if (!MainApplication.isLogin()){
                    startActivity(new Intent(this.getApplicationContext(),LoginActivity.class));
                    ToastUtil.showToast(this.getApplicationContext(),"请先登录", Toast.LENGTH_SHORT);
                if (!MainApplication.isLogin()) {
                    startActivity(new Intent(this.getApplicationContext(), LoginActivity.class));
                    ToastUtil.showToast(this.getApplicationContext(), "请先登录", Toast.LENGTH_SHORT);
                    return;
                }
                if(null == chargingShareBean.getUrl() || TextUtils.isEmpty(chargingShareBean.getUrl()))
                if (null == chargingShareBean.getUrl() || TextUtils.isEmpty(chargingShareBean.getUrl()))
                    return;
//                if(null == chargingShareBean){
//                    getShareData();

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

@@ -136,22 +136,22 @@ public class VideoDetaislActivity extends Activity implements View.OnClickListen
        }
    }
    @Override
    protected void onResume() {
        if (videoShowView != null) {
            videoShowView.onResume();
        }
        super.onResume();
    }
    @Override
    protected void onPause() {
        if (videoShowView != null) {
            videoShowView.onPause();
        }
        super.onPause();
    }
//    @Override
//    protected void onResume() {
//        if (videoShowView != null) {
//            videoShowView.onResume();
//        }
//        super.onResume();
//
//    }
//    @Override
//    protected void onPause() {
//        if (videoShowView != null) {
//            videoShowView.onPause();
//        }
//        super.onPause();
//    }
    @Override
    protected void onStop() {

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

@@ -42,9 +42,10 @@ import com.squareup.picasso.Picasso;
import com.zhy.http.okhttp.OkHttpUtils;
import com.zhy.http.okhttp.callback.StringCallback;
import java.math.RoundingMode;
import java.text.NumberFormat;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import cn.sharesdk.framework.Platform;
@@ -146,16 +147,15 @@ public class SvVideoShowView implements View.OnClickListener {
    private String num4(int num) {
        String re = "";
        if (num < 999) {
        if (num < 10000) {
            re = re + num;
        } else {
            float result = num / 10000;
            int sl = num % 10000;
            if (sl == 0) {
                re = String.format(Locale.CHINESE, "%f", result) + "W";
            } else {
                re = String.format(Locale.CHINESE, "%.1f", result) + "W";
            }
            float result = (float) num / 10000;
            NumberFormat nf = NumberFormat.getInstance();
            nf.setRoundingMode(RoundingMode.DOWN);
            nf.setMaximumFractionDigits(1);
            re = nf.format(result) + "W";
        }
        return re;
    }
@@ -287,9 +287,16 @@ 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.setOnCompletionListener(new IMediaPlayer.OnCompletionListener() {
            @Override
            public void onCompletion(IMediaPlayer mp) {
                playIcon.setVisibility(View.VISIBLE);
            }
        });
        upVideoView2.setOnPreparedListener(new IMediaPlayer.OnPreparedListener() {
            @Override
            public void onPrepared(IMediaPlayer mp) {
                mp.setLooping(false);
                int videoWidth = mp.getVideoWidth();
                int videoHeight = mp.getVideoHeight();
                if (videoHeight > videoWidth) {
@@ -302,15 +309,18 @@ public class SvVideoShowView implements View.OnClickListener {
        upVideoView2.setOnTouchListener(new View.OnTouchListener() {
            @Override
            public boolean onTouch(View view, MotionEvent motionEvent) {
                boolean playing = upVideoView2.isPlaying();
                if (playing) {
                    upVideoView2.pause();
                    playIcon.setVisibility(View.VISIBLE);
                } else {
                    playIcon.setVisibility(View.GONE);
                    upVideoView2.start();
                if (motionEvent.getAction() == MotionEvent.ACTION_DOWN) {
                    boolean playing = upVideoView2.isPlaying();
                    if (playing) {
                        upVideoView2.pause();
                        playIcon.setVisibility(View.VISIBLE);
                    } else {
                        playIcon.setVisibility(View.GONE);
                        upVideoView2.start();
                    }
                }
                return false;
                return true;
            }
        });
    }
@@ -593,12 +603,6 @@ public class SvVideoShowView implements View.OnClickListener {
        }
    }
    public void onStop() {
        if (upVideoView2 != null) {
            upVideoView2.stopPlayback();
        }
    }
    public void onResume() {
        if (upVideoView2 != null && !upVideoView2.isPlaying() && talkRecommendBean != null &&
                !TextUtils.isEmpty(talkRecommendBean.videoUrl)) {
@@ -617,9 +621,13 @@ public class SvVideoShowView implements View.OnClickListener {
        }
    }
    public void onPause() {
        if (upVideoView2 != null) {
            upVideoView2.stopPlayback();
    public void onStop() {
        if (upVideoView2 != null && upVideoView2.isPlaying()) {
            upVideoView2.pause();
        }
        if (playIcon != null) {
            playIcon.setVisibility(View.VISIBLE);
        }
    }

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

@@ -267,6 +267,11 @@ public class VideoCommentDialog extends Dialog implements View.OnClickListener {
                                    show_comment_no.setVisibility(View.GONE);
                                }
                            }
                        }else{
                            String rtnMsg = JsonUtils.getKeyResult(response, "desc");
                            ToastUtil.showToast(context, rtnMsg, Toast.LENGTH_SHORT);
                        }
                    }
                });