hy лет назад: 3
Родитель
Сommit
a20227b893

+ 2 - 5
app/src/main/AndroidManifest.xml

2
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3
    xmlns:tools="http://schemas.android.com/tools"
3
    xmlns:tools="http://schemas.android.com/tools"
4
    package="com.electric.chargingpile"
4
    package="com.electric.chargingpile"
5
    android:versionCode="102"
6
    android:versionName="3.5.16">
5
    android:versionCode="103"
6
    android:versionName="3.5.17">
7
7
8
   <!-- <uses-permission android:name="android.permission.BLUETOOTH" />
8
   <!-- <uses-permission android:name="android.permission.BLUETOOTH" />
9
    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />-->
9
    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />-->
107
            android:name=".activity.CommentVideoDetailActivity"
107
            android:name=".activity.CommentVideoDetailActivity"
108
            android:screenOrientation="portrait"/>
108
            android:screenOrientation="portrait"/>
109
        <activity
109
        <activity
110
            android:name=".activity.VideoCompressionActivity"
111
            android:screenOrientation="portrait"/>
112
        <activity
113
            android:name=".activity.SelectTopicActivity"
110
            android:name=".activity.SelectTopicActivity"
114
            android:screenOrientation="portrait"/>
111
            android:screenOrientation="portrait"/>
115
        <activity
112
        <activity

+ 4 - 30
app/src/main/java/com/electric/chargingpile/activity/ChargingCommentActivity.java

1
package com.electric.chargingpile.activity;
1
package com.electric.chargingpile.activity;
2
2
3
import android.Manifest;
3
import android.Manifest;
4
import android.app.Activity;
5
import android.app.ProgressDialog;
4
import android.app.ProgressDialog;
6
import android.content.Context;
5
import android.content.Context;
7
import android.content.Intent;
6
import android.content.Intent;
8
import android.graphics.Bitmap;
7
import android.graphics.Bitmap;
9
import android.graphics.BitmapFactory;
8
import android.graphics.BitmapFactory;
10
import android.graphics.Color;
11
import android.graphics.Matrix;
9
import android.graphics.Matrix;
12
import android.graphics.drawable.BitmapDrawable;
10
import android.graphics.drawable.BitmapDrawable;
13
import android.graphics.drawable.ColorDrawable;
14
import android.graphics.drawable.Drawable;
15
import android.os.Build;
16
import android.os.Bundle;
11
import android.os.Bundle;
17
import android.os.Handler;
12
import android.os.Handler;
18
import android.os.Message;
13
import android.os.Message;
28
import android.view.ViewGroup;
23
import android.view.ViewGroup;
29
import android.view.animation.AnimationUtils;
24
import android.view.animation.AnimationUtils;
30
import android.view.inputmethod.InputMethodManager;
25
import android.view.inputmethod.InputMethodManager;
31
import android.widget.AdapterView;
32
import android.widget.BaseAdapter;
33
import android.widget.GridView;
34
import android.widget.ImageView;
26
import android.widget.ImageView;
35
import android.widget.LinearLayout;
27
import android.widget.LinearLayout;
36
import android.widget.PopupWindow;
28
import android.widget.PopupWindow;
39
import android.widget.TextView;
31
import android.widget.TextView;
40
import android.widget.Toast;
32
import android.widget.Toast;
41
33
42
import androidx.annotation.Nullable;
43
import androidx.appcompat.app.AppCompatActivity;
34
import androidx.appcompat.app.AppCompatActivity;
44
import androidx.recyclerview.widget.GridLayoutManager;
35
import androidx.recyclerview.widget.GridLayoutManager;
45
import androidx.recyclerview.widget.RecyclerView;
36
import androidx.recyclerview.widget.RecyclerView;
46
37
47
import com.andview.refreshview.utils.Utils;
48
import com.blankj.utilcode.util.CacheUtils;
38
import com.blankj.utilcode.util.CacheUtils;
49
import com.blankj.utilcode.util.EmptyUtils;
39
import com.blankj.utilcode.util.EmptyUtils;
50
import com.blankj.utilcode.util.LogUtils;
40
import com.blankj.utilcode.util.LogUtils;
51
import com.bumptech.glide.Glide;
41
import com.bumptech.glide.Glide;
52
import com.bumptech.glide.load.DataSource;
53
import com.bumptech.glide.load.engine.GlideException;
54
import com.bumptech.glide.load.resource.bitmap.CenterCrop;
55
import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
56
import com.bumptech.glide.request.RequestListener;
57
import com.bumptech.glide.request.RequestOptions;
58
import com.bumptech.glide.request.target.Target;
59
import com.electric.chargingpile.R;
42
import com.electric.chargingpile.R;
60
import com.electric.chargingpile.adapter.GridImageAdapter;
43
import com.electric.chargingpile.adapter.GridImageAdapter;
61
import com.electric.chargingpile.application.MainApplication;
44
import com.electric.chargingpile.application.MainApplication;
72
import com.electric.chargingpile.util.DES3;
55
import com.electric.chargingpile.util.DES3;
73
import com.electric.chargingpile.util.DateUtils;
56
import com.electric.chargingpile.util.DateUtils;
74
import com.electric.chargingpile.util.DensityUtil;
57
import com.electric.chargingpile.util.DensityUtil;
75
import com.electric.chargingpile.util.ImageItem;
76
import com.electric.chargingpile.util.JsonUtils;
58
import com.electric.chargingpile.util.JsonUtils;
77
import com.electric.chargingpile.util.LoadingDialog;
59
import com.electric.chargingpile.util.LoadingDialog;
78
import com.electric.chargingpile.util.Md5Util;
60
import com.electric.chargingpile.util.Md5Util;
79
import com.electric.chargingpile.util.PublicWayONE;
80
import com.electric.chargingpile.util.Res;
61
import com.electric.chargingpile.util.Res;
81
import com.electric.chargingpile.util.ScreenUtils;
62
import com.electric.chargingpile.util.ScreenUtils;
82
import com.electric.chargingpile.util.StatusConstants;
63
import com.electric.chargingpile.util.StatusConstants;
127
import cn.sharesdk.tencent.qq.QQ;
108
import cn.sharesdk.tencent.qq.QQ;
128
import cn.sharesdk.wechat.friends.Wechat;
109
import cn.sharesdk.wechat.friends.Wechat;
129
import cn.sharesdk.wechat.moments.WechatMoments;
110
import cn.sharesdk.wechat.moments.WechatMoments;
130
import io.reactivex.Observable;
131
import io.reactivex.ObservableEmitter;
132
import io.reactivex.ObservableOnSubscribe;
133
import io.reactivex.Observer;
134
import io.reactivex.android.schedulers.AndroidSchedulers;
135
import io.reactivex.disposables.Disposable;
136
import io.reactivex.schedulers.Schedulers;
137
import okhttp3.Call;
111
import okhttp3.Call;
138
import pub.devrel.easypermissions.AfterPermissionGranted;
112
import pub.devrel.easypermissions.AfterPermissionGranted;
139
import pub.devrel.easypermissions.EasyPermissions;
113
import pub.devrel.easypermissions.EasyPermissions;
585
                        String rtnCode = JsonUtils.getKeyResult(response, "rtnCode");
559
                        String rtnCode = JsonUtils.getKeyResult(response, "rtnCode");
586
                        if ("01".equals(rtnCode)) {
560
                        if ("01".equals(rtnCode)) {
587
                            String data = JsonUtils.getKeyResult(response, "data");
561
                            String data = JsonUtils.getKeyResult(response, "data");
588
                            String is_share = JsonUtils.getKeyResult(data, "is_share");
562
                            String is_share = JsonUtils.getKeyResult(data,  "is_share");
589
                            if (EmptyUtils.isNotEmpty(data) && is_share.equals("1")) {
563
                            if (EmptyUtils.isNotEmpty(data) && is_share.equals("1")) {
590
                                chargingShareBean = JsonUtils.parseToObjectBean(data, ChargingShareBean.class);
564
                                chargingShareBean = JsonUtils.parseToObjectBean(data, ChargingShareBean.class);
591
                                isShow = "1";
565
                                isShow = "1";
660
    private void addComments(ArrayList<String> fileUrlList, String thumUrl) throws Exception {
634
    private void addComments(ArrayList<String> fileUrlList, String thumUrl) throws Exception {
661
        long appTime1 = System.currentTimeMillis() / 1000;
635
        long appTime1 = System.currentTimeMillis() / 1000;
662
        long updatetime = appTime1 - MainMapActivity.cha - 2;
636
        long updatetime = appTime1 - MainMapActivity.cha - 2;
663
        Log.e(TAG, "addComments: ");
664
        String token = String.valueOf(updatetime);
637
        String token = String.valueOf(updatetime);
665
        String url = MainApplication.url + "/zhannew/basic/web/index.php/tpappcomments/add";
638
        String url = MainApplication.url + "/zhannew/basic/web/index.php/tpappcomments/add";
666
        Map<String,String> map=new HashMap<>();
639
        Map<String,String> map=new HashMap<>();
683
                        map.put("file"+(i+1)+"Url", value);
656
                        map.put("file"+(i+1)+"Url", value);
684
                    }
657
                    }
685
                }
658
                }
686
                if (mInsterType == 1 && mInsterType == -1){
659
                if (mInsterType == 1 || mInsterType == -1){
687
                    map.put("type", ChatRecommendBean.TARGET_TYPE_IMAGE_TEXT + "");
660
                    map.put("type", ChatRecommendBean.TARGET_TYPE_IMAGE_TEXT + "");
688
                    map.put("thumUrl",fileUrlList.get(0));
661
                    map.put("thumUrl",fileUrlList.get(0));
689
                }else if (mInsterType == 2) {
662
                }else if (mInsterType == 2) {
694
        }
667
        }
695
668
696
        OkHttpUtils.get()
669
        OkHttpUtils.get()
670
                .params(map)
697
                .url(url)
671
                .url(url)
698
                .build()
672
                .build()
699
                .execute(new StringCallback() {
673
                .execute(new StringCallback() {
913
        dialog.show();
887
        dialog.show();
914
888
915
//        String url = MainApplication.urlNew + "/get-sign-rest";
889
//        String url = MainApplication.urlNew + "/get-sign-rest";
916
        String url = MainApplication.d1evTestUrl + "/api/topic/get-sign-rest2cdz";
890
        String url = MainApplication.d1evUrl + "/api/topic/get-sign-rest2cdz";
917
        if (TextUtils.isEmpty(filePath)) {
891
        if (TextUtils.isEmpty(filePath)) {
918
            ToastUtil.showToast(getApplicationContext(), "请重新选择视频", Toast.LENGTH_SHORT);
892
            ToastUtil.showToast(getApplicationContext(), "请重新选择视频", Toast.LENGTH_SHORT);
919
            return;
893
            return;

+ 0 - 4
app/src/main/java/com/electric/chargingpile/activity/MainMapActivity.java

3427
    }
3427
    }
3428
3428
3429
    private void dialogup_other() {
3429
    private void dialogup_other() {
3430
3431
        now_versionCode="999";
3432
        now_versionName="999";
3433
        title="999";
3434
        int code = Integer.parseInt(now_versionCode);
3430
        int code = Integer.parseInt(now_versionCode);
3435
        if (code - getVersionCode(getApplication()) > 0) {
3431
        if (code - getVersionCode(getApplication()) > 0) {
3436
            alterDialog = new AlertDialogUpdate(MainMapActivity.this);
3432
            alterDialog = new AlertDialogUpdate(MainMapActivity.this);

+ 2 - 42
app/src/main/java/com/electric/chargingpile/activity/NewZhanDetailsActivity.java

438
        });
438
        });
439
        ll_chargeState = (LinearLayout) findViewById(R.id.ll_chargeState);
439
        ll_chargeState = (LinearLayout) findViewById(R.id.ll_chargeState);
440
440
441
//        if (MainMapActivity.comments_num == null){
442
//            btn_zhanCommentNo.setVisibility(View.GONE);
443
//        }else {
444
//            btn_zhanCommentNo.setText("(" + MainMapActivity.comments_num + ")");
445
//            btn_zhanCommentNo.setVisibility(View.VISIBLE);
446
//        }
447
//        tvQianDao = (TextView) findViewById(R.id.tv_qiandao);
448
//        tvQianDao.setOnClickListener(this);
449
450
//        tv_chenggong = (TextView) findViewById(R.id.tv_chenggong);
451
//        tv_chenggong.setOnClickListener(this);
452
//        tv_shibai = (TextView) findViewById(R.id.tv_shibai);
453
//        tv_shibai.setOnClickListener(this);
454
//        eteCityTime();
455
    }
441
    }
456
442
457
    public static void reFreshUi() {
443
    public static void reFreshUi() {
471
    }
457
    }
472
458
473
459
474
//    String json=JsonUtils.getKeyResult(postSta_url, "resultValue");
475
//    String acNum=JsonUtils.getKeyResult(json, "acNum");
476
//    String dcNum=JsonUtils.getKeyResult(json, "dcNum");
477
//    String acableNum=JsonUtils.getKeyResult(json, "acableNum");
478
//    String dcableNum=JsonUtils.getKeyResult(json, "dcableNum");
479
//    System.out.println(acNum+"= acNum  "+dcNum+"= dcNum  "+acableNum+"= acableNum  "+dcableNum+"= dcableNum  ");
480
481
    /**
460
    /**
482
     * 重新设置viewPager高度
461
     * 重新设置viewPager高度
483
     * <p/>
462
     * <p/>
562
                break;
541
                break;
563
            case R.id.iv_back:
542
            case R.id.iv_back:
564
                isCollect(zhanname);
543
                isCollect(zhanname);
565
//                Log.e("!!!", collect.getResources().toString());
566
                if (collect.getTag().equals(R.drawable.icon_detail_collected)) {
544
                if (collect.getTag().equals(R.drawable.icon_detail_collected)) {
567
                    setResult(0);
545
                    setResult(0);
568
//                    startActivity(new Intent(getApplication(),MyCollectActivity.class));
569
                    finish();
546
                    finish();
570
                } else {
547
                } else {
571
//                    Intent intent = new Intent();
572
//                    intent.putExtra("data",zhan.getZhan_name());
573
                    setResult(1);
548
                    setResult(1);
574
                    finish();
549
                    finish();
575
                }
550
                }
865
                break;
840
                break;
866
841
867
            case R.id.iv_collect:
842
            case R.id.iv_collect:
868
                //            SQLiteDatabase db = Connector.getDatabase();
869
//                SharedPreferences settings = getSharedPreferences("PREFS_COLLECT", Activity.MODE_PRIVATE);
870
//                SharedPreferences.Editor editor = settings.edit();
871
//                editor.putInt("COLLECT_COUNT", ++mCreatedCount);
872
//
873
//                editor.putString("zhan_name",name.getText().toString());
874
//                editor.commit();
875
876
                if (zhanname != null && !zhanname.equals("")) {
843
                if (zhanname != null && !zhanname.equals("")) {
877
                    if (mapp.sph.getInt(zhanname) == 0) {
844
                    if (mapp.sph.getInt(zhanname) == 0) {
878
//                    Log.d("!@!",zhan.getId()+"");
879
//                    Log.d("!@!",zhan.getId()+"");
880
                        if (mapp.sph.removeData(zhanname)) {
845
                        if (mapp.sph.removeData(zhanname)) {
881
                            collect.setImageResource(R.drawable.icon_clect1124);
846
                            collect.setImageResource(R.drawable.icon_clect1124);
882
                            collect.setTag(R.drawable.icon_clect1124);
847
                            collect.setTag(R.drawable.icon_clect1124);
886
                            db.del(zhan_id);
851
                            db.del(zhan_id);
887
                            Toast.makeText(this, "取消收藏", Toast.LENGTH_SHORT).show();
852
                            Toast.makeText(this, "取消收藏", Toast.LENGTH_SHORT).show();
888
                            MobclickAgent.onEvent(getApplicationContext(), "0206", new HashMap<String, String>().put("type", "取消收藏"));
853
                            MobclickAgent.onEvent(getApplicationContext(), "0206", new HashMap<String, String>().put("type", "取消收藏"));
889
                        }/*else{
890
                    Toast.makeText(this,"取消收藏失败"+zhan.getId(),Toast.LENGTH_LONG).show();
891
                }*/
854
                        }
892
                    } else {
855
                    } else {
893
                        if (mapp.sph.putInt(zhanname, 0)) {
856
                        if (mapp.sph.putInt(zhanname, 0)) {
894
                            collect.setImageResource(R.drawable.icon_detail_collected);
857
                            collect.setImageResource(R.drawable.icon_detail_collected);
906
                            db.insert(values);
869
                            db.insert(values);
907
                            Toast.makeText(this, "收藏成功", Toast.LENGTH_SHORT).show();
870
                            Toast.makeText(this, "收藏成功", Toast.LENGTH_SHORT).show();
908
                            MobclickAgent.onEvent(getApplicationContext(), "0206", new HashMap<String, String>().put("type", "收藏"));
871
                            MobclickAgent.onEvent(getApplicationContext(), "0206", new HashMap<String, String>().put("type", "收藏"));
909
                        }/*else{
910
                   Toast.makeText(this,"收藏失败"+zhan.getId(),Toast.LENGTH_LONG).show();
911
               }*/
912
872
                        }
913
                    }
873
                    }
914
                } else {
874
                } else {
915
                    Toast.makeText(this, "请稍后,正在加载数据", Toast.LENGTH_SHORT).show();
875
                    Toast.makeText(this, "请稍后,正在加载数据", Toast.LENGTH_SHORT).show();

+ 2 - 19
app/src/main/java/com/electric/chargingpile/activity/ZhanCommentActivity.java

9
import android.graphics.Bitmap;
9
import android.graphics.Bitmap;
10
import android.graphics.BitmapFactory;
10
import android.graphics.BitmapFactory;
11
import android.graphics.Matrix;
11
import android.graphics.Matrix;
12
import android.graphics.drawable.Drawable;
13
import android.os.Bundle;
12
import android.os.Bundle;
14
13
15
import android.os.Handler;
14
import android.os.Handler;
22
import android.util.Log;
21
import android.util.Log;
23
import android.view.LayoutInflater;
22
import android.view.LayoutInflater;
24
import android.view.View;
23
import android.view.View;
25
import android.view.ViewGroup;
26
import android.view.animation.AnimationUtils;
24
import android.view.animation.AnimationUtils;
27
import android.view.inputmethod.InputMethodManager;
25
import android.view.inputmethod.InputMethodManager;
28
import android.widget.ImageView;
26
import android.widget.ImageView;
32
import android.widget.Toast;
30
import android.widget.Toast;
33
31
34
import androidx.annotation.NonNull;
32
import androidx.annotation.NonNull;
35
import androidx.annotation.Nullable;
36
import androidx.appcompat.app.AppCompatActivity;
33
import androidx.appcompat.app.AppCompatActivity;
37
import androidx.recyclerview.widget.GridLayoutManager;
34
import androidx.recyclerview.widget.GridLayoutManager;
38
import androidx.recyclerview.widget.RecyclerView;
35
import androidx.recyclerview.widget.RecyclerView;
39
36
40
import com.andview.refreshview.utils.Utils;
41
import com.blankj.utilcode.util.CacheUtils;
37
import com.blankj.utilcode.util.CacheUtils;
42
import com.bumptech.glide.Glide;
38
import com.bumptech.glide.Glide;
43
import com.bumptech.glide.load.DataSource;
44
import com.bumptech.glide.load.engine.GlideException;
45
import com.bumptech.glide.load.resource.bitmap.CenterCrop;
46
import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
47
import com.bumptech.glide.request.RequestListener;
48
import com.bumptech.glide.request.RequestOptions;
49
import com.bumptech.glide.request.target.Target;
50
import com.electric.chargingpile.R;
39
import com.electric.chargingpile.R;
51
import com.electric.chargingpile.adapter.GridImageAdapter;
40
import com.electric.chargingpile.adapter.GridImageAdapter;
52
import com.electric.chargingpile.application.MainApplication;
41
import com.electric.chargingpile.application.MainApplication;
56
import com.electric.chargingpile.data.MyOtto;
45
import com.electric.chargingpile.data.MyOtto;
57
import com.electric.chargingpile.data.RObject;
46
import com.electric.chargingpile.data.RObject;
58
import com.electric.chargingpile.data.TopicBean;
47
import com.electric.chargingpile.data.TopicBean;
59
import com.electric.chargingpile.data.VideoUploadResult;
60
import com.electric.chargingpile.engine.GlideEngine;
48
import com.electric.chargingpile.engine.GlideEngine;
61
import com.electric.chargingpile.util.BarColorUtil;
49
import com.electric.chargingpile.util.BarColorUtil;
62
import com.electric.chargingpile.util.Bimp;
50
import com.electric.chargingpile.util.Bimp;
85
import com.luck.picture.lib.config.PictureConfig;
73
import com.luck.picture.lib.config.PictureConfig;
86
import com.luck.picture.lib.config.PictureMimeType;
74
import com.luck.picture.lib.config.PictureMimeType;
87
import com.luck.picture.lib.entity.LocalMedia;
75
import com.luck.picture.lib.entity.LocalMedia;
88
import com.umeng.analytics.MobclickAgent;
89
import com.upyun.library.common.SerialUploader;
76
import com.upyun.library.common.SerialUploader;
90
import com.upyun.library.common.UploadEngine;
91
import com.upyun.library.listener.UpCompleteListener;
77
import com.upyun.library.listener.UpCompleteListener;
92
import com.upyun.library.listener.UpProgressListener;
93
import com.zhy.autolayout.AutoLinearLayout;
94
import com.zhy.http.okhttp.OkHttpUtils;
78
import com.zhy.http.okhttp.OkHttpUtils;
95
import com.zhy.http.okhttp.callback.StringCallback;
79
import com.zhy.http.okhttp.callback.StringCallback;
96
import com.zhy.view.flowlayout.FlowLayout;
80
import com.zhy.view.flowlayout.FlowLayout;
107
import java.net.URLEncoder;
91
import java.net.URLEncoder;
108
import java.util.ArrayList;
92
import java.util.ArrayList;
109
import java.util.HashMap;
93
import java.util.HashMap;
110
import java.util.Iterator;
111
import java.util.List;
94
import java.util.List;
112
import java.util.Map;
95
import java.util.Map;
113
import java.util.Set;
96
import java.util.Set;
644
                        map.put("file"+(i+1)+"Url", value);
627
                        map.put("file"+(i+1)+"Url", value);
645
                    }
628
                    }
646
                }
629
                }
647
                if (mInsterType == 1 && mInsterType == -1){
630
                if (mInsterType == 1 || mInsterType == -1){
648
                    map.put("type", ChatRecommendBean.TARGET_TYPE_IMAGE_TEXT + "");
631
                    map.put("type", ChatRecommendBean.TARGET_TYPE_IMAGE_TEXT + "");
649
                    map.put("thumUrl",fileUrlList.get(0));
632
                    map.put("thumUrl",fileUrlList.get(0));
650
                }else if (mInsterType == 2) {
633
                }else if (mInsterType == 2) {
816
        dialog.show();
799
        dialog.show();
817
800
818
//        String url = MainApplication.urlNew + "/get-sign-rest";
801
//        String url = MainApplication.urlNew + "/get-sign-rest";
819
        String url = MainApplication.d1evTestUrl + "/api/topic/get-sign-rest2cdz";
802
        String url = MainApplication.d1evUrl + "/api/topic/get-sign-rest2cdz";
820
        if (TextUtils.isEmpty(filePath)) {
803
        if (TextUtils.isEmpty(filePath)) {
821
            ToastUtil.showToast(getApplicationContext(), "请重新选择视频", Toast.LENGTH_SHORT);
804
            ToastUtil.showToast(getApplicationContext(), "请重新选择视频", Toast.LENGTH_SHORT);
822
            return;
805
            return;

+ 15 - 6
app/src/main/java/com/electric/chargingpile/adapter/NewPingLunAdapter.java

167
                file2Url=file2Url==null?"":file2Url;
167
                file2Url=file2Url==null?"":file2Url;
168
                file3Url=file3Url==null?"":file3Url;
168
                file3Url=file3Url==null?"":file3Url;
169
                String type = TextUtils.isEmpty(datas.get(position).getString("type"))?"":datas.get(position).getString("type"); //23 视频,24 图片
169
                String type = TextUtils.isEmpty(datas.get(position).getString("type"))?"":datas.get(position).getString("type"); //23 视频,24 图片
170
                String is_play = TextUtils.isEmpty(datas.get(position).getString("is_play"))?"": datas.get(position).getString("is_play")  ; //0 审核未通过 item隐藏,1 审核通过,item显示
171
170
                if (type.equals("23")){
172
                if (type.equals("23")){
171
                    holder.imgVideo.setVisibility(View.VISIBLE);
172
                    holder.imgStart.setVisibility(View.VISIBLE);
173
                    holder.imgLayout.setVisibility(View.VISIBLE);
174
173
175
                    holder.iv_commentPic.setVisibility(View.GONE);
176
                    holder.imgTwo.setVisibility(View.GONE);
177
                    holder.imgThree.setVisibility(View.GONE);
174
                    if (is_play.equals("0")){
175
                        holder.imgLayout.setVisibility(View.GONE);
176
                    }else{
177
                        holder.imgVideo.setVisibility(View.VISIBLE);
178
                        holder.imgStart.setVisibility(View.VISIBLE);
179
                        holder.imgLayout.setVisibility(View.VISIBLE);
180
181
                        holder.iv_commentPic.setVisibility(View.GONE);
182
                        holder.imgTwo.setVisibility(View.GONE);
183
                        holder.imgThree.setVisibility(View.GONE);
184
                    }
178
185
179
                    String thumUrl = datas.get(position).getString("thumUrl");
186
                    String thumUrl = datas.get(position).getString("thumUrl");
180
                    if (!TextUtils.isEmpty(thumUrl) && !TextUtils.isEmpty(fileUrl)){
187
                    if (!TextUtils.isEmpty(thumUrl) && !TextUtils.isEmpty(fileUrl)){
189
                                e.printStackTrace();
196
                                e.printStackTrace();
190
                            }
197
                            }
191
                        });
198
                        });
199
                    }else{
200
                        holder.imgLayout.setVisibility(View.GONE);
192
                    }
201
                    }
193
                }else {
202
                }else {
194
203

+ 13 - 7
app/src/main/java/com/electric/chargingpile/adapter/ZhanCommentsAapter.java

434
                });
434
                });
435
435
436
                String type = TextUtils.isEmpty(datas.get(position).getString("type"))?"":datas.get(position).getString("type"); //23 视频,24 图片
436
                String type = TextUtils.isEmpty(datas.get(position).getString("type"))?"":datas.get(position).getString("type"); //23 视频,24 图片
437
                String is_play = TextUtils.isEmpty(datas.get(position).getString("is_play"))?"": datas.get(position).getString("is_play")  ; //0 审核未通过 item隐藏,1 审核通过,item显示
437
438
438
439
439
                //父级评论图片
440
                //父级评论图片
444
                file2Url= file2Url == null?"":file2Url;
445
                file2Url= file2Url == null?"":file2Url;
445
                file3Url= file3Url == null?"":file3Url;
446
                file3Url= file3Url == null?"":file3Url;
446
                if (type.equals("23")){
447
                if (type.equals("23")){
447
                    holder.imgVideo.setVisibility(View.VISIBLE);
448
                    holder.imgStart.setVisibility(View.VISIBLE);
449
                    holder.imgLayout.setVisibility(View.VISIBLE);
450
451
                    holder.iv_commentPic.setVisibility(View.GONE);
452
                    holder.imgTwo.setVisibility(View.GONE);
453
                    holder.imgThree.setVisibility(View.GONE);
448
                    if (is_play.equals("0")){
449
                        holder.imgLayout.setVisibility(View.GONE);
450
                    }else{
451
                        holder.imgVideo.setVisibility(View.VISIBLE);
452
                        holder.imgStart.setVisibility(View.VISIBLE);
453
                        holder.imgLayout.setVisibility(View.VISIBLE);
454
454
455
                        holder.iv_commentPic.setVisibility(View.GONE);
456
                        holder.imgTwo.setVisibility(View.GONE);
457
                        holder.imgThree.setVisibility(View.GONE);
458
                    }
455
                    String thumUrl = datas.get(position).getString("thumUrl");
459
                    String thumUrl = datas.get(position).getString("thumUrl");
456
                    if (!TextUtils.isEmpty(thumUrl) && !TextUtils.isEmpty(fileUrl)){
460
                    if (!TextUtils.isEmpty(thumUrl) && !TextUtils.isEmpty(fileUrl)){
457
                        Glide.with(MainApplication.context)
461
                        Glide.with(MainApplication.context)
466
                            }
470
                            }
467
471
468
                        });
472
                        });
473
                    }else{
474
                        holder.imgLayout.setVisibility(View.GONE);
469
                    }
475
                    }
470
476
471
                }else {
477
                }else {

+ 2 - 2
app/src/main/java/com/electric/chargingpile/application/MainApplication.java

101
//    public static String pic_url = "http://cdz.evcharge.cc/zhannew/uploadfile/";
101
//    public static String pic_url = "http://cdz.evcharge.cc/zhannew/uploadfile/";
102

102

103
        public static String urlNew = "http://123.56.67.7:83/api/0300";// 一电测试环境
103
        public static String urlNew = "http://123.56.67.7:83/api/0300";// 一电测试环境
104
        public static String d1evTestUrl = "https://d1ev-new.yiduyongche.com";// 评论上传视频
105
        public static String CDN = "https://cdn-fs.d1ev.com";
104
    public static String d1evUrl = "https://d1ev-new.yiduyongche.com";// 评论上传视频
105
    public static String CDN = "https://cdn-fs.d1ev.com";
106
//    public static String urlNew = "https://api.touchev.com:83/api/0300";// 一电正式环境
106
//    public static String urlNew = "https://api.touchev.com:83/api/0300";// 一电正式环境
107

107

108

108


+ 18 - 19
app/src/main/java/com/electric/chargingpile/fragment/DetailsFragment.java

36
import com.amap.api.maps.model.LatLng;
36
import com.amap.api.maps.model.LatLng;
37
import com.blankj.utilcode.util.LogUtils;
37
import com.blankj.utilcode.util.LogUtils;
38
import com.bumptech.glide.Glide;
38
import com.bumptech.glide.Glide;
39
import com.electric.chargingpile.BuildConfig;
39
import com.electric.chargingpile.R;
40
import com.electric.chargingpile.R;
40
import com.electric.chargingpile.activity.AlterOneActivity;
41
import com.electric.chargingpile.activity.AlterOneActivity;
41
import com.electric.chargingpile.activity.ChargingQianDaoActivity;
42
import com.electric.chargingpile.activity.ChargingQianDaoActivity;
1242
1243
1243
    @Subscribe
1244
    @Subscribe
1244
    public void eteCityTime(RankinglistRefreshEvent rankinglistRefreshEvent) {
1245
    public void eteCityTime(RankinglistRefreshEvent rankinglistRefreshEvent) {
1245
        String url = MainApplication.url + "/zhannew/basic/web/index.php/tpappcomments/get-comments?zhanid=" + NewZhanDetailsActivity.zhan_id + "&page=1";
1246
        String url = MainApplication.url + "/zhannew/basic/web/index.php/tpappcomments/get-comments?zhanid=" + NewZhanDetailsActivity.zhan_id + "&page=1"+"&version_code=" + BuildConfig.VERSION_CODE;
1246
        OkHttpUtils.get().url(url).build().execute(new StringCallback() {
1247
        OkHttpUtils.get().url(url).build().execute(new StringCallback() {
1247
            @Override
1248
            @Override
1248
            public void onError(Call call, Exception e) {
1249
            public void onError(Call call, Exception e) {
1260
                        ArrayList<JSONObject> datasJson = new ArrayList<JSONObject>();
1261
                        ArrayList<JSONObject> datasJson = new ArrayList<JSONObject>();
1261
                        for (int j = 0; j < jsonArray.length(); j++) {
1262
                        for (int j = 0; j < jsonArray.length(); j++) {
1262
                            JSONObject jsonObject = (JSONObject) jsonArray.opt(j);
1263
                            JSONObject jsonObject = (JSONObject) jsonArray.opt(j);
1263
                            String is_play = TextUtils.isEmpty(jsonObject.getString("is_play")) ? "" : jsonObject.getString("is_play"); //0 审核未通过 item隐藏,1 审核通过,item显示
1264
                            String type = TextUtils.isEmpty(jsonObject.getString("type")) ? "" : jsonObject.getString("type"); //23 视频,24 图片
1265
                            if (type.equals("23")) {
1266
                                if (is_play.equals("1")) {
1267
                                    datasJson.add(jsonObject);
1268
                                }
1269
                            } else {
1270
                                datasJson.add(jsonObject);
1271
                            }
1264
                            datasJson.add(jsonObject);
1272
                        }
1265
                        }
1273
                        if(datasJson.size()>0){
1266
                        if(datasJson.size()>0){
1274
                            rl_new_comment.setVisibility(View.VISIBLE);
1267
                            rl_new_comment.setVisibility(View.VISIBLE);
1384
                                tv_pzan.setText(agree_num);
1377
                                tv_pzan.setText(agree_num);
1385
                            }
1378
                            }
1386
1379
1387
                            String type = TextUtils.isEmpty(jsonObject.optString("type"))?"":jsonObject.optString("type"); //23 视频,24 图片
1388
1389
1390
                            //父级评论图片
1380
                            //父级评论图片
1391
                            String fileUrl = jsonObject.optString("fileUrl");
1381
                            String fileUrl = jsonObject.optString("fileUrl");
1392
                            String file2Url = jsonObject.optString("file2Url");
1382
                            String file2Url = jsonObject.optString("file2Url");
1393
                            String file3Url = jsonObject.optString("file3Url");
1383
                            String file3Url = jsonObject.optString("file3Url");
1384
                            String is_play =jsonObject.optString("is_play"); //0 审核未通过 item隐藏,1 审核通过,item显示
1385
                            String type = jsonObject.optString("type"); //23 视频,24 图片
1386
1394
                            if (type.equals("23")){
1387
                            if (type.equals("23")){
1395
                                imgVideo.setVisibility(View.VISIBLE);
1396
                                imgStart.setVisibility(View.VISIBLE);
1397
                                imgLayout.setVisibility(View.VISIBLE);
1398
1388
1399
                                iv_commentPic.setVisibility(View.GONE);
1400
                                imgTwo.setVisibility(View.GONE);
1401
                                imgThree.setVisibility(View.GONE);
1389
                                if (is_play.equals("0")) {
1390
                                    imgLayout.setVisibility(View.GONE);
1391
                                }else{
1392
                                    imgVideo.setVisibility(View.VISIBLE);
1393
                                    imgStart.setVisibility(View.VISIBLE);
1394
                                    imgLayout.setVisibility(View.VISIBLE);
1395
                                    iv_commentPic.setVisibility(View.GONE);
1396
                                    imgTwo.setVisibility(View.GONE);
1397
                                    imgThree.setVisibility(View.GONE);
1398
                                    imgLayout.setVisibility(View.VISIBLE);
1399
                                }
1400
1402
1401
1403
                                String thumUrl = jsonObject.optString("thumUrl");
1402
                                String thumUrl = jsonObject.optString("thumUrl");
1404
                                if (!TextUtils.isEmpty(thumUrl) && !TextUtils.isEmpty(fileUrl)){
1403
                                if (!TextUtils.isEmpty(thumUrl) && !TextUtils.isEmpty(fileUrl)){

+ 5 - 1
app/src/main/java/com/electric/chargingpile/fragment/NewMyMessageFragment.java

17
import android.widget.TextView;
17
import android.widget.TextView;
18
import android.widget.Toast;
18
import android.widget.Toast;
19
19
20
import com.electric.chargingpile.BuildConfig;
20
import com.electric.chargingpile.R;
21
import com.electric.chargingpile.R;
21
import com.electric.chargingpile.activity.LoginActivity;
22
import com.electric.chargingpile.activity.LoginActivity;
22
import com.electric.chargingpile.activity.MainMapActivity;
23
import com.electric.chargingpile.activity.MainMapActivity;
112
            e.printStackTrace();
113
            e.printStackTrace();
113
        }
114
        }
114
        String replace = URLEncoder.encode(encode_token);
115
        String replace = URLEncoder.encode(encode_token);
115
        String url = MainApplication.url + "/zhannew/basic/web/index.php/tpappcomments/getmylist?userid=" + MainApplication.userId + "&token=" + replace + "&phone=" + MainApplication.userPhone + "&password=" + URLEncoder.encode(MainApplication.userPassword);
116
        String url = MainApplication.url + "/zhannew/basic/web/index.php/tpappcomments/getmylist?userid="
117
                + MainApplication.userId + "&token=" + replace + "&phone=" + MainApplication.userPhone
118
                + "&password=" + URLEncoder.encode(MainApplication.userPassword)
119
                + "&version_code=" + BuildConfig.VERSION_NAME;
116
        Log.e("url====", url);
120
        Log.e("url====", url);
117
        OkHttpUtils.get()
121
        OkHttpUtils.get()
118
                .url(url)
122
                .url(url)

+ 7 - 31
app/src/main/java/com/electric/chargingpile/fragment/ZhanCommentFragment.java

22
import android.widget.TextView;
22
import android.widget.TextView;
23
import android.widget.Toast;
23
import android.widget.Toast;
24
24
25
import com.electric.chargingpile.BuildConfig;
25
import com.electric.chargingpile.R;
26
import com.electric.chargingpile.R;
26
import com.electric.chargingpile.activity.ChargingQianDaoActivity;
27
import com.electric.chargingpile.activity.ChargingQianDaoActivity;
27
import com.electric.chargingpile.activity.NewZhanDetailsActivity;
28
import com.electric.chargingpile.activity.NewZhanDetailsActivity;
227
228
228
    @Subscribe
229
    @Subscribe
229
    public void initCommentData(RankinglistRefreshEvent event) {
230
    public void initCommentData(RankinglistRefreshEvent event) {
230
        String url = MainApplication.url + "/zhannew/basic/web/index.php/tpappcomments/get-comments?zhanid=" + NewZhanDetailsActivity.zhan_id + "&page=1";
231
        String url = MainApplication.url + "/zhannew/basic/web/index.php/tpappcomments/get-comments?zhanid=" + NewZhanDetailsActivity.zhan_id + "&page=1"+"&version_code=" + BuildConfig.VERSION_NAME;
231
//        String url = MainApplication.url+"/zhannew/basic/web/index.php/tpappcomments/get-comments?zhanid=" + NewZhanDetailsActivity.zhan_id + "&page=1";
232
//        String url = MainApplication.url+"/zhannew/basic/web/index.php/tpappcomments/get-comments?zhanid=" + NewZhanDetailsActivity.zhan_id + "&page=1";
232
        Log.e(TAG, "getCommentsData=" + url);
233
        Log.e(TAG, "getCommentsData=" + url);
233
        OkHttpUtils.get().url(url)
234
        OkHttpUtils.get().url(url)
255
256
256
                                for (int j = 0; j < jsonArray.length(); j++) {
257
                                for (int j = 0; j < jsonArray.length(); j++) {
257
                                    JSONObject jsonObject = (JSONObject) jsonArray.opt(j);
258
                                    JSONObject jsonObject = (JSONObject) jsonArray.opt(j);
258
                                    String is_play = TextUtils.isEmpty( jsonObject.getString("is_play"))?"": jsonObject.getString("is_play")  ; //0 审核未通过 item隐藏,1 审核通过,item显示
259
                                    String type = TextUtils.isEmpty(jsonObject.getString("type"))?"":jsonObject.getString("type"); //23 视频,24 图片
260
                                    if (type.equals("23")){
261
                                        if (is_play.equals("1")){
262
                                            datas.add(jsonObject);
263
                                        }
264
                                    }else {
265
                                        datas.add(jsonObject);
266
                                    }
259
                                    datas.add(jsonObject);
267
                                }
260
                                }
268
//                                Log.e(TAG, "dealData: size=" + datas.size());
261
//                                Log.e(TAG, "dealData: size=" + datas.size());
269
                                if (datas.size() == 0) {
262
                                if (datas.size() == 0) {
295
288
296
289
297
    public void getCommentsData() {
290
    public void getCommentsData() {
298
        String url = MainApplication.url + "/zhannew/basic/web/index.php/tpappcomments/get-comments?zhanid=" + NewZhanDetailsActivity.zhan_id + "&page=1";
291
        String url = MainApplication.url + "/zhannew/basic/web/index.php/tpappcomments/get-comments?zhanid=" + NewZhanDetailsActivity.zhan_id + "&page=1"+"&version_code=" + BuildConfig.VERSION_NAME;
299
        OkHttpUtils.get().url(url)
292
        OkHttpUtils.get().url(url)
300
                .build().connTimeOut(6000).readTimeOut(6000)
293
                .build().connTimeOut(6000).readTimeOut(6000)
301
                .execute(new StringCallback() {
294
                .execute(new StringCallback() {
314
                                JSONArray jsonArray = new JSONArray(commentData);
307
                                JSONArray jsonArray = new JSONArray(commentData);
315
                                for (int j = 0; j < jsonArray.length(); j++) {
308
                                for (int j = 0; j < jsonArray.length(); j++) {
316
                                    JSONObject jsonObject = (JSONObject) jsonArray.opt(j);
309
                                    JSONObject jsonObject = (JSONObject) jsonArray.opt(j);
317
318
                                    String is_play = TextUtils.isEmpty( jsonObject.getString("is_play"))?"": jsonObject.getString("is_play")  ; //0 审核未通过 item隐藏,1 审核通过,item显示
319
                                    String type = TextUtils.isEmpty(jsonObject.getString("type"))?"":jsonObject.getString("type"); //23 视频,24 图片
320
                                     if (type.equals("23")){
321
                                        if (is_play.equals("1")){
322
                                            datas.add(jsonObject);
323
                                        }
324
                                    }else{
325
                                        datas.add(jsonObject);
326
                                    }
310
                                    datas.add(jsonObject);
327
                                }
311
                                }
328
                                if (datas.size() == 0) {
312
                                if (datas.size() == 0) {
329
                                    ll_tishi.setVisibility(View.VISIBLE);
313
                                    ll_tishi.setVisibility(View.VISIBLE);
345
    }
329
    }
346
330
347
    private void getPullToRefreshData(final boolean isClear) {
331
    private void getPullToRefreshData(final boolean isClear) {
348
        String url = MainApplication.url + "/zhannew/basic/web/index.php/tpappcomments/get-comments?zhanid=" + NewZhanDetailsActivity.zhan_id + "&page=" + index;
332
        String url = MainApplication.url + "/zhannew/basic/web/index.php/tpappcomments/get-comments?zhanid=" + NewZhanDetailsActivity.zhan_id + "&page=" + index+"&version_code=" + BuildConfig.VERSION_NAME;
349
        OkHttpUtils.get().url(url)
333
        OkHttpUtils.get().url(url)
350
                .build().connTimeOut(6000).readTimeOut(6000)
334
                .build().connTimeOut(6000).readTimeOut(6000)
351
                .execute(new StringCallback() {
335
                .execute(new StringCallback() {
374
358
375
                                for (int j = 0; j < jsonArray.length(); j++) {
359
                                for (int j = 0; j < jsonArray.length(); j++) {
376
                                    JSONObject jsonObject = (JSONObject) jsonArray.opt(j);
360
                                    JSONObject jsonObject = (JSONObject) jsonArray.opt(j);
377
                                    String is_play = TextUtils.isEmpty( jsonObject.getString("is_play"))?"": jsonObject.getString("is_play")  ; //0 审核未通过 item隐藏,1 审核通过,item显示
378
                                    String type = TextUtils.isEmpty(jsonObject.getString("type"))?"":jsonObject.getString("type"); //23 视频,24 图片
379
                                    if (type.equals("23")){
380
                                        if (is_play.equals("1")){
381
                                            datas.add(jsonObject);
382
                                        }
383
                                    }else{
384
                                        datas.add(jsonObject);
385
                                    }
361
                                    datas.add(jsonObject);
386
                                }
362
                                }
387
363
388
                                if (isClear == false) {
364
                                if (isClear == false) {