class="lines-num lines-num-old"> 449 500 
                @Override
450 501 
                public void onClick(DialogInterface dialog, int which) {
502 
                    MobclickAgent.onEvent(getApplicationContext(), "1006");
451 503 
                    finish();
452 504 
                }
453 505 
            });
454 506 
            builder.setNegativeButton("继续编辑", null);
455 507 
            builder.create().show();
456 508 
        } else {
509 
            MobclickAgent.onEvent(getApplicationContext(), "1006");
457 510 
            finish();
458 511 
        }
459 512 
    }

+ 2 - 1
app/src/main/java/com/electric/chargingpile/activity/TopicActivity.java
Wyświetl plik 

@ -89,6 +89,7 @@ public class TopicActivity extends Activity implements OnClickListener, EasyPerm
89 89 
        topicAdapter.setRecyclerItemTypeClickListener(new RecyclerItemTypeClickListener() {
90 90 
            @Override
91 91 
            public void onItemClickListener(int position, int index) {
92 
                MobclickAgent.onEvent(getApplicationContext(), "1033");
92 93 
                ChatRecommendBean item = topicAdapter.getItem(position);
93 94 
                Intent intent = new Intent();
94 95 
                intent.putExtra("topic", item);
 
@ -114,7 +115,7 @@ public class TopicActivity extends Activity implements OnClickListener, EasyPerm
114 115 
                    recommendTopic();
115 116 
                } else {
116 117 
                    searchTopic(editable.toString());
117
118 
                    MobclickAgent.onEvent(getApplicationContext(), "1032");
118 119 
                }
119 120 
                mTopicInputEnd.setVisibility(editable.length() == 0 ? View.GONE : View.VISIBLE);
120 121 
            }

+ 1 - 0
app/src/main/java/com/electric/chargingpile/adapter/ChatRecommendAdapter.java
Wyświetl plik 

@ -318,6 +318,7 @@ public class ChatRecommendAdapter extends RecyclerView.Adapter<IViewHolder> {
318 318 
                Intent intent = new Intent(context, TopicDetailActivity.class);
319 319 
                intent.putExtra("topicId", bean.topicId);
320 320 
                context.startActivity(intent);
321 
                MobclickAgent.onEvent(context, "1096");
321 322 
            }
322 323 
        });
323 324 
    }

+ 2 - 0
app/src/main/java/com/electric/chargingpile/fragment/ChatRecommendFragment.java
Wyświetl plik 

@ -37,6 +37,7 @@ import com.electric.chargingpile.util.LoadingDialog;
37 37 
import com.electric.chargingpile.util.NetUtil;
38 38 
import com.electric.chargingpile.util.ToastUtil;
39 39 
import com.electric.chargingpile.util.Util;
40 
import com.umeng.analytics.MobclickAgent;
40 41 
import com.zhy.http.okhttp.OkHttpUtils;
41 42 
import com.zhy.http.okhttp.callback.StringCallback;
42 43 
@ -273,6 +274,7 @@ public class ChatRecommendFragment extends Fragment implements View.OnClickListe
273 274 
                String code = JsonUtils.getKeyResult(response, "code");
274 275 
                String desc = JsonUtils.getKeyResult(response, "desc");
275 276 
                if ("1000".equals(code)) {
277 
                    MobclickAgent.onEvent(getContext(), "1004");
276 278 
                    Intent intent = new Intent(getActivity(), PublishItemsActivity.class);
277 279 
                    PublishItemSerializable intentData = new PublishItemSerializable();
278 280 
                    intentData.setFrom(PublishItemsActivity.FROM_CHAT_HOME);

+ 15 - 0
videolibrary/picture_library/src/main/java/com/luck/picture/lib/PicturePreviewActivity.java
Wyświetl plik 

@ -9,6 +9,7 @@ import android.os.Bundle;
9 9 
import android.support.annotation.NonNull;
10 10 
import android.support.annotation.Nullable;
11 11 
import android.support.v4.content.ContextCompat;
12 
import android.support.v4.content.LocalBroadcastManager;
12 13 
import android.support.v4.view.PagerAdapter;
13 14 
import android.support.v4.view.ViewPager;
14 15 
import android.text.TextUtils;
 
@ -133,6 +134,9 @@ public class PicturePreviewActivity extends PictureBaseActivity implements View.
133 134 
        imgLeftBack.setOnClickListener(new View.OnClickListener() {
134 135 
            @Override
135 136 
            public void onClick(View v) {
137 
                Intent intent = new Intent("publish-video-topic-activity");
138 
                intent.putExtra("message", "cancel_choosed_video");
139 
                LocalBroadcastManager.getInstance(getApplicationContext()).sendBroadcast(intent);
136 140 
                finish();
137 141 
                overridePendingTransition(0, R.anim.a3);
138 142 
            }
 
@ -661,6 +665,10 @@ public class PicturePreviewActivity extends PictureBaseActivity implements View.
661 665 
                imageView.setOnViewTapListener(new PhotoViewAttacher.OnViewTapListener() {
662 666 
                    @Override
663 667 
                    public void onViewTap(View view, float x, float y) {
668 
                        Intent intent = new Intent("publish-video-topic-activity");
669 
                        intent.putExtra("message", "cancel_choosed_video");
670 
                        LocalBroadcastManager.getInstance(getApplicationContext()).sendBroadcast(intent);
671
664 672 
                        finish();
665 673 
                        overridePendingTransition(0, R.anim.a3);
666 674 
                    }
 
@ -668,6 +676,9 @@ public class PicturePreviewActivity extends PictureBaseActivity implements View.
668 676 
                iv_play.setOnClickListener(new View.OnClickListener() {
669 677 
                    @Override
670 678 
                    public void onClick(View v) {
679 
                        Intent intent = new Intent("publish-video-topic-activity");
680 
                        intent.putExtra("message", "preview_video");
681 
                        LocalBroadcastManager.getInstance(getApplicationContext()).sendBroadcast(intent);
671 682 
                        Bundle bundle = new Bundle();
672 683 
                        bundle.putString("video_path", path);
673 684 
                        startActivity(PictureVideoPlayActivity.class, bundle);
 
@ -841,6 +852,10 @@ public class PicturePreviewActivity extends PictureBaseActivity implements View.
841 852 
        super.onBackPressed();
842 853 
        finish();
843 854 
        overridePendingTransition(0, R.anim.a3);
855
856 
        Intent intent = new Intent("publish-video-topic-activity");
857 
        intent.putExtra("message", "cancel_choosed_video");
858 
        LocalBroadcastManager.getInstance(getApplicationContext()).sendBroadcast(intent);
844 859 
    }
845 860
846 861 
    @Override

+ 13 - 0
videolibrary/picture_library/src/main/java/com/luck/picture/lib/PictureVideoPlayActivity.java
Wyświetl plik 

@ -2,9 +2,11 @@ package com.luck.picture.lib;
2 2
3 3 
import android.content.Context;
4 4 
import android.content.ContextWrapper;
5 
import android.content.Intent;
5 6 
import android.graphics.Color;
6 7 
import android.media.MediaPlayer;
7 8 
import android.os.Bundle;
9 
import android.support.v4.content.LocalBroadcastManager;
8 10 
import android.view.View;
9 11 
import android.view.WindowManager;
10 12 
import android.widget.ImageView;
 
@ -84,6 +86,9 @@ public class PictureVideoPlayActivity extends PictureBaseActivity implements Med
84 86 
    public void onClick(View v) {
85 87 
        int id = v.getId();
86 88 
        if (id == R.id.picture_left_back) {
89 
            Intent intent = new Intent("publish-video-topic-activity");
90 
            intent.putExtra("message", "finish_preview_video");
91 
            LocalBroadcastManager.getInstance(getApplicationContext()).sendBroadcast(intent);
87 92 
            finish();
88 93 
        } else if (id == R.id.iv_play) {
89 94 
            mVideoView.start();
 
@ -92,6 +97,14 @@ public class PictureVideoPlayActivity extends PictureBaseActivity implements Med
92 97 
    }
93 98
94 99 
    @Override
100 
    public void onBackPressed() {
101 
        super.onBackPressed();
102 
        Intent intent = new Intent("publish-video-topic-activity");
103 
        intent.putExtra("message", "finish_preview_video");
104 
        LocalBroadcastManager.getInstance(getApplicationContext()).sendBroadcast(intent);
105 
    }
106
107 
    @Override
95 108 
    protected void attachBaseContext(Context newBase) {
96 109 
        super.attachBaseContext(new ContextWrapper(newBase) {
97 110 
            @Override

+ 5 - 0
videolibrary/picture_library/src/main/java/com/luck/picture/lib/adapter/PictureImageGridAdapter.java
Wyświetl plik 

@ -3,9 +3,11 @@ package com.luck.picture.lib.adapter;
3 3 
import android.animation.AnimatorSet;
4 4 
import android.animation.ObjectAnimator;
5 5 
import android.content.Context;
6 
import android.content.Intent;
6 7 
import android.graphics.PorterDuff;
7 8 
import android.graphics.drawable.Drawable;
8 9 
import android.support.v4.content.ContextCompat;
10 
import android.support.v4.content.LocalBroadcastManager;
9 11 
import android.support.v7.widget.RecyclerView;
10 12 
import android.text.TextUtils;
11 13 
import android.view.LayoutInflater;
 
@ -142,6 +144,9 @@ public class PictureImageGridAdapter extends RecyclerView.Adapter<RecyclerView.V
142 144 
                @Override
143 145 
                public void onClick(View v) {
144 146 
                    if (imageSelectChangedListener != null) {
147 
                        Intent intent = new Intent("publish-video-topic-activity");
148 
                        intent.putExtra("message", "take_video");
149 
                        LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
145 150 
                        imageSelectChangedListener.onTakePhoto();
146 151 
                    }
147 152 
                }

修改bug · a20227b893 - Gogs: Go Git Service
Home Verkennen Help
Registreren Inloggen
dudu
/
cdzApp
Volgen 2
Ster 1
Vork 0
Code Kwesties 0 Pull-aanvragen 0 Commits 505 Publicaties 18 Wiki
Bladeren bron

修改bug

hy 4 jaren geleden
bovenliggende
43415667a0
commit
a20227b893
11 gewijzigde bestanden met toevoegingen van 70 en 166 verwijderingen
Split View Toon Diff Stats
  1. 2 5
      app/src/main/AndroidManifest.xml
  2. 4 30
      app/src/main/java/com/electric/chargingpile/activity/ChargingCommentActivity.java
  3. 0 4
      app/src/main/java/com/electric/chargingpile/activity/MainMapActivity.java
  4. 2 42
      app/src/main/java/com/electric/chargingpile/activity/NewZhanDetailsActivity.java
  5. 2 19
      app/src/main/java/com/electric/chargingpile/activity/ZhanCommentActivity.java
  6. 15 6
      app/src/main/java/com/electric/chargingpile/adapter/NewPingLunAdapter.java
  7. 13 7
      app/src/main/java/com/electric/chargingpile/adapter/ZhanCommentsAapter.java
  8. 2 2
      app/src/main/java/com/electric/chargingpile/application/MainApplication.java
  9. 18 19
      app/src/main/java/com/electric/chargingpile/fragment/DetailsFragment.java
  10. 5 1
      app/src/main/java/com/electric/chargingpile/fragment/NewMyMessageFragment.java
  11. 7 31
      app/src/main/java/com/electric/chargingpile/fragment/ZhanCommentFragment.java

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

@ -2,8 +2,8 @@
2 2 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3 3 
    xmlns:tools="http://schemas.android.com/tools"
4 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 8 
   <!-- <uses-permission android:name="android.permission.BLUETOOTH" />
9 9 
    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />-->
 
@ -107,9 +107,6 @@
107 107 
            android:name=".activity.CommentVideoDetailActivity"
108 108 
            android:screenOrientation="portrait"/>
109 109 
        <activity
110 
            android:name=".activity.VideoCompressionActivity"
111 
            android:screenOrientation="portrait"/>
112 
        <activity
113 110 
            android:name=".activity.SelectTopicActivity"
114 111 
            android:screenOrientation="portrait"/>
115 112 
        <activity

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

@ -1,18 +1,13 @@
1 1 
package com.electric.chargingpile.activity;
2 2
3 3 
import android.Manifest;
4 
import android.app.Activity;
5 4 
import android.app.ProgressDialog;
6 5 
import android.content.Context;
7 6 
import android.content.Intent;
8 7 
import android.graphics.Bitmap;
9 8 
import android.graphics.BitmapFactory;
10 
import android.graphics.Color;
11 9 
import android.graphics.Matrix;
12 10 
import android.graphics.drawable.BitmapDrawable;
13 
import android.graphics.drawable.ColorDrawable;
14 
import android.graphics.drawable.Drawable;
15 
import android.os.Build;
16 11 
import android.os.Bundle;
17 12 
import android.os.Handler;
18 13 
import android.os.Message;
 
@ -28,9 +23,6 @@ import android.view.View;
28 23 
import android.view.ViewGroup;
29 24 
import android.view.animation.AnimationUtils;
30 25 
import android.view.inputmethod.InputMethodManager;
31 
import android.widget.AdapterView;
32 
import android.widget.BaseAdapter;
33 
import android.widget.GridView;
34 26 
import android.widget.ImageView;
35 27 
import android.widget.LinearLayout;
36 28 
import android.widget.PopupWindow;
 
@ -39,23 +31,14 @@ import android.widget.ScrollView;
39 31 
import android.widget.TextView;
40 32 
import android.widget.Toast;
41 33
42 
import androidx.annotation.Nullable;
43 34 
import androidx.appcompat.app.AppCompatActivity;
44 35 
import androidx.recyclerview.widget.GridLayoutManager;
45 36 
import androidx.recyclerview.widget.RecyclerView;
46 37
47 
import com.andview.refreshview.utils.Utils;
48 38 
import com.blankj.utilcode.util.CacheUtils;
49 39 
import com.blankj.utilcode.util.EmptyUtils;
50 40 
import com.blankj.utilcode.util.LogUtils;
51 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 42 
import com.electric.chargingpile.R;
60 43 
import com.electric.chargingpile.adapter.GridImageAdapter;
61 44 
import com.electric.chargingpile.application.MainApplication;
 
@ -72,11 +55,9 @@ import com.electric.chargingpile.util.CommonParams;
72 55 
import com.electric.chargingpile.util.DES3;
73 56 
import com.electric.chargingpile.util.DateUtils;
74 57 
import com.electric.chargingpile.util.DensityUtil;
75 
import com.electric.chargingpile.util.ImageItem;
76 58 
import com.electric.chargingpile.util.JsonUtils;
77 59 
import com.electric.chargingpile.util.LoadingDialog;
78 60 
import com.electric.chargingpile.util.Md5Util;
79 
import com.electric.chargingpile.util.PublicWayONE;
80 61 
import com.electric.chargingpile.util.Res;
81 62 
import com.electric.chargingpile.util.ScreenUtils;
82 63 
import com.electric.chargingpile.util.StatusConstants;
 
@ -127,13 +108,6 @@ import cn.sharesdk.framework.ShareSDK;
127 108 
import cn.sharesdk.tencent.qq.QQ;
128 109 
import cn.sharesdk.wechat.friends.Wechat;
129 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 111 
import okhttp3.Call;
138 112 
import pub.devrel.easypermissions.AfterPermissionGranted;
139 113 
import pub.devrel.easypermissions.EasyPermissions;
 
@ -585,7 +559,7 @@ public class ChargingCommentActivity extends AppCompatActivity implements View.O
585 559 
                        String rtnCode = JsonUtils.getKeyResult(response, "rtnCode");
586 560 
                        if ("01".equals(rtnCode)) {
587 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 563 
                            if (EmptyUtils.isNotEmpty(data) && is_share.equals("1")) {
590 564 
                                chargingShareBean = JsonUtils.parseToObjectBean(data, ChargingShareBean.class);
591 565 
                                isShow = "1";
 
@ -660,7 +634,6 @@ public class ChargingCommentActivity extends AppCompatActivity implements View.O
660 634 
    private void addComments(ArrayList<String> fileUrlList, String thumUrl) throws Exception {
661 635 
        long appTime1 = System.currentTimeMillis() / 1000;
662 636 
        long updatetime = appTime1 - MainMapActivity.cha - 2;
663 
        Log.e(TAG, "addComments: ");
664 637 
        String token = String.valueOf(updatetime);
665 638 
        String url = MainApplication.url + "/zhannew/basic/web/index.php/tpappcomments/add";
666 639 
        Map<String,String> map=new HashMap<>();
 
@ -683,7 +656,7 @@ public class ChargingCommentActivity extends AppCompatActivity implements View.O
683 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 660 
                    map.put("type", ChatRecommendBean.TARGET_TYPE_IMAGE_TEXT + "");
688 661 
                    map.put("thumUrl",fileUrlList.get(0));
689 662 
                }else if (mInsterType == 2) {
 
@ -694,6 +667,7 @@ public class ChargingCommentActivity extends AppCompatActivity implements View.O
694 667 
        }
695 668
696 669 
        OkHttpUtils.get()
670 
                .params(map)
697 671 
                .url(url)
698 672 
                .build()
699 673 
                .execute(new StringCallback() {
 
@ -913,7 +887,7 @@ public class ChargingCommentActivity extends AppCompatActivity implements View.O
913 887 
        dialog.show();
914 888
915 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 891 
        if (TextUtils.isEmpty(filePath)) {
918 892 
            ToastUtil.showToast(getApplicationContext(), "请重新选择视频", Toast.LENGTH_SHORT);
919 893 
            return;

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

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

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

@ -438,20 +438,6 @@ public class NewZhanDetailsActivity extends AppCompatActivity implements View.On
438 438 
        });
439 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 443 
    public static void reFreshUi() {
 
@ -471,13 +457,6 @@ public class NewZhanDetailsActivity extends AppCompatActivity implements View.On
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 461 
     * 重新设置viewPager高度
483 462 
     * <p/>
 
@ -562,14 +541,10 @@ public class NewZhanDetailsActivity extends AppCompatActivity implements View.On
562 541 
                break;
563 542 
            case R.id.iv_back:
564 543 
                isCollect(zhanname);
565 
//                Log.e("!!!", collect.getResources().toString());
566 544 
                if (collect.getTag().equals(R.drawable.icon_detail_collected)) {
567 545 
                    setResult(0);
568 
//                    startActivity(new Intent(getApplication(),MyCollectActivity.class));
569 546 
                    finish();
570 547 
                } else {
571 
//                    Intent intent = new Intent();
572 
//                    intent.putExtra("data",zhan.getZhan_name());
573 548 
                    setResult(1);
574 549 
                    finish();
575 550 
                }
 
@ -865,18 +840,8 @@ public class NewZhanDetailsActivity extends AppCompatActivity implements View.On
865 840 
                break;
866 841
867 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 843 
                if (zhanname != null && !zhanname.equals("")) {
877 844 
                    if (mapp.sph.getInt(zhanname) == 0) {
878 
//                    Log.d("!@!",zhan.getId()+"");
879 
//                    Log.d("!@!",zhan.getId()+"");
880 845 
                        if (mapp.sph.removeData(zhanname)) {
881 846 
                            collect.setImageResource(R.drawable.icon_clect1124);
882 847 
                            collect.setTag(R.drawable.icon_clect1124);
 
@ -886,9 +851,7 @@ public class NewZhanDetailsActivity extends AppCompatActivity implements View.On
886 851 
                            db.del(zhan_id);
887 852 
                            Toast.makeText(this, "取消收藏", Toast.LENGTH_SHORT).show();
888 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 855 
                    } else {
893 856 
                        if (mapp.sph.putInt(zhanname, 0)) {
894 857 
                            collect.setImageResource(R.drawable.icon_detail_collected);
 
@ -906,10 +869,7 @@ public class NewZhanDetailsActivity extends AppCompatActivity implements View.On
906 869 
                            db.insert(values);
907 870 
                            Toast.makeText(this, "收藏成功", Toast.LENGTH_SHORT).show();
908 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 874 
                } else {
915 875 
                    Toast.makeText(this, "请稍后，正在加载数据", Toast.LENGTH_SHORT).show();

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

@ -9,7 +9,6 @@ import android.content.IntentFilter;
9 9 
import android.graphics.Bitmap;
10 10 
import android.graphics.BitmapFactory;
11 11 
import android.graphics.Matrix;
12 
import android.graphics.drawable.Drawable;
13 12 
import android.os.Bundle;
14 13
15 14 
import android.os.Handler;
 
@ -22,7 +21,6 @@ import android.util.Base64;
22 21 
import android.util.Log;
23 22 
import android.view.LayoutInflater;
24 23 
import android.view.View;
25 
import android.view.ViewGroup;
26 24 
import android.view.animation.AnimationUtils;
27 25 
import android.view.inputmethod.InputMethodManager;
28 26 
import android.widget.ImageView;
 
@ -32,21 +30,12 @@ import android.widget.TextView;
32 30 
import android.widget.Toast;
33 31
34 32 
import androidx.annotation.NonNull;
35 
import androidx.annotation.Nullable;
36 33 
import androidx.appcompat.app.AppCompatActivity;
37 34 
import androidx.recyclerview.widget.GridLayoutManager;
38 35 
import androidx.recyclerview.widget.RecyclerView;
39 36
40 
import com.andview.refreshview.utils.Utils;
41 37 
import com.blankj.utilcode.util.CacheUtils;
42 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 39 
import com.electric.chargingpile.R;
51 40 
import com.electric.chargingpile.adapter.GridImageAdapter;
52 41 
import com.electric.chargingpile.application.MainApplication;
 
@ -56,7 +45,6 @@ import com.electric.chargingpile.data.CommentsBean;
56 45 
import com.electric.chargingpile.data.MyOtto;
57 46 
import com.electric.chargingpile.data.RObject;
58 47 
import com.electric.chargingpile.data.TopicBean;
59 
import com.electric.chargingpile.data.VideoUploadResult;
60 48 
import com.electric.chargingpile.engine.GlideEngine;
61 49 
import com.electric.chargingpile.util.BarColorUtil;
62 50 
import com.electric.chargingpile.util.Bimp;
 
@ -85,12 +73,8 @@ import com.luck.picture.lib.animators.AnimationType;
85 73 
import com.luck.picture.lib.config.PictureConfig;
86 74 
import com.luck.picture.lib.config.PictureMimeType;
87 75 
import com.luck.picture.lib.entity.LocalMedia;
88 
import com.umeng.analytics.MobclickAgent;
89 76 
import com.upyun.library.common.SerialUploader;
90 
import com.upyun.library.common.UploadEngine;
91 77 
import com.upyun.library.listener.UpCompleteListener;
92 
import com.upyun.library.listener.UpProgressListener;
93 
import com.zhy.autolayout.AutoLinearLayout;
94 78 
import com.zhy.http.okhttp.OkHttpUtils;
95 79 
import com.zhy.http.okhttp.callback.StringCallback;
96 80 
import com.zhy.view.flowlayout.FlowLayout;
 
@ -107,7 +91,6 @@ import java.io.IOException;
107 91 
import java.net.URLEncoder;
108 92 
import java.util.ArrayList;
109 93 
import java.util.HashMap;
110 
import java.util.Iterator;
111 94 
import java.util.List;
112 95 
import java.util.Map;
113 96 
import java.util.Set;
 
@ -644,7 +627,7 @@ public class ZhanCommentActivity extends AppCompatActivity implements View.OnCli
644 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 631 
                    map.put("type", ChatRecommendBean.TARGET_TYPE_IMAGE_TEXT + "");
649 632 
                    map.put("thumUrl",fileUrlList.get(0));
650 633 
                }else if (mInsterType == 2) {
 
@ -816,7 +799,7 @@ public class ZhanCommentActivity extends AppCompatActivity implements View.OnCli
816 799 
        dialog.show();
817 800
818 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 803 
        if (TextUtils.isEmpty(filePath)) {
821 804 
            ToastUtil.showToast(getApplicationContext(), "请重新选择视频", Toast.LENGTH_SHORT);
822 805 
            return;

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

@ -167,14 +167,21 @@ public class NewPingLunAdapter extends BaseAdapter {
167 167 
                file2Url=file2Url==null?"":file2Url;
168 168 
                file3Url=file3Url==null?"":file3Url;
169 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 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 186 
                    String thumUrl = datas.get(position).getString("thumUrl");
180 187 
                    if (!TextUtils.isEmpty(thumUrl) && !TextUtils.isEmpty(fileUrl)){
 
@ -189,6 +196,8 @@ public class NewPingLunAdapter extends BaseAdapter {
189 196 
                                e.printStackTrace();
190 197 
                            }
191 198 
                        });
199 
                    }else{
200 
                        holder.imgLayout.setVisibility(View.GONE);
192 201 
                    }
193 202 
                }else {
194 203

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

@ -434,6 +434,7 @@ public class ZhanCommentsAapter extends BaseAdapter {
434 434 
                });
435 435
436 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,14 +445,17 @@ public class ZhanCommentsAapter extends BaseAdapter {
444 445 
                file2Url= file2Url == null?"":file2Url;
445 446 
                file3Url= file3Url == null?"":file3Url;
446 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 459 
                    String thumUrl = datas.get(position).getString("thumUrl");
456 460 
                    if (!TextUtils.isEmpty(thumUrl) && !TextUtils.isEmpty(fileUrl)){
457 461 
                        Glide.with(MainApplication.context)
 
@ -466,6 +470,8 @@ public class ZhanCommentsAapter extends BaseAdapter {
466 470 
                            }
467 471
468 472 
                        });
473 
                    }else{
474 
                        holder.imgLayout.setVisibility(View.GONE);
469 475 
                    }
470 476
471 477 
                }else {

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

@ -101,8 +101,8 @@ public class MainApplication extends MultiDexApplication {
101 101 
//    public static String pic_url = "http://cdz.evcharge.cc/zhannew/uploadfile/";
102 102
103 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 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
Bestand weergeven 

@ -36,6 +36,7 @@ import com.amap.api.maps.AMapUtils;
36 36 
import com.amap.api.maps.model.LatLng;
37 37 
import com.blankj.utilcode.util.LogUtils;
38 38 
import com.bumptech.glide.Glide;
39 
import com.electric.chargingpile.BuildConfig;
39 40 
import com.electric.chargingpile.R;
40 41 
import com.electric.chargingpile.activity.AlterOneActivity;
41 42 
import com.electric.chargingpile.activity.ChargingQianDaoActivity;
 
@ -1242,7 +1243,7 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
1242 1243
1243 1244 
    @Subscribe
1244 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 1247 
        OkHttpUtils.get().url(url).build().execute(new StringCallback() {
1247 1248 
            @Override
1248 1249 
            public void onError(Call call, Exception e) {
 
@ -1260,15 +1261,7 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
1260 1261 
                        ArrayList<JSONObject> datasJson = new ArrayList<JSONObject>();
1261 1262 
                        for (int j = 0; j < jsonArray.length(); j++) {
1262 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 1266 
                        if(datasJson.size()>0){
1274 1267 
                            rl_new_comment.setVisibility(View.VISIBLE);
 
@ -1384,21 +1377,27 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
1384 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 1381 
                            String fileUrl = jsonObject.optString("fileUrl");
1392 1382 
                            String file2Url = jsonObject.optString("file2Url");
1393 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 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 1402 
                                String thumUrl = jsonObject.optString("thumUrl");
1404 1403 
                                if (!TextUtils.isEmpty(thumUrl) && !TextUtils.isEmpty(fileUrl)){

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

@ -17,6 +17,7 @@ import android.widget.ListView;
17 17 
import android.widget.TextView;
18 18 
import android.widget.Toast;
19 19
20 
import com.electric.chargingpile.BuildConfig;
20 21 
import com.electric.chargingpile.R;
21 22 
import com.electric.chargingpile.activity.LoginActivity;
22 23 
import com.electric.chargingpile.activity.MainMapActivity;
 
@ -112,7 +113,10 @@ public class NewMyMessageFragment extends Fragment {
112 113 
            e.printStackTrace();
113 114 
        }
114 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 120 
        Log.e("url====", url);
117 121 
        OkHttpUtils.get()
118 122 
                .url(url)

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

@ -22,6 +22,7 @@ import android.widget.RelativeLayout;
22 22 
import android.widget.TextView;
23 23 
import android.widget.Toast;
24 24
25 
import com.electric.chargingpile.BuildConfig;
25 26 
import com.electric.chargingpile.R;
26 27 
import com.electric.chargingpile.activity.ChargingQianDaoActivity;
27 28 
import com.electric.chargingpile.activity.NewZhanDetailsActivity;
 
@ -227,7 +228,7 @@ public class ZhanCommentFragment extends Fragment {
227 228
228 229 
    @Subscribe
229 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 232 
//        String url = MainApplication.url+"/zhannew/basic/web/index.php/tpappcomments/get-comments?zhanid=" + NewZhanDetailsActivity.zhan_id + "&page=1";
232 233 
        Log.e(TAG, "getCommentsData=" + url);
233 234 
        OkHttpUtils.get().url(url)
 
@ -255,15 +256,7 @@ public class ZhanCommentFragment extends Fragment {
255 256
256 257 
                                for (int j = 0; j < jsonArray.length(); j++) {
257 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 261 
//                                Log.e(TAG, "dealData: size=" + datas.size());
269 262 
                                if (datas.size() == 0) {
 
@ -295,7 +288,7 @@ public class ZhanCommentFragment extends Fragment {
295 288
296 289
297 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 292 
        OkHttpUtils.get().url(url)
300 293 
                .build().connTimeOut(6000).readTimeOut(6000)
301 294 
                .execute(new StringCallback() {
 
@ -314,16 +307,7 @@ public class ZhanCommentFragment extends Fragment {
314 307 
                                JSONArray jsonArray = new JSONArray(commentData);
315 308 
                                for (int j = 0; j < jsonArray.length(); j++) {
316 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 312 
                                if (datas.size() == 0) {
329 313 
                                    ll_tishi.setVisibility(View.VISIBLE);
 
@ -345,7 +329,7 @@ public class ZhanCommentFragment extends Fragment {
345 329 
    }
346 330
347 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 333 
        OkHttpUtils.get().url(url)
350 334 
                .build().connTimeOut(6000).readTimeOut(6000)
351 335 
                .execute(new StringCallback() {
 
@ -374,15 +358,7 @@ public class ZhanCommentFragment extends Fragment {
374 358
375 359 
                                for (int j = 0; j < jsonArray.length(); j++) {
376 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 364 
                                if (isClear == false) {