huyuguo преди 5 години
родител
ревизия
57bd1011e2

+ 59 - 3
app/src/main/java/com/electric/chargingpile/activity/ChatContentListActivity.java

@ -61,6 +61,7 @@ import com.shuyu.gsyvideoplayer.listener.GSYVideoProgressListener;
61 61
import com.shuyu.gsyvideoplayer.listener.VideoAllCallBack;
62 62
import com.shuyu.gsyvideoplayer.video.base.GSYVideoView;
63 63
import com.squareup.picasso.Picasso;
64
import com.umeng.analytics.MobclickAgent;
64 65
import com.zhy.http.okhttp.OkHttpUtils;
65 66
import com.zhy.http.okhttp.callback.StringCallback;
66 67
@ -168,6 +169,7 @@ public class ChatContentListActivity extends AppCompatActivity {
168 169
                    play(position);
169 170
                }
170 171
                chatContentPosition = position;
172
171 173
            }
172 174
173 175
            @Override
@ -197,6 +199,8 @@ public class ChatContentListActivity extends AppCompatActivity {
197 199
        }
198 200
199 201
        if (bean.targetType == ChatRecommendBean.TARGET_TYPE_VIDEO) {
202
             MobclickAgent.onEvent(getApplicationContext(), "1072");
203
            MobclickAgent.onEvent(getApplicationContext(), "1092");
200 204
            NetworkUtils.NetworkType networkType = NetworkUtils.getNetworkType();
201 205
            switch (networkType) {
202 206
                case NETWORK_2G:
@ -225,6 +229,8 @@ public class ChatContentListActivity extends AppCompatActivity {
225 229
            }
226 230
227 231
        } else {
232
            MobclickAgent.onEvent(getApplicationContext(), "1051");
233
            MobclickAgent.onEvent(getApplicationContext(), "1071");
228 234
            GSYVideoADManager.onPause();
229 235
            GSYVideoManager.onPause();
230 236
            chatContentFragment.showPhotos();
@ -432,6 +438,13 @@ public class ChatContentListActivity extends AppCompatActivity {
432 438
                    intent = new Intent(getContext(), UserPageActivity.class);
433 439
                    intent.putExtra("targetUserId", bean.addUserId + "");
434 440
                    getContext().startActivity(intent);
441
442
                    if (ChatRecommendBean.TARGET_TYPE_VIDEO == bean.targetType) {
443
                        MobclickAgent.onEvent(getContext(), "1091");
444
                    } else if (ChatRecommendBean.TARGET_TYPE_IMAGE_TEXT == bean.targetType) {
445
                        MobclickAgent.onEvent(getContext(), "1070");
446
                    }
447
435 448
                    break;
436 449
                case R.id.topicInfo: // 跳转话题列表页
437 450
                    if (playIcon != null) {
@ -455,12 +468,37 @@ public class ChatContentListActivity extends AppCompatActivity {
455 468
                case R.id.bottomView: // to do nothing
456 469
                    break;
457 470
                case R.id.writeComment: // 评论列表
471
                    if (ChatRecommendBean.TARGET_TYPE_VIDEO == bean.targetType) {
472
                        MobclickAgent.onEvent(getContext(), "1077");
473
                    } else if (ChatRecommendBean.TARGET_TYPE_IMAGE_TEXT == bean.targetType) {
474
                        MobclickAgent.onEvent(getContext(), "1056");
475
                    }
476
477
                    ChatContentCommentListDialogFragment dialogFragment = ChatContentCommentListDialogFragment.newInstance(bean);
478
                    dialogFragment.setOnCommonDialogFragmentListener(new ChatContentCommentListDialogFragment.OnChatContentCommentListDialogFragmentListener() {
479
                        @Override
480
                        public void updateCommentNum(int num) {
481
                            if (bean.commentNums == 0) {
482
                                commentNumber.setText("");
483
                            } else {
484
                                commentNumber.setText(bean.commentNums < 10000 ? bean.commentNums + "" : String.format("%.1fW", bean.commentNums / 10000f));
485
                            }
486
                        }
487
                    });
488
                    dialogFragment.show(getChildFragmentManager(), "评论列表");
489
                    break;
458 490
                case R.id.comment:
459 491
//                    bean.commentNums
460 492
                    //setViewPagerScroll(false);
461 493
                    //allCommentsContainer.setVisibility(View.VISIBLE);
462
                    ChatContentCommentListDialogFragment dialogFragment = ChatContentCommentListDialogFragment.newInstance(bean);
463
                    dialogFragment.setOnCommonDialogFragmentListener(new ChatContentCommentListDialogFragment.OnChatContentCommentListDialogFragmentListener() {
494
                    if (ChatRecommendBean.TARGET_TYPE_VIDEO == bean.targetType) {
495
                        MobclickAgent.onEvent(getContext(), "1079");
496
                    } else if (ChatRecommendBean.TARGET_TYPE_IMAGE_TEXT == bean.targetType) {
497
                        MobclickAgent.onEvent(getContext(), "1058");
498
                    }
499
500
                    ChatContentCommentListDialogFragment dialogFragmentx = ChatContentCommentListDialogFragment.newInstance(bean);
501
                    dialogFragmentx.setOnCommonDialogFragmentListener(new ChatContentCommentListDialogFragment.OnChatContentCommentListDialogFragmentListener() {
464 502
                        @Override
465 503
                        public void updateCommentNum(int num) {
466 504
                            if (bean.commentNums == 0) {
@ -470,7 +508,7 @@ public class ChatContentListActivity extends AppCompatActivity {
470 508
                            }
471 509
                        }
472 510
                    });
473
                    dialogFragment.show(getChildFragmentManager(), "评论列表");
511
                    dialogFragmentx.show(getChildFragmentManager(), "评论列表");
474 512
                    break;
475 513
                case R.id.allCommentsClose: // 关闭评论
476 514
//                    setViewPagerScroll(true);
@ -729,6 +767,12 @@ public class ChatContentListActivity extends AppCompatActivity {
729 767
                    msg.setMaxLines(Integer.MAX_VALUE);
730 768
                }
731 769
                toolBar.setVisibility(View.GONE);
770
                if (ChatRecommendBean.TARGET_TYPE_VIDEO == bean.targetType) {
771
                    MobclickAgent.onEvent(getContext(), "1075");
772
                } else if (ChatRecommendBean.TARGET_TYPE_IMAGE_TEXT == bean.targetType) {
773
                    MobclickAgent.onEvent(getContext(), "1054");
774
                }
775
732 776
            } else {
733 777
                closeUnfold.setVisibility(View.GONE);
734 778
                fold.setImageResource(R.drawable.fold_icon);
@ -739,6 +783,12 @@ public class ChatContentListActivity extends AppCompatActivity {
739 783
                msg.setText(bean.title);  // 重新赋值,解决...不出现的问题
740 784
741 785
                toolBar.setVisibility(View.VISIBLE);
786
                if (ChatRecommendBean.TARGET_TYPE_VIDEO == bean.targetType) {
787
                    MobclickAgent.onEvent(getContext(), "1076");
788
                } else if (ChatRecommendBean.TARGET_TYPE_IMAGE_TEXT == bean.targetType) {
789
                    MobclickAgent.onEvent(getContext(), "1055");
790
                }
791
742 792
            }
743 793
        }
744 794
@ -746,6 +796,11 @@ public class ChatContentListActivity extends AppCompatActivity {
746 796
            if (bean.likeFlg == 1) {
747 797
                return;
748 798
            }
799
            if (ChatRecommendBean.TARGET_TYPE_VIDEO == bean.targetType) {
800
                MobclickAgent.onEvent(getContext(), "1078");
801
            } else if (ChatRecommendBean.TARGET_TYPE_IMAGE_TEXT == bean.targetType) {
802
                MobclickAgent.onEvent(getContext(), "1057");
803
            }
749 804
            String url = MainApplication.urlNew + "/topic/like.do";
750 805
            Map<String, String> map = new HashMap<>();
751 806
            map.put("targetId", bean.targetId + "");
@ -834,6 +889,7 @@ public class ChatContentListActivity extends AppCompatActivity {
834 889
835 890
                @Override
836 891
                public void onPageSelected(int position) {
892
                    MobclickAgent.onEvent(getContext(), "1052");
837 893
                }
838 894
839 895
                @Override

+ 16 - 3
app/src/main/java/com/electric/chargingpile/activity/PublishItemsActivity.java

@ -106,7 +106,11 @@ public class PublishItemsActivity extends AppCompatActivity implements View.OnCl
106 106
                break;
107 107
            case R.id.publish_picture: // 图文
108 108
                if (checkPublishRadio()) {
109
                    MobclickAgent.onEvent(getApplicationContext(), "1038");
109
                    if (FROM_TOPIC_DETAIL.equals(intentData.getFrom())) {
110
                        MobclickAgent.onEvent(getApplicationContext(), "1043");
111
                    } else {
112
                        MobclickAgent.onEvent(getApplicationContext(), "1038");
113
                    }
110 114
                    intent.setClass(this, PublishPicTopicActivity.class);
111 115
                    intent.putExtra("intent_data", intentData);
112 116
                    startActivity(intent);
@ -114,7 +118,11 @@ public class PublishItemsActivity extends AppCompatActivity implements View.OnCl
114 118
                break;
115 119
            case R.id.publish_video: // 视频
116 120
                if (checkPublishRadio()) {
117
                    MobclickAgent.onEvent(getApplicationContext(), "1005");
121
                    if (FROM_TOPIC_DETAIL.equals(intentData.getFrom())) {
122
                        MobclickAgent.onEvent(getApplicationContext(), "1042");
123
                    } else {
124
                        MobclickAgent.onEvent(getApplicationContext(), "1005");
125
                    }
118 126
                    intent.setClass(this, PublishVideoTopicActivity.class);
119 127
                    intent.putExtra("intent_data", intentData);
120 128
                    startActivity(intent);
@ -171,7 +179,12 @@ public class PublishItemsActivity extends AppCompatActivity implements View.OnCl
171 179
    }
172 180
173 181
    private void backOperate() {
174
        MobclickAgent.onEvent(this.getApplicationContext(), "1040");
182
        if (FROM_TOPIC_DETAIL.equals(intentData.getFrom())) {
183
            MobclickAgent.onEvent(this.getApplicationContext(), "1044");
184
        } else {
185
            MobclickAgent.onEvent(this.getApplicationContext(), "1040");
186
        }
187
175 188
        PublishItemsActivity.this.finish();
176 189
    }
177 190
}

+ 3 - 0
app/src/main/java/com/electric/chargingpile/activity/TopicDetailActivity.java

@ -35,6 +35,7 @@ import com.electric.chargingpile.util.LoadingDialog;
35 35
import com.electric.chargingpile.util.NetUtil;
36 36
import com.electric.chargingpile.util.ToastUtil;
37 37
import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet;
38
import com.umeng.analytics.MobclickAgent;
38 39
import com.zhy.http.okhttp.OkHttpUtils;
39 40
import com.zhy.http.okhttp.callback.StringCallback;
40 41
@ -206,9 +207,11 @@ public class TopicDetailActivity extends AppCompatActivity implements View.OnCli
206 207
                finish();
207 208
                break;
208 209
            case R.id.shareTextView: // 右上角分享功能
210
                MobclickAgent.onEvent(getApplicationContext(), "1048");
209 211
                shareInfo();
210 212
                break;
211 213
            case R.id.chatPublishIcon: // 发布功能
214
                MobclickAgent.onEvent(getApplicationContext(), "1041");
212 215
                chatPublishTips.setVisibility(View.GONE);
213 216
                ProfileManager.getInstance().setClickedUserPublishTopic(getApplicationContext(), "label");
214 217
                isFirst = false;

+ 6 - 1
app/src/main/java/com/electric/chargingpile/adapter/ChatRecommendAdapter.java

@ -168,6 +168,11 @@ public class ChatRecommendAdapter extends RecyclerView.Adapter<IViewHolder> {
168 168
            contentViewHolder.topic_item.setOnClickListener(new View.OnClickListener() {
169 169
                @Override
170 170
                public void onClick(View view) {
171
                    if (bean.isTop == 1) {
172
                        MobclickAgent.onEvent(context, "1096");
173
                    } else {
174
                        MobclickAgent.onEvent(context, "1050");
175
                    }
171 176
                    Intent intent = new Intent(context, TopicDetailActivity.class);
172 177
                    intent.putExtra("topicId", bean.targetId);
173 178
                    context.startActivity(intent);
@ -318,7 +323,7 @@ public class ChatRecommendAdapter extends RecyclerView.Adapter<IViewHolder> {
318 323
                Intent intent = new Intent(context, TopicDetailActivity.class);
319 324
                intent.putExtra("topicId", bean.topicId);
320 325
                context.startActivity(intent);
321
                MobclickAgent.onEvent(context, "1096");
326
                MobclickAgent.onEvent(context, "1049");
322 327
            }
323 328
        });
324 329
    }

+ 4 - 0
app/src/main/java/com/electric/chargingpile/adapter/TopicDetailAdapter.java

@ -32,6 +32,7 @@ import com.electric.chargingpile.util.ScreenUtils;
32 32
import com.electric.chargingpile.util.ToastUtil;
33 33
import com.electric.chargingpile.view.SortTopicPopWindow;
34 34
import com.squareup.picasso.Picasso;
35
import com.umeng.analytics.MobclickAgent;
35 36
import com.zhy.http.okhttp.OkHttpUtils;
36 37
import com.zhy.http.okhttp.callback.StringCallback;
37 38
@ -145,18 +146,21 @@ public class TopicDetailAdapter extends RecyclerView.Adapter<IViewHolder> {
145 146
                    public void onClick(View v) {
146 147
                        switch (v.getId()) {
147 148
                            case R.id.tv_1:
149
                                MobclickAgent.onEvent(context, "1045");
148 150
                                sort = 1;
149 151
                                sortPopWindow.dismiss();
150 152
                                headerViewHolder.sortTextView.setText("最新发布");
151 153
                                headerViewHolder.chooseTopicSort(sort);
152 154
                                break;
153 155
                            case R.id.tv_2:
156
                                MobclickAgent.onEvent(context, "1046");
154 157
                                sort = 2;
155 158
                                sortPopWindow.dismiss();
156 159
                                headerViewHolder.sortTextView.setText("最后回复");
157 160
                                headerViewHolder.chooseTopicSort(sort);
158 161
                                break;
159 162
                            case R.id.tv_3:
163
                                MobclickAgent.onEvent(context, "1047");
160 164
                                sort = 3;
161 165
                                sortPopWindow.dismiss();
162 166
                                headerViewHolder.sortTextView.setText("最热");

+ 29 - 0
app/src/main/java/com/electric/chargingpile/fragment/ChatContentCommentListDialogFragment.java

@ -35,6 +35,7 @@ import com.electric.chargingpile.util.CommonParams;
35 35
import com.electric.chargingpile.util.JsonUtils;
36 36
import com.electric.chargingpile.util.ToastUtil;
37 37
import com.squareup.picasso.Picasso;
38
import com.umeng.analytics.MobclickAgent;
38 39
import com.wang.avi.AVLoadingIndicatorView;
39 40
import com.zhy.http.okhttp.OkHttpUtils;
40 41
import com.zhy.http.okhttp.callback.StringCallback;
@ -195,6 +196,11 @@ public class ChatContentCommentListDialogFragment extends DialogFragment impleme
195 196
                }
196 197
                break;
197 198
            case R.id.allCommentsClose:
199
                if (ChatRecommendBean.TARGET_TYPE_VIDEO == chatRecommendBean.targetType) {
200
                    MobclickAgent.onEvent(getContext(), "1085 ");
201
                } else if (ChatRecommendBean.TARGET_TYPE_IMAGE_TEXT == chatRecommendBean.targetType) {
202
                    MobclickAgent.onEvent(getContext(), "1064 ");
203
                }
198 204
                dialog.dismiss();
199 205
                break;
200 206
        }
@ -207,6 +213,12 @@ public class ChatContentCommentListDialogFragment extends DialogFragment impleme
207 213
            return;
208 214
        }
209 215
216
        if (ChatRecommendBean.TARGET_TYPE_VIDEO == chatRecommendBean.targetType) {
217
            MobclickAgent.onEvent(getContext(), "1083 ");
218
        } else if (ChatRecommendBean.TARGET_TYPE_IMAGE_TEXT == chatRecommendBean.targetType) {
219
            MobclickAgent.onEvent(getContext(), "1062 ");
220
        }
221
210 222
        String url = MainApplication.urlNew + "/topic/comments/publish.do";
211 223
        final Map<String, String> map = new HashMap<>();
212 224
        map.put("targetId", chatRecommendBean.targetId + "");
@ -474,6 +486,11 @@ public class ChatContentCommentListDialogFragment extends DialogFragment impleme
474 486
         * 点赞操作
475 487
         */
476 488
        private void doLike() {
489
            if (ChatRecommendBean.TARGET_TYPE_VIDEO == bean.targetType) {
490
                MobclickAgent.onEvent(getContext(), "1081 ");
491
            } else if (ChatRecommendBean.TARGET_TYPE_IMAGE_TEXT == bean.targetType) {
492
                MobclickAgent.onEvent(getContext(), "1060 ");
493
            }
477 494
            String url = MainApplication.urlNew + "/topic/like.do";
478 495
            Map<String, String> map = new HashMap<>();
479 496
            map.put("targetId", bean.id + "");
@ -510,6 +527,12 @@ public class ChatContentCommentListDialogFragment extends DialogFragment impleme
510 527
                return;
511 528
            }
512 529
530
            if (ChatRecommendBean.TARGET_TYPE_VIDEO == bean.targetType) {
531
                MobclickAgent.onEvent(getContext(), "1084 ");
532
            } else if (ChatRecommendBean.TARGET_TYPE_IMAGE_TEXT == bean.targetType) {
533
                MobclickAgent.onEvent(getContext(), "1063 ");
534
            }
535
513 536
            String url = MainApplication.urlNew + "/topic/del.do";
514 537
            final Map<String, String> map = new HashMap<>();
515 538
            map.put("targetId", bean.id + "");
@ -553,6 +576,12 @@ public class ChatContentCommentListDialogFragment extends DialogFragment impleme
553 576
                return;
554 577
            }
555 578
579
            if (ChatRecommendBean.TARGET_TYPE_VIDEO == bean.targetType) {
580
                MobclickAgent.onEvent(getContext(), "1082 ");
581
            } else if (ChatRecommendBean.TARGET_TYPE_IMAGE_TEXT == bean.targetType) {
582
                MobclickAgent.onEvent(getContext(), "1061 ");
583
            }
584
556 585
            String url = MainApplication.urlNew + "/topic/comments/publish.do";
557 586
            final Map<String, String> map = new HashMap<>();
558 587
            map.put("targetId", chatRecommendBean.targetId + "");

+ 0 - 32
app/src/main/java/com/electric/chargingpile/fragment/ChatRecommendFragment.java

@ -133,43 +133,11 @@ public class ChatRecommendFragment extends Fragment implements View.OnClickListe
133 133
                ChatBeanLab beanLab = ChatBeanLab.get(getContext());
134 134
                ChatRecommendBean b = beanLab.beans().get(position - 1);
135 135
                int index = beanLab.index(b);
136
137 136
                Intent intent =  new Intent(getActivity(), ChatContentListActivity.class);
138 137
                intent.putExtra("from", ChatContentListActivity.FROM_CHAT_HOME);
139 138
                intent.putExtra("index", index);
140 139
                getActivity().startActivityForResult(intent, ChatContentListActivity.REQUEST_CODE_CHAT_HOME);
141 140
142
                if (true) return;
143
144
145
                final List<ChatRecommendBean> beans = ChatBeanLab.get(getContext()).beans();
146
                ChatRecommendBean bean = beans.get(position - 1);
147
                Disposable disposable = Observable.fromIterable(beans).filter(new Predicate<ChatRecommendBean>() {
148
                    @Override
149
                    public boolean test(ChatRecommendBean chatRecommendBean) throws Exception {
150
                        return chatRecommendBean.targetType != 25;
151
                    }
152
                }).toList().subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Consumer<List<ChatRecommendBean>>() {
153
                    @Override
154
                    public void accept(List<ChatRecommendBean> list) throws Exception {
155
                        ChatRecommendBean chatRecommendBean = beans.get(position - 1);
156
157
                        int index = 0;
158
                        for (int i = 0; i < list.size(); i++) {
159
                            ChatRecommendBean tmp = list.get(i);
160
                            if (tmp.targetType == chatRecommendBean.targetType &&
161
                                    tmp.targetId == chatRecommendBean.targetId) {
162
                                index = i;
163
                                break;
164
                            }
165
                        }
166
167
                        Intent intent = new Intent(getActivity(), VideoDetaislActivity.class);
168
                        intent.putExtra("list", (Serializable) list);
169
                        intent.putExtra("pos", index);
170
                        startActivity(intent);
171
                    }
172
                });
173 141
            }
174 142
        });
175 143