修改bug

app/src/main/AndroidManifest.xml

@@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
    package="com.electric.chargingpile"
    android:versionCode="102"
    android:versionName="3.5.16">
    android:versionCode="103"
    android:versionName="3.5.17">
   <!-- <uses-permission android:name="android.permission.BLUETOOTH" />
    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />-->
@@ -107,9 +107,6 @@
            android:name=".activity.CommentVideoDetailActivity"
            android:screenOrientation="portrait"/>
        <activity
            android:name=".activity.VideoCompressionActivity"
            android:screenOrientation="portrait"/>
        <activity
            android:name=".activity.SelectTopicActivity"
            android:screenOrientation="portrait"/>
        <activity

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

@@ -1,18 +1,13 @@
package com.electric.chargingpile.activity;
import android.Manifest;
import android.app.Activity;
import android.app.ProgressDialog;
import android.content.Context;
import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Color;
import android.graphics.Matrix;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
@@ -28,9 +23,6 @@ import android.view.View;
import android.view.ViewGroup;
import android.view.animation.AnimationUtils;
import android.view.inputmethod.InputMethodManager;
import android.widget.AdapterView;
import android.widget.BaseAdapter;
import android.widget.GridView;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.PopupWindow;
@@ -39,23 +31,14 @@ import android.widget.ScrollView;
import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.Nullable;
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;
import com.electric.chargingpile.application.MainApplication;
@@ -72,11 +55,9 @@ import com.electric.chargingpile.util.CommonParams;
import com.electric.chargingpile.util.DES3;
import com.electric.chargingpile.util.DateUtils;
import com.electric.chargingpile.util.DensityUtil;
import com.electric.chargingpile.util.ImageItem;
import com.electric.chargingpile.util.JsonUtils;
import com.electric.chargingpile.util.LoadingDialog;
import com.electric.chargingpile.util.Md5Util;
import com.electric.chargingpile.util.PublicWayONE;
import com.electric.chargingpile.util.Res;
import com.electric.chargingpile.util.ScreenUtils;
import com.electric.chargingpile.util.StatusConstants;
@@ -127,13 +108,6 @@ import cn.sharesdk.framework.ShareSDK;
import cn.sharesdk.tencent.qq.QQ;
import cn.sharesdk.wechat.friends.Wechat;
import cn.sharesdk.wechat.moments.WechatMoments;
import io.reactivex.Observable;
import io.reactivex.ObservableEmitter;
import io.reactivex.ObservableOnSubscribe;
import io.reactivex.Observer;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
import io.reactivex.schedulers.Schedulers;
import okhttp3.Call;
import pub.devrel.easypermissions.AfterPermissionGranted;
import pub.devrel.easypermissions.EasyPermissions;
@@ -585,7 +559,7 @@ public class ChargingCommentActivity extends AppCompatActivity implements View.O
                        String rtnCode = JsonUtils.getKeyResult(response, "rtnCode");
                        if ("01".equals(rtnCode)) {
                            String data = JsonUtils.getKeyResult(response, "data");
                            String is_share = JsonUtils.getKeyResult(data, "is_share");
                            String is_share = JsonUtils.getKeyResult(data,  "is_share");
                            if (EmptyUtils.isNotEmpty(data) && is_share.equals("1")) {
                                chargingShareBean = JsonUtils.parseToObjectBean(data, ChargingShareBean.class);
                                isShow = "1";
@@ -660,7 +634,6 @@ public class ChargingCommentActivity extends AppCompatActivity implements View.O
    private void addComments(ArrayList<String> fileUrlList, String thumUrl) throws Exception {
        long appTime1 = System.currentTimeMillis() / 1000;
        long updatetime = appTime1 - MainMapActivity.cha - 2;
        Log.e(TAG, "addComments: ");
        String token = String.valueOf(updatetime);
        String url = MainApplication.url + "/zhannew/basic/web/index.php/tpappcomments/add";
        Map<String,String> map=new HashMap<>();
@@ -683,7 +656,7 @@ public class ChargingCommentActivity extends AppCompatActivity implements View.O
                        map.put("file"+(i+1)+"Url", value);
                    }
                }
                if (mInsterType == 1 && mInsterType == -1){
                if (mInsterType == 1 || mInsterType == -1){
                    map.put("type", ChatRecommendBean.TARGET_TYPE_IMAGE_TEXT + "");
                    map.put("thumUrl",fileUrlList.get(0));
                }else if (mInsterType == 2) {
@@ -694,6 +667,7 @@ public class ChargingCommentActivity extends AppCompatActivity implements View.O
        }
        OkHttpUtils.get()
                .params(map)
                .url(url)
                .build()
                .execute(new StringCallback() {
@@ -913,7 +887,7 @@ public class ChargingCommentActivity extends AppCompatActivity implements View.O
        dialog.show();
//        String url = MainApplication.urlNew + "/get-sign-rest";
        String url = MainApplication.d1evTestUrl + "/api/topic/get-sign-rest2cdz";
        String url = MainApplication.d1evUrl + "/api/topic/get-sign-rest2cdz";
        if (TextUtils.isEmpty(filePath)) {
            ToastUtil.showToast(getApplicationContext(), "请重新选择视频", Toast.LENGTH_SHORT);
            return;

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

@@ -3427,10 +3427,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
    }
    private void dialogup_other() {
        now_versionCode="999";
        now_versionName="999";
        title="999";
        int code = Integer.parseInt(now_versionCode);
        if (code - getVersionCode(getApplication()) > 0) {
            alterDialog = new AlertDialogUpdate(MainMapActivity.this);

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

@@ -438,20 +438,6 @@ public class NewZhanDetailsActivity extends AppCompatActivity implements View.On
        });
        ll_chargeState = (LinearLayout) findViewById(R.id.ll_chargeState);
//        if (MainMapActivity.comments_num == null){
//            btn_zhanCommentNo.setVisibility(View.GONE);
//        }else {
//            btn_zhanCommentNo.setText("(" + MainMapActivity.comments_num + ")");
//            btn_zhanCommentNo.setVisibility(View.VISIBLE);
//        }
//        tvQianDao = (TextView) findViewById(R.id.tv_qiandao);
//        tvQianDao.setOnClickListener(this);
//        tv_chenggong = (TextView) findViewById(R.id.tv_chenggong);
//        tv_chenggong.setOnClickListener(this);
//        tv_shibai = (TextView) findViewById(R.id.tv_shibai);
//        tv_shibai.setOnClickListener(this);
//        eteCityTime();
    }
    public static void reFreshUi() {
@@ -471,13 +457,6 @@ public class NewZhanDetailsActivity extends AppCompatActivity implements View.On
    }
//    String json=JsonUtils.getKeyResult(postSta_url, "resultValue");
//    String acNum=JsonUtils.getKeyResult(json, "acNum");
//    String dcNum=JsonUtils.getKeyResult(json, "dcNum");
//    String acableNum=JsonUtils.getKeyResult(json, "acableNum");
//    String dcableNum=JsonUtils.getKeyResult(json, "dcableNum");
//    System.out.println(acNum+"= acNum  "+dcNum+"= dcNum  "+acableNum+"= acableNum  "+dcableNum+"= dcableNum  ");
    /**
     * 重新设置viewPager高度
     * <p/>
@@ -562,14 +541,10 @@ public class NewZhanDetailsActivity extends AppCompatActivity implements View.On
                break;
            case R.id.iv_back:
                isCollect(zhanname);
//                Log.e("!!!", collect.getResources().toString());
                if (collect.getTag().equals(R.drawable.icon_detail_collected)) {
                    setResult(0);
//                    startActivity(new Intent(getApplication(),MyCollectActivity.class));
                    finish();
                } else {
//                    Intent intent = new Intent();
//                    intent.putExtra("data",zhan.getZhan_name());
                    setResult(1);
                    finish();
                }
@@ -865,18 +840,8 @@ public class NewZhanDetailsActivity extends AppCompatActivity implements View.On
                break;
            case R.id.iv_collect:
                //            SQLiteDatabase db = Connector.getDatabase();
//                SharedPreferences settings = getSharedPreferences("PREFS_COLLECT", Activity.MODE_PRIVATE);
//                SharedPreferences.Editor editor = settings.edit();
//                editor.putInt("COLLECT_COUNT", ++mCreatedCount);
//
//                editor.putString("zhan_name",name.getText().toString());
//                editor.commit();
                if (zhanname != null && !zhanname.equals("")) {
                    if (mapp.sph.getInt(zhanname) == 0) {
//                    Log.d("!@!",zhan.getId()+"");
//                    Log.d("!@!",zhan.getId()+"");
                        if (mapp.sph.removeData(zhanname)) {
                            collect.setImageResource(R.drawable.icon_clect1124);
                            collect.setTag(R.drawable.icon_clect1124);
@@ -886,9 +851,7 @@ public class NewZhanDetailsActivity extends AppCompatActivity implements View.On
                            db.del(zhan_id);
                            Toast.makeText(this, "取消收藏", Toast.LENGTH_SHORT).show();
                            MobclickAgent.onEvent(getApplicationContext(), "0206", new HashMap<String, String>().put("type", "取消收藏"));
                        }/*else{
                    Toast.makeText(this,"取消收藏失败"+zhan.getId(),Toast.LENGTH_LONG).show();
                }*/
                        }
                    } else {
                        if (mapp.sph.putInt(zhanname, 0)) {
                            collect.setImageResource(R.drawable.icon_detail_collected);
@@ -906,10 +869,7 @@ public class NewZhanDetailsActivity extends AppCompatActivity implements View.On
                            db.insert(values);
                            Toast.makeText(this, "收藏成功", Toast.LENGTH_SHORT).show();
                            MobclickAgent.onEvent(getApplicationContext(), "0206", new HashMap<String, String>().put("type", "收藏"));
                        }/*else{
                   Toast.makeText(this,"收藏失败"+zhan.getId(),Toast.LENGTH_LONG).show();
               }*/
                        }
                    }
                } else {
                    Toast.makeText(this, "请稍后，正在加载数据", Toast.LENGTH_SHORT).show();

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

@@ -9,7 +9,6 @@ import android.content.IntentFilter;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Matrix;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.os.Handler;
@@ -22,7 +21,6 @@ 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;
@@ -32,21 +30,12 @@ import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
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;
import com.electric.chargingpile.application.MainApplication;
@@ -56,7 +45,6 @@ import com.electric.chargingpile.data.CommentsBean;
import com.electric.chargingpile.data.MyOtto;
import com.electric.chargingpile.data.RObject;
import com.electric.chargingpile.data.TopicBean;
import com.electric.chargingpile.data.VideoUploadResult;
import com.electric.chargingpile.engine.GlideEngine;
import com.electric.chargingpile.util.BarColorUtil;
import com.electric.chargingpile.util.Bimp;
@@ -85,12 +73,8 @@ import com.luck.picture.lib.animators.AnimationType;
import com.luck.picture.lib.config.PictureConfig;
import com.luck.picture.lib.config.PictureMimeType;
import com.luck.picture.lib.entity.LocalMedia;
import com.umeng.analytics.MobclickAgent;
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;
@@ -107,7 +91,6 @@ import java.io.IOException;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -644,7 +627,7 @@ public class ZhanCommentActivity extends AppCompatActivity implements View.OnCli
                        map.put("file"+(i+1)+"Url", value);
                    }
                }
                if (mInsterType == 1 && mInsterType == -1){
                if (mInsterType == 1 || mInsterType == -1){
                    map.put("type", ChatRecommendBean.TARGET_TYPE_IMAGE_TEXT + "");
                    map.put("thumUrl",fileUrlList.get(0));
                }else if (mInsterType == 2) {
@@ -816,7 +799,7 @@ public class ZhanCommentActivity extends AppCompatActivity implements View.OnCli
        dialog.show();
//        String url = MainApplication.urlNew + "/get-sign-rest";
        String url = MainApplication.d1evTestUrl + "/api/topic/get-sign-rest2cdz";
        String url = MainApplication.d1evUrl + "/api/topic/get-sign-rest2cdz";
        if (TextUtils.isEmpty(filePath)) {
            ToastUtil.showToast(getApplicationContext(), "请重新选择视频", Toast.LENGTH_SHORT);
            return;

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

@@ -167,14 +167,21 @@ public class NewPingLunAdapter extends BaseAdapter {
                file2Url=file2Url==null?"":file2Url;
                file3Url=file3Url==null?"":file3Url;
                String type = TextUtils.isEmpty(datas.get(position).getString("type"))?"":datas.get(position).getString("type"); //23 视频，24 图片
                String is_play = TextUtils.isEmpty(datas.get(position).getString("is_play"))?"": datas.get(position).getString("is_play")  ; //0 审核未通过 item隐藏，1 审核通过，item显示
                if (type.equals("23")){
                    holder.imgVideo.setVisibility(View.VISIBLE);
                    holder.imgStart.setVisibility(View.VISIBLE);
                    holder.imgLayout.setVisibility(View.VISIBLE);
                    holder.iv_commentPic.setVisibility(View.GONE);
                    holder.imgTwo.setVisibility(View.GONE);
                    holder.imgThree.setVisibility(View.GONE);
                    if (is_play.equals("0")){
                        holder.imgLayout.setVisibility(View.GONE);
                    }else{
                        holder.imgVideo.setVisibility(View.VISIBLE);
                        holder.imgStart.setVisibility(View.VISIBLE);
                        holder.imgLayout.setVisibility(View.VISIBLE);
                        holder.iv_commentPic.setVisibility(View.GONE);
                        holder.imgTwo.setVisibility(View.GONE);
                        holder.imgThree.setVisibility(View.GONE);
                    }
                    String thumUrl = datas.get(position).getString("thumUrl");
                    if (!TextUtils.isEmpty(thumUrl) && !TextUtils.isEmpty(fileUrl)){
@@ -189,6 +196,8 @@ public class NewPingLunAdapter extends BaseAdapter {
                                e.printStackTrace();
                            }
                        });
                    }else{
                        holder.imgLayout.setVisibility(View.GONE);
                    }
                }else {

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

@@ -434,6 +434,7 @@ public class ZhanCommentsAapter extends BaseAdapter {
                });
                String type = TextUtils.isEmpty(datas.get(position).getString("type"))?"":datas.get(position).getString("type"); //23 视频，24 图片
                String is_play = TextUtils.isEmpty(datas.get(position).getString("is_play"))?"": datas.get(position).getString("is_play")  ; //0 审核未通过 item隐藏，1 审核通过，item显示
                //父级评论图片
@@ -444,14 +445,17 @@ public class ZhanCommentsAapter extends BaseAdapter {
                file2Url= file2Url == null?"":file2Url;
                file3Url= file3Url == null?"":file3Url;
                if (type.equals("23")){
                    holder.imgVideo.setVisibility(View.VISIBLE);
                    holder.imgStart.setVisibility(View.VISIBLE);
                    holder.imgLayout.setVisibility(View.VISIBLE);
                    holder.iv_commentPic.setVisibility(View.GONE);
                    holder.imgTwo.setVisibility(View.GONE);
                    holder.imgThree.setVisibility(View.GONE);
                    if (is_play.equals("0")){
                        holder.imgLayout.setVisibility(View.GONE);
                    }else{
                        holder.imgVideo.setVisibility(View.VISIBLE);
                        holder.imgStart.setVisibility(View.VISIBLE);
                        holder.imgLayout.setVisibility(View.VISIBLE);
                        holder.iv_commentPic.setVisibility(View.GONE);
                        holder.imgTwo.setVisibility(View.GONE);
                        holder.imgThree.setVisibility(View.GONE);
                    }
                    String thumUrl = datas.get(position).getString("thumUrl");
                    if (!TextUtils.isEmpty(thumUrl) && !TextUtils.isEmpty(fileUrl)){
                        Glide.with(MainApplication.context)
@@ -466,6 +470,8 @@ public class ZhanCommentsAapter extends BaseAdapter {
                            }
                        });
                    }else{
                        holder.imgLayout.setVisibility(View.GONE);
                    }
                }else {

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

@@ -101,8 +101,8 @@ public class MainApplication extends MultiDexApplication {
//    public static String pic_url = "http://cdz.evcharge.cc/zhannew/uploadfile/";
        public static String urlNew = "http://123.56.67.7:83/api/0300";// 一电测试环境
        public static String d1evTestUrl = "https://d1ev-new.yiduyongche.com";// 评论上传视频
        public static String CDN = "https://cdn-fs.d1ev.com";
    public static String d1evUrl = "https://d1ev-new.yiduyongche.com";// 评论上传视频
    public static String CDN = "https://cdn-fs.d1ev.com";
//    public static String urlNew = "https://api.touchev.com:83/api/0300";// 一电正式环境

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

@@ -36,6 +36,7 @@ import com.amap.api.maps.AMapUtils;
import com.amap.api.maps.model.LatLng;
import com.blankj.utilcode.util.LogUtils;
import com.bumptech.glide.Glide;
import com.electric.chargingpile.BuildConfig;
import com.electric.chargingpile.R;
import com.electric.chargingpile.activity.AlterOneActivity;
import com.electric.chargingpile.activity.ChargingQianDaoActivity;
@@ -1242,7 +1243,7 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
    @Subscribe
    public void eteCityTime(RankinglistRefreshEvent rankinglistRefreshEvent) {
        String url = MainApplication.url + "/zhannew/basic/web/index.php/tpappcomments/get-comments?zhanid=" + NewZhanDetailsActivity.zhan_id + "&page=1";
        String url = MainApplication.url + "/zhannew/basic/web/index.php/tpappcomments/get-comments?zhanid=" + NewZhanDetailsActivity.zhan_id + "&page=1"+"&version_code=" + BuildConfig.VERSION_CODE;
        OkHttpUtils.get().url(url).build().execute(new StringCallback() {
            @Override
            public void onError(Call call, Exception e) {
@@ -1260,15 +1261,7 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
                        ArrayList<JSONObject> datasJson = new ArrayList<JSONObject>();
                        for (int j = 0; j < jsonArray.length(); j++) {
                            JSONObject jsonObject = (JSONObject) jsonArray.opt(j);
                            String is_play = TextUtils.isEmpty(jsonObject.getString("is_play")) ? "" : jsonObject.getString("is_play"); //0 审核未通过 item隐藏，1 审核通过，item显示
                            String type = TextUtils.isEmpty(jsonObject.getString("type")) ? "" : jsonObject.getString("type"); //23 视频，24 图片
                            if (type.equals("23")) {
                                if (is_play.equals("1")) {
                                    datasJson.add(jsonObject);
                                }
                            } else {
                                datasJson.add(jsonObject);
                            }
                            datasJson.add(jsonObject);
                        }
                        if(datasJson.size()>0){
                            rl_new_comment.setVisibility(View.VISIBLE);
@@ -1384,21 +1377,27 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
                                tv_pzan.setText(agree_num);
                            }
                            String type = TextUtils.isEmpty(jsonObject.optString("type"))?"":jsonObject.optString("type"); //23 视频，24 图片
                            //父级评论图片
                            String fileUrl = jsonObject.optString("fileUrl");
                            String file2Url = jsonObject.optString("file2Url");
                            String file3Url = jsonObject.optString("file3Url");
                            String is_play =jsonObject.optString("is_play"); //0 审核未通过 item隐藏，1 审核通过，item显示
                            String type = jsonObject.optString("type"); //23 视频，24 图片
                            if (type.equals("23")){
                                imgVideo.setVisibility(View.VISIBLE);
                                imgStart.setVisibility(View.VISIBLE);
                                imgLayout.setVisibility(View.VISIBLE);
                                iv_commentPic.setVisibility(View.GONE);
                                imgTwo.setVisibility(View.GONE);
                                imgThree.setVisibility(View.GONE);
                                if (is_play.equals("0")) {
                                    imgLayout.setVisibility(View.GONE);
                                }else{
                                    imgVideo.setVisibility(View.VISIBLE);
                                    imgStart.setVisibility(View.VISIBLE);
                                    imgLayout.setVisibility(View.VISIBLE);
                                    iv_commentPic.setVisibility(View.GONE);
                                    imgTwo.setVisibility(View.GONE);
                                    imgThree.setVisibility(View.GONE);
                                    imgLayout.setVisibility(View.VISIBLE);
                                }
                                String thumUrl = jsonObject.optString("thumUrl");
                                if (!TextUtils.isEmpty(thumUrl) && !TextUtils.isEmpty(fileUrl)){

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

@@ -17,6 +17,7 @@ import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;
import com.electric.chargingpile.BuildConfig;
import com.electric.chargingpile.R;
import com.electric.chargingpile.activity.LoginActivity;
import com.electric.chargingpile.activity.MainMapActivity;
@@ -112,7 +113,10 @@ public class NewMyMessageFragment extends Fragment {
            e.printStackTrace();
        }
        String replace = URLEncoder.encode(encode_token);
        String url = MainApplication.url + "/zhannew/basic/web/index.php/tpappcomments/getmylist?userid=" + MainApplication.userId + "&token=" + replace + "&phone=" + MainApplication.userPhone + "&password=" + URLEncoder.encode(MainApplication.userPassword);
        String url = MainApplication.url + "/zhannew/basic/web/index.php/tpappcomments/getmylist?userid="
                + MainApplication.userId + "&token=" + replace + "&phone=" + MainApplication.userPhone
                + "&password=" + URLEncoder.encode(MainApplication.userPassword)
                + "&version_code=" + BuildConfig.VERSION_NAME;
        Log.e("url====", url);
        OkHttpUtils.get()
                .url(url)

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

@@ -22,6 +22,7 @@ import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;
import com.electric.chargingpile.BuildConfig;
import com.electric.chargingpile.R;
import com.electric.chargingpile.activity.ChargingQianDaoActivity;
import com.electric.chargingpile.activity.NewZhanDetailsActivity;
@@ -227,7 +228,7 @@ public class ZhanCommentFragment extends Fragment {
    @Subscribe
    public void initCommentData(RankinglistRefreshEvent event) {
        String url = MainApplication.url + "/zhannew/basic/web/index.php/tpappcomments/get-comments?zhanid=" + NewZhanDetailsActivity.zhan_id + "&page=1";
        String url = MainApplication.url + "/zhannew/basic/web/index.php/tpappcomments/get-comments?zhanid=" + NewZhanDetailsActivity.zhan_id + "&page=1"+"&version_code=" + BuildConfig.VERSION_NAME;
//        String url = MainApplication.url+"/zhannew/basic/web/index.php/tpappcomments/get-comments?zhanid=" + NewZhanDetailsActivity.zhan_id + "&page=1";
        Log.e(TAG, "getCommentsData=" + url);
        OkHttpUtils.get().url(url)
@@ -255,15 +256,7 @@ public class ZhanCommentFragment extends Fragment {
                                for (int j = 0; j < jsonArray.length(); j++) {
                                    JSONObject jsonObject = (JSONObject) jsonArray.opt(j);
                                    String is_play = TextUtils.isEmpty( jsonObject.getString("is_play"))?"": jsonObject.getString("is_play")  ; //0 审核未通过 item隐藏，1 审核通过，item显示
                                    String type = TextUtils.isEmpty(jsonObject.getString("type"))?"":jsonObject.getString("type"); //23 视频，24 图片
                                    if (type.equals("23")){
                                        if (is_play.equals("1")){
                                            datas.add(jsonObject);
                                        }
                                    }else {
                                        datas.add(jsonObject);
                                    }
                                    datas.add(jsonObject);
                                }
//                                Log.e(TAG, "dealData: size=" + datas.size());
                                if (datas.size() == 0) {
@@ -295,7 +288,7 @@ public class ZhanCommentFragment extends Fragment {
    public void getCommentsData() {
        String url = MainApplication.url + "/zhannew/basic/web/index.php/tpappcomments/get-comments?zhanid=" + NewZhanDetailsActivity.zhan_id + "&page=1";
        String url = MainApplication.url + "/zhannew/basic/web/index.php/tpappcomments/get-comments?zhanid=" + NewZhanDetailsActivity.zhan_id + "&page=1"+"&version_code=" + BuildConfig.VERSION_NAME;
        OkHttpUtils.get().url(url)
                .build().connTimeOut(6000).readTimeOut(6000)
                .execute(new StringCallback() {
@@ -314,16 +307,7 @@ public class ZhanCommentFragment extends Fragment {
                                JSONArray jsonArray = new JSONArray(commentData);
                                for (int j = 0; j < jsonArray.length(); j++) {
                                    JSONObject jsonObject = (JSONObject) jsonArray.opt(j);
                                    String is_play = TextUtils.isEmpty( jsonObject.getString("is_play"))?"": jsonObject.getString("is_play")  ; //0 审核未通过 item隐藏，1 审核通过，item显示
                                    String type = TextUtils.isEmpty(jsonObject.getString("type"))?"":jsonObject.getString("type"); //23 视频，24 图片
                                     if (type.equals("23")){
                                        if (is_play.equals("1")){
                                            datas.add(jsonObject);
                                        }
                                    }else{
                                        datas.add(jsonObject);
                                    }
                                    datas.add(jsonObject);
                                }
                                if (datas.size() == 0) {
                                    ll_tishi.setVisibility(View.VISIBLE);
@@ -345,7 +329,7 @@ public class ZhanCommentFragment extends Fragment {
    }
    private void getPullToRefreshData(final boolean isClear) {
        String url = MainApplication.url + "/zhannew/basic/web/index.php/tpappcomments/get-comments?zhanid=" + NewZhanDetailsActivity.zhan_id + "&page=" + index;
        String url = MainApplication.url + "/zhannew/basic/web/index.php/tpappcomments/get-comments?zhanid=" + NewZhanDetailsActivity.zhan_id + "&page=" + index+"&version_code=" + BuildConfig.VERSION_NAME;
        OkHttpUtils.get().url(url)
                .build().connTimeOut(6000).readTimeOut(6000)
                .execute(new StringCallback() {
@@ -374,15 +358,7 @@ public class ZhanCommentFragment extends Fragment {
                                for (int j = 0; j < jsonArray.length(); j++) {
                                    JSONObject jsonObject = (JSONObject) jsonArray.opt(j);
                                    String is_play = TextUtils.isEmpty( jsonObject.getString("is_play"))?"": jsonObject.getString("is_play")  ; //0 审核未通过 item隐藏，1 审核通过，item显示
                                    String type = TextUtils.isEmpty(jsonObject.getString("type"))?"":jsonObject.getString("type"); //23 视频，24 图片
                                    if (type.equals("23")){
                                        if (is_play.equals("1")){
                                            datas.add(jsonObject);
                                        }
                                    }else{
                                        datas.add(jsonObject);
                                    }
                                    datas.add(jsonObject);
                                }
                                if (isClear == false) {