45 
import com.squareup.otto.Subscribe;
42 46 
import com.squareup.picasso.Picasso;
43 47 
import com.zhy.http.okhttp.OkHttpUtils;
@ -58,7 +62,7 @@ import java.util.regex.Pattern;
58 62 
import okhttp3.Call;
59 63
60 64 
public class SingleCommentActivity extends Activity implements View.OnClickListener {
61 
    private ImageView iv_back, iv_commentPic, iv_pgrade, iv_pzan, iv_level_img;
65 
    private ImageView iv_back, iv_commentPic, iv_pgrade, iv_pzan, iv_level_img,imgVideo,imgStart,imgTwo,imgThree;
62 66 
    private ListView lv_scomment;
63 67 
    private CircleImageView iv_picon;
64 68 
    private CustomScrollView scrollView;
@ -77,7 +81,8 @@ public class SingleCommentActivity extends Activity implements View.OnClickListe
77 81 
    private RelativeLayout rl_point;
78 82 
    private android.view.animation.Animation animation;
79 83 
    private ImageView certified_icon;
80
84 
    private RelativeLayout imgLayout;
85 
    private Gson mGson = new Gson();
81 86 
    @Override
82 87 
    protected void onCreate(Bundle savedInstanceState) {
83 88 
        super.onCreate(savedInstanceState);
@ -114,6 +119,11 @@ public class SingleCommentActivity extends Activity implements View.OnClickListe
114 119 
        certified_icon = (ImageView)findViewById(R.id.certified_icon);
115 120 
        fl_ptag = (TagFlowLayout) findViewById(R.id.fl_ptag);
116 121 
        iv_commentPic = (ImageView) findViewById(R.id.iv_commentPic);
122 
        imgTwo = (ImageView) findViewById(R.id.imgTwo);
123 
        imgThree = (ImageView) findViewById(R.id.imgThree);
124 
        imgVideo = (ImageView) findViewById(R.id.imgVideo);
125 
        imgStart = (ImageView) findViewById(R.id.imgStart);
126 
        imgLayout = findViewById(R.id.imgLayout);
117 127 
        iv_pgrade = (ImageView) findViewById(R.id.iv_pgrade);
118 128 
        iv_pzan = (ImageView) findViewById(R.id.iv_pzan);
119 129 
        et_commet = (ContainsEmojiEditText) findViewById(R.id.et_commet);
@ -167,12 +177,10 @@ public class SingleCommentActivity extends Activity implements View.OnClickListe
167 177 
                        Log.e("single==", "dealData: size=" + datas.size());
168 178 
                        lv_scomment.setAdapter(new ZhanSCommentsAdapter(datas, SingleCommentActivity.this, getApplicationContext(), "2", ""));
169 179
170 
                        new Handler().post(new Runnable() {
171 
                            @Override
172 
                            public void run() {
180 
                        new Handler().post(()-> {
173 181 
                                scrollView.fullScroll(ScrollView.FOCUS_UP);
174 182 
                            }
175 
                        });
183 
                        );
176 184 
                    } catch (JSONException e) {
177 185 
                        e.printStackTrace();
178 186 
                    }
@ -284,32 +292,96 @@ public class SingleCommentActivity extends Activity implements View.OnClickListe
284 292 
            }
285 293 
        }
286 294 
        //设置图片
287 
        String thumUrl = JsonUtils.getKeyResult(data, "thumUrl");
288 295 
        String fileUrl = JsonUtils.getKeyResult(data, "fileUrl");
289 
        if (!thumUrl.equals("")) {
290 
            iv_commentPic.setVisibility(View.VISIBLE);
291 
//            String url = "http://59.110.68.162"+"/zhannew/uploadfile/"+thumUrl;
292 
            String url = MainApplication.url + "/zhannew/uploadfile/" + thumUrl;
293 
            String file_url = MainApplication.url + "/zhannew/uploadfile/" + fileUrl;
294 
//            String file_url = "http://59.110.68.162"+"/zhannew/uploadfile/"+fileUrl;
295 
            final String[] ss = {file_url};
296 
            Picasso.with(MainApplication.context)
297 
                    .load(url)
298 
                    .placeholder(R.drawable.icon_user1118)
299 
                    .error(R.drawable.icon_user1118)
300 
                    .into(iv_commentPic);
301 
            iv_commentPic.setOnClickListener(new View.OnClickListener() {
302 
                @Override
303 
                public void onClick(View v) {
304 
                    Intent intent = new Intent(getApplicationContext(), ImagePagerActivity.class);
305 
                    // 图片url,为了演示这里使用常量，一般从数据库中或网络中获取
306 
                    intent.putExtra(ImagePagerActivity.EXTRA_IMAGE_URLS, ss);
307 
                    intent.putExtra(ImagePagerActivity.EXTRA_IMAGE_INDEX, 0);
308 
                    startActivity(intent);
309 
                }
296 
        fileUrl=fileUrl==null?"":fileUrl;
297 
        String file2Url =  JsonUtils.getKeyResult(data, "file2Url");
298 
        file2Url=file2Url==null?"":file2Url;
299 
        String file3Url =  JsonUtils.getKeyResult(data, "file3Url");
300 
        file3Url=file3Url==null?"":file3Url;
301 
        String type = JsonUtils.getKeyResult(data, "type")==null?"":JsonUtils.getKeyResult(data, "type"); //23 视频，24 图片
302 
        if (type.equals("23")){
303 
           imgVideo.setVisibility(View.VISIBLE);
304 
           imgStart.setVisibility(View.VISIBLE);
305 
           imgLayout.setVisibility(View.VISIBLE);
306
307 
           iv_commentPic.setVisibility(View.GONE);
308 
           imgTwo.setVisibility(View.GONE);
309 
           imgThree.setVisibility(View.GONE);
310
311 
            String thumUrl = JsonUtils.getKeyResult(data, "thumUrl");
312 
            if (!TextUtils.isEmpty(thumUrl) && !TextUtils.isEmpty(fileUrl)){
313 
                Glide.with(this)
314 
                        .load(MainApplication.CDN +thumUrl)
315 
                        .into(imgVideo);
316
317 
                imgVideo.setOnClickListener(v->{
318 
                    CommentVideoDetailActivity.actioinStart(this,pid);
319 
                });
320 
            }
321
322 
        }else {
323
324 
            imgVideo.setVisibility(View.GONE);
325 
            imgStart.setVisibility(View.GONE);
326
327
328 
            if (!fileUrl.equals("")) {
329 
                iv_commentPic.setVisibility(View.VISIBLE);
330 
                imgLayout.setVisibility(View.VISIBLE);
331
332 
                Picasso.with(this)
333 
                        .load(MainApplication.url + "/zhannew/uploadfile/"+fileUrl)
334 
                        .into(iv_commentPic);
335
336 
            } else {
337 
                iv_commentPic.setVisibility(View.GONE);
338 
                imgLayout.setVisibility(View.GONE);
339 
            }
340 
            if (!file2Url.equals("")) {
341 
                imgTwo.setVisibility(View.VISIBLE);
342 
                Picasso.with(this)
343 
                        .load(MainApplication.url + "/zhannew/uploadfile/"+file2Url)
344 
                        .into(imgTwo);
345 
            } else {
346 
                imgTwo.setVisibility(View.GONE);
347 
            }
348 
            if (!file3Url.equals("")) {
349 
                imgThree.setVisibility(View.VISIBLE);
350 
                Picasso.with(this)
351 
                        .load(MainApplication.url + "/zhannew/uploadfile/"+file3Url)
352 
                        .into(imgThree);
353 
            } else {
354 
                imgThree.setVisibility(View.GONE);
355 
            }
356
357 
            String[] fileUrlArray = null;
358 
            if (!TextUtils.isEmpty(fileUrl) && !TextUtils.isEmpty(file2Url) &&!TextUtils.isEmpty(file3Url)){
359 
                fileUrlArray =new String[]{
360 
                        MainApplication.url + "/zhannew/uploadfile/"+fileUrl,
361 
                        MainApplication.url + "/zhannew/uploadfile/"+file2Url,
362 
                        MainApplication.url + "/zhannew/uploadfile/"+file3Url
363 
                };
364 
            }else  if (!TextUtils.isEmpty(fileUrl) && !TextUtils.isEmpty(file2Url)){
365 
                fileUrlArray =new String[]{
366 
                        MainApplication.url + "/zhannew/uploadfile/"+fileUrl,
367 
                        MainApplication.url + "/zhannew/uploadfile/"+file2Url
368 
                };
369 
            }else  if (!TextUtils.isEmpty(fileUrl)){
370 
                fileUrlArray =new String[]{ MainApplication.url + "/zhannew/uploadfile/"+fileUrl};
371 
            }
372
373
374 
            String[] finalFileUrlArray = fileUrlArray;
375 
            iv_commentPic.setOnClickListener(v->{
376 
                startImagePager(finalFileUrlArray, 0);
377 
            });
378
379 
            imgTwo.setOnClickListener(v->{
380 
                startImagePager(finalFileUrlArray, 1);
381 
            });
382 
            imgThree.setOnClickListener(v->{
383 
                startImagePager(finalFileUrlArray, 2);
310 384 
            });
311 
        } else {
312 
            iv_commentPic.setVisibility(View.GONE);
313 385 
        }
314 386 
        //设置评分
315 387 
        String grade = JsonUtils.getKeyResult(data, "star_level");
@ -422,6 +494,16 @@ public class SingleCommentActivity extends Activity implements View.OnClickListe
422 494
423 495 
    }
424 496
497 
    private void startImagePager(String[] finalFileUrlArray, int i) {
498
499
500 
        Intent intent = new Intent(SingleCommentActivity.this, ImagePagerActivity.class);
501 
        // 图片url,为了演示这里使用常量，一般从数据库中或网络中获取
502 
        intent.putExtra(ImagePagerActivity.EXTRA_IMAGE_URLS, finalFileUrlArray);
503 
        intent.putExtra(ImagePagerActivity.EXTRA_IMAGE_INDEX, i);
504 
        startActivity(intent);
505 
    }
506
425 507 
    @Override
426 508 
    public void onClick(View v) {
427 509 
        switch (v.getId()) {

+ 31 - 11
app/src/main/java/com/electric/chargingpile/adapter/NewPingLunAdapter.java
Ver fichero 

@ -28,6 +28,7 @@ import com.electric.chargingpile.R;
28 28 
import com.electric.chargingpile.activity.ImagePagerActivity;
29 29 
import com.electric.chargingpile.activity.NewZhanDetailsActivity;
30 30 
import com.electric.chargingpile.activity.SingleCommentActivity;
31 
import com.electric.chargingpile.activity.CommentVideoDetailActivity;
31 32 
import com.electric.chargingpile.application.MainApplication;
32 33 
import com.electric.chargingpile.util.JsonUtils;
33 34 
import com.electric.chargingpile.util.Util;
 
@ -153,29 +154,48 @@ public class NewPingLunAdapter extends BaseAdapter {
153 154 
        }
154 155
155 156 
        {
157 
            final View finalConvertView2 = convertView;
156 158 
            try {
159 
                String is_play = TextUtils.isEmpty( datas.get(position).getString("is_play"))?"": datas.get(position).getString("is_play")  ; //0 审核未通过 item隐藏，1 审核通过，item显示
160
161 
                if (TextUtils.isEmpty(is_play) && is_play.equals("1")){
162 
                    convertView.setVisibility(View.VISIBLE);
163 
                }else{
164 
                    convertView.setVisibility(View.GONE);
165 
                }
166
157 167 
//                "fileUrl":"","thumUrl":""
158 168 
                //父级评论图片
159 169 
                String fileUrl = datas.get(position).getString("fileUrl");
160 170 
                String file2Url = datas.get(position).getString("file2Url");
161 171 
                String file3Url = datas.get(position).getString("file3Url");
162 
                String type = datas.get(position).getString("type"); //23 视频，24 图片
172
173
174 
                fileUrl=fileUrl==null?"":fileUrl;
175 
                file2Url=file2Url==null?"":file2Url;
176 
                file3Url=file3Url==null?"":file3Url;
177 
                String type = TextUtils.isEmpty(datas.get(position).getString("type"))?"":datas.get(position).getString("type"); //23 视频，24 图片
163 178 
                if (type.equals("23")){
164 
                    String thumUrl = datas.get(position).getString("thumUrl");
165 
                    if (!TextUtils.isEmpty(thumUrl)){
166 
                        holder.imgVideo.setVisibility(View.VISIBLE);
167 
                        holder.imgStart.setVisibility(View.VISIBLE);
179 
                    holder.imgVideo.setVisibility(View.VISIBLE);
180 
                    holder.imgStart.setVisibility(View.VISIBLE);
181 
                    holder.imgLayout.setVisibility(View.VISIBLE);
168 182
169 
                        holder.iv_commentPic.setVisibility(View.GONE);
170 
                        holder.imgTwo.setVisibility(View.GONE);
171 
                        holder.imgThree.setVisibility(View.GONE);
183 
                    holder.iv_commentPic.setVisibility(View.GONE);
184 
                    holder.imgTwo.setVisibility(View.GONE);
185 
                    holder.imgThree.setVisibility(View.GONE);
172 186
187 
                    String thumUrl = datas.get(position).getString("thumUrl");
188 
                    if (!TextUtils.isEmpty(thumUrl) && !TextUtils.isEmpty(fileUrl)){
173 189 
                        Glide.with(MainApplication.context)
174 
                                .load(MainApplication.CDN +fileUrl)
190 
                                .load(MainApplication.CDN +thumUrl)
175 191 
                                .into(holder.imgVideo);
176 192
177 193 
                        holder.imgVideo.setOnClickListener(v->{
178
194 
                            try {
195 
                                CommentVideoDetailActivity.actioinStart(finalConvertView2.getContext(),datas.get(position).getString("id"));
196 
                            } catch (JSONException e) {
197 
                                e.printStackTrace();
198 
                            }
179 199 
                        });
180 200 
                    }
181 201 
                }else {
 
@ -230,7 +250,7 @@ public class NewPingLunAdapter extends BaseAdapter {
230 250 
                        fileUrlArray =new String[]{ MainApplication.url + "/zhannew/uploadfile/"+fileUrl};
231 251 
                    }
232 252
233 
                    final View finalConvertView2 = convertView;
253
234 254 
                    String[] finalFileUrlArray = fileUrlArray;
235 255 
                    holder.iv_commentPic.setOnClickListener(new View.OnClickListener() {
236 256 
                        @Override

+ 23 - 14
app/src/main/java/com/electric/chargingpile/adapter/ZhanCommentsAapter.java
Ver fichero 

@ -27,6 +27,7 @@ import com.electric.chargingpile.activity.LoginActivity;
27 27 
import com.electric.chargingpile.activity.MainMapActivity;
28 28 
import com.electric.chargingpile.activity.NewZhanDetailsActivity;
29 29 
import com.electric.chargingpile.activity.SingleCommentActivity;
30 
import com.electric.chargingpile.activity.CommentVideoDetailActivity;
30 31 
import com.electric.chargingpile.application.MainApplication;
31 32 
import com.electric.chargingpile.fragment.ZhanCommentFragment;
32 33 
import com.electric.chargingpile.util.CarTypeUtil;
 
@ -431,33 +432,41 @@ public class ZhanCommentsAapter extends BaseAdapter {
431 432
432 433 
                    }
433 434 
                });
435
436 
                String is_play = TextUtils.isEmpty( datas.get(position).getString("is_play"))?"": datas.get(position).getString("is_play")  ; //0 审核未通过 item隐藏，1 审核通过，item显示
437
438 
                if (TextUtils.isEmpty(is_play) && is_play.equals("1")){
439 
                    convertView.setVisibility(View.VISIBLE);
440 
                }else{
441 
                    convertView.setVisibility(View.GONE);
442 
                }
443
434 444 
                //父级评论图片
435 445 
                String fileUrl = datas.get(position).getString("fileUrl");
436 446 
                String file2Url = datas.get(position).getString("file2Url");
437 447 
                String file3Url = datas.get(position).getString("file3Url");
438 
                String type = datas.get(position).getString("type"); //23 视频，24 图片
448 
                fileUrl = fileUrl == null?"":fileUrl;
449 
                file2Url= file2Url == null?"":file2Url;
450 
                file3Url= file3Url == null?"":file3Url;
451 
                String type = TextUtils.isEmpty(datas.get(position).getString("type"))?"":datas.get(position).getString("type"); //23 视频，24 图片
439 452 
                if (type.equals("23")){
453 
                    holder.imgVideo.setVisibility(View.VISIBLE);
454 
                    holder.imgStart.setVisibility(View.VISIBLE);
455 
                    holder.imgLayout.setVisibility(View.VISIBLE);
440 456
441 
                    String thumUrl = datas.get(position).getString("thumUrl");
442 
                    if (!TextUtils.isEmpty(thumUrl)){
443 
                        holder.imgVideo.setVisibility(View.VISIBLE);
444 
                        holder.imgStart.setVisibility(View.VISIBLE);
445
446 
                        holder.iv_commentPic.setVisibility(View.GONE);
447 
                        holder.imgTwo.setVisibility(View.GONE);
448 
                        holder.imgThree.setVisibility(View.GONE);
457 
                    holder.iv_commentPic.setVisibility(View.GONE);
458 
                    holder.imgTwo.setVisibility(View.GONE);
459 
                    holder.imgThree.setVisibility(View.GONE);
449 460
461 
                    String thumUrl = datas.get(position).getString("thumUrl");
462 
                    if (!TextUtils.isEmpty(thumUrl) && !TextUtils.isEmpty(fileUrl)){
450 463 
                        Glide.with(MainApplication.context)
451 464 
                                .load(MainApplication.CDN +thumUrl)
452 465 
                                .into(holder.imgVideo);
453 466
454 467 
                        holder.imgVideo.setOnClickListener(v->{
455 468 
                            try {
456 
                                if (!datas.get(position).getString("id").equals("") && null != datas.get(position).getString("id")) {
457 
                                    Intent intent = new Intent(finalConvertView1.getContext(), SingleCommentActivity.class);
458 
                                    intent.putExtra("id", datas.get(position).getString("id"));
459 
                                    finalConvertView1.getContext().startActivity(intent);
460 
                                }
469 
                                CommentVideoDetailActivity.actioinStart(finalConvertView1.getContext(),datas.get(position).getString("id"));
461 470 
                            } catch (JSONException e) {
462 471 
                                e.printStackTrace();
463 472 
                            }

+ 287 - 0
app/src/main/java/com/electric/chargingpile/data/SingleCommentBean.java
Ver fichero 

@ -0,0 +1,287 @@
1 
package com.electric.chargingpile.data;
2
3 
import java.util.List;
4
5
6 
public class SingleCommentBean  {
7
8 
    private String id;
9
10 
    private String ancestorid;
11
12 
    private String parentid;
13
14 
    private String userid;
15
16 
    private String agreeNum;
17
18 
    private String tel;
19
20 
    private String hascar;
21
22 
    private String zhanid;
23
24 
    private String content;
25
26 
    private String fileUrl;
27
28 
    private String file2Url;
29
30 
    private String file3Url;
31
32 
    private String theme;
33
34 
    private String isPlay;
35
36 
    private String type;
37
38 
    private String thumUrl;
39
40 
    private String addtime;
41
42 
    private String nickname;
43
44 
    private String userpic;
45
46 
    private String username;
47
48 
    private String chexing;
49
50 
    private String fine;
51
52 
    private String commentsCount;
53
54 
    private String starLevel;
55
56 
    private String tag;
57
58 
    private List<SubcommentBean> subcomments;
59
60 
    private Integer isCertifiedOwner;
61
62 
    private String title;
63
64 
    public String getId() {
65 
        return id;
66 
    }
67
68 
    public void setId(String id) {
69 
        this.id = id;
70 
    }
71
72 
    public String getAncestorid() {
73 
        return ancestorid;
74 
    }
75
76 
    public void setAncestorid(String ancestorid) {
77 
        this.ancestorid = ancestorid;
78 
    }
79
80 
    public String getParentid() {
81 
        return parentid;
82 
    }
83
84 
    public void setParentid(String parentid) {
85 
        this.parentid = parentid;
86 
    }
87
88 
    public String getUserid() {
89 
        return userid;
90 
    }
91
92 
    public void setUserid(String userid) {
93 
        this.userid = userid;
94 
    }
95
96 
    public String getAgreeNum() {
97 
        return agreeNum;
98 
    }
99
100 
    public void setAgreeNum(String agreeNum) {
101 
        this.agreeNum = agreeNum;
102 
    }
103
104 
    public String getTel() {
105 
        return tel;
106 
    }
107
108 
    public void setTel(String tel) {
109 
        this.tel = tel;
110 
    }
111
112 
    public String getHascar() {
113 
        return hascar;
114 
    }
115
116 
    public void setHascar(String hascar) {
117 
        this.hascar = hascar;
118 
    }
119
120 
    public String getZhanid() {
121 
        return zhanid;
122 
    }
123
124 
    public void setZhanid(String zhanid) {
125 
        this.zhanid = zhanid;
126 
    }
127
128 
    public String getContent() {
129 
        return content;
130 
    }
131
132 
    public void setContent(String content) {
133 
        this.content = content;
134 
    }
135
136 
    public String getFileUrl() {
137 
        return fileUrl;
138 
    }
139
140 
    public void setFileUrl(String fileUrl) {
141 
        this.fileUrl = fileUrl;
142 
    }
143
144 
    public String getFile2Url() {
145 
        return file2Url;
146 
    }
147
148 
    public void setFile2Url(String file2Url) {
149 
        this.file2Url = file2Url;
150 
    }
151
152 
    public String getFile3Url() {
153 
        return file3Url;
154 
    }
155
156 
    public void setFile3Url(String file3Url) {
157 
        this.file3Url = file3Url;
158 
    }
159
160 
    public String getTheme() {
161 
        return theme;
162 
    }
163
164 
    public void setTheme(String theme) {
165 
        this.theme = theme;
166 
    }
167
168 
    public String getIsPlay() {
169 
        return isPlay;
170 
    }
171
172 
    public void setIsPlay(String isPlay) {
173 
        this.isPlay = isPlay;
174 
    }
175
176 
    public String getType() {
177 
        return type;
178 
    }
179
180 
    public void setType(String type) {
181 
        this.type = type;
182 
    }
183
184 
    public String getThumUrl() {
185 
        return thumUrl;
186 
    }
187
188 
    public void setThumUrl(String thumUrl) {
189 
        this.thumUrl = thumUrl;
190 
    }
191
192 
    public String getAddtime() {
193 
        return addtime;
194 
    }
195
196 
    public void setAddtime(String addtime) {
197 
        this.addtime = addtime;
198 
    }
199
200 
    public String getNickname() {
201 
        return nickname;
202 
    }
203
204 
    public void setNickname(String nickname) {
205 
        this.nickname = nickname;
206 
    }
207
208 
    public String getUserpic() {
209 
        return userpic;
210 
    }
211
212 
    public void setUserpic(String userpic) {
213 
        this.userpic = userpic;
214 
    }
215
216 
    public String getUsername() {
217 
        return username;
218 
    }
219
220 
    public void setUsername(String username) {
221 
        this.username = username;
222 
    }
223
224 
    public String getChexing() {
225 
        return chexing;
226 
    }
227
228 
    public void setChexing(String chexing) {
229 
        this.chexing = chexing;
230 
    }
231
232 
    public String getFine() {
233 
        return fine;
234 
    }
235
236 
    public void setFine(String fine) {
237 
        this.fine = fine;
238 
    }
239
240 
    public String getCommentsCount() {
241 
        return commentsCount;
242 
    }
243
244 
    public void setCommentsCount(String commentsCount) {
245 
        this.commentsCount = commentsCount;
246 
    }
247
248 
    public String getStarLevel() {
249 
        return starLevel;
250 
    }
251
252 
    public void setStarLevel(String starLevel) {
253 
        this.starLevel = starLevel;
254 
    }
255
256 
    public String getTag() {
257 
        return tag;
258 
    }
259
260 
    public void setTag(String tag) {
261 
        this.tag = tag;
262 
    }
263
264 
    public List<SubcommentBean> getSubcomments() {
265 
        return subcomments;
266 
    }
267
268 
    public void setSubcomments(List<SubcommentBean> subcomments) {
269 
        this.subcomments = subcomments;
270 
    }
271
272 
    public Integer getIsCertifiedOwner() {
273 
        return isCertifiedOwner;
274 
    }
275
276 
    public void setIsCertifiedOwner(Integer isCertifiedOwner) {
277 
        this.isCertifiedOwner = isCertifiedOwner;
278 
    }
279
280 
    public String getTitle() {
281 
        return title;
282 
    }
283
284 
    public void setTitle(String title) {
285 
        this.title = title;
286 
    }
287 
}

+ 153 - 0
app/src/main/java/com/electric/chargingpile/data/SubcommentBean.java
Ver fichero 

@ -0,0 +1,153 @@
1 
package com.electric.chargingpile.data;
2
3 
public class SubcommentBean {
4 
    private String id;
5
6 
    private String ancestorid;
7
8 
    private String parentid;
9
10 
    private String userid;
11
12 
    private String tel;
13
14 
    private String hascar;
15
16 
    private String zhanid;
17
18 
    private String content;
19
20 
    private String addtime;
21
22 
    private String nickname;
23
24 
    private String userpic;
25
26 
    private String username;
27
28 
    private String child;
29
30 
    private String pnickname;
31
32 
    private String ptel;
33
34 
    public String getId() {
35 
        return id;
36 
    }
37
38 
    public void setId(String id) {
39 
        this.id = id;
40 
    }
41
42 
    public String getAncestorid() {
43 
        return ancestorid;
44 
    }
45
46 
    public void setAncestorid(String ancestorid) {
47 
        this.ancestorid = ancestorid;
48 
    }
49
50 
    public String getParentid() {
51 
        return parentid;
52 
    }
53
54 
    public void setParentid(String parentid) {
55 
        this.parentid = parentid;
56 
    }
57
58 
    public String getUserid() {
59 
        return userid;
60 
    }
61
62 
    public void setUserid(String userid) {
63 
        this.userid = userid;
64 
    }
65
66 
    public String getTel() {
67 
        return tel;
68 
    }
69
70 
    public void setTel(String tel) {
71 
        this.tel = tel;
72 
    }
73
74 
    public String getHascar() {
75 
        return hascar;
76 
    }
77
78 
    public void setHascar(String hascar) {
79 
        this.hascar = hascar;
80 
    }
81
82 
    public String getZhanid() {
83 
        return zhanid;
84 
    }
85
86 
    public void setZhanid(String zhanid) {
87 
        this.zhanid = zhanid;
88 
    }
89
90 
    public String getContent() {
91 
        return content;
92 
    }
93
94 
    public void setContent(String content) {
95 
        this.content = content;
96 
    }
97
98 
    public String getAddtime() {
99 
        return addtime;
100 
    }
101
102 
    public void setAddtime(String addtime) {
103 
        this.addtime = addtime;
104 
    }
105
106 
    public String getNickname() {
107 
        return nickname;
108 
    }
109
110 
    public void setNickname(String nickname) {
111 
        this.nickname = nickname;
112 
    }
113
114 
    public String getUserpic() {
115 
        return userpic;
116 
    }
117
118 
    public void setUserpic(String userpic) {
119 
        this.userpic = userpic;
120 
    }
121
122 
    public String getUsername() {
123 
        return username;
124 
    }
125
126 
    public void setUsername(String username) {
127 
        this.username = username;
128 
    }
129
130 
    public String getChild() {
131 
        return child;
132 
    }
133
134 
    public void setChild(String child) {
135 
        this.child = child;
136 
    }
137
138 
    public String getPnickname() {
139 
        return pnickname;
140 
    }
141
142 
    public void setPnickname(String pnickname) {
143 
        this.pnickname = pnickname;
144 
    }
145
146 
    public String getPtel() {
147 
        return ptel;
148 
    }
149
150 
    public void setPtel(String ptel) {
151 
        this.ptel = ptel;
152 
    }
153 
}

+ 2 - 0
app/src/main/res/layout/activity_chat.xml
Ver fichero 

@ -22,6 +22,7 @@
22 22 
            android:orientation="horizontal">
23 23
24 24 
            <TextView
25 
                android:visibility="gone"
25 26 
                android:id="@+id/act_bar_title_recommend"
26 27 
                android:layout_width="wrap_content"
27 28 
                android:layout_height="match_parent"
 
@ -34,6 +35,7 @@
34 35 
                android:textSize="18sp" />
35 36
36 37 
            <View
38 
                android:visibility="gone"
37 39 
                android:layout_width="1dp"
38 40 
                android:layout_height="15dp"
39 41 
                android:background="@color/ui_6d" />

+ 64 - 15
app/src/main/res/layout/activity_single_comment.xml
Ver fichero 

@ -7,7 +7,7 @@
7 7 
    android:layout_width="match_parent"
8 8 
    android:layout_height="match_parent"
9 9 
    android:background="@color/white"
10 
    tools:context="com.electric.chargingpile.activity.SingleCommentActivity">
10 
   >
11 11
12 12 
    <com.zhy.autolayout.AutoRelativeLayout
13 13 
        android:id="@+id/rl_title"
 
@ -171,7 +171,7 @@
171 171 
                    android:layout_alignLeft="@+id/tv_pname"
172 172 
                    android:layout_marginTop="10dp"
173 173 
                    android:layout_marginRight="15dp"
174 
                    android:text=""
174 
                    tools:text="sssssssssgin"
175 175 
                    android:textAppearance="?android:attr/textAppearanceSmall"
176 176 
                    android:textSize="15sp"
177 177 
                    android:visibility="visible" />
 
@ -186,31 +186,75 @@
186 186 
                    android:visibility="visible"
187 187 
                    zhy:max_select="-1" />
188 188
189 
                <ImageView
190 
                    android:id="@+id/iv_commentPic"
191 
                    android:layout_width="65dp"
192 
                    android:layout_height="65dp"
189 
                <RelativeLayout
190 
                    android:layout_marginTop="10dp"
191 
                    android:id="@+id/imgLayout"
193 192 
                    android:layout_below="@+id/fl_ptag"
194 193 
                    android:layout_alignLeft="@+id/tv_pcontext"
195 
                    android:layout_marginTop="10dp"
196 
                    android:scaleType="centerCrop"
197 
                    android:visibility="gone" />
194 
                    android:layout_width="match_parent"
195 
                    android:layout_height="wrap_content">
196 
                    <ImageView
197 
                        tools:visibility="visible"
198 
                        android:id="@+id/iv_commentPic"
199 
                        android:layout_width="65dp"
200 
                        android:layout_height="65dp"
201 
                        android:scaleType="centerCrop"
202 
                        android:visibility="gone" />
203 
                    <ImageView
204 
                        android:layout_marginEnd="4dp"
205 
                        android:layout_marginStart="4dp"
206 
                        android:id="@+id/imgTwo"
207 
                        tools:visibility="visible"
208 
                        android:layout_width="65dp"
209 
                        android:layout_height="65dp"
210 
                        android:layout_toRightOf="@+id/iv_commentPic"
211 
                        android:scaleType="centerCrop"
212 
                        android:visibility="gone" />
213 
                    <ImageView
214 
                        android:id="@+id/imgThree"
215 
                        tools:visibility="visible"
216 
                        android:layout_width="65dp"
217 
                        android:layout_height="65dp"
218 
                        android:layout_toRightOf="@+id/imgTwo"
219 
                        android:scaleType="centerCrop"
220 
                        android:visibility="gone" />
221
222 
                    <ImageView
223 
                        tools:visibility="visible"
224 
                        android:id="@+id/imgVideo"
225 
                        android:layout_width="110dp"
226 
                        android:layout_height="62dp"
227 
                        android:scaleType="centerCrop"
228 
                        android:visibility="gone" />
229
230 
                    <ImageView
231 
                        android:layout_centerInParent="true"
232 
                        android:id="@+id/imgStart"
233 
                        android:layout_width="wrap_content"
234 
                        android:layout_height="wrap_content"
235 
                        android:layout_alignEnd="@+id/imgVideo"
236 
                        android:layout_alignParentStart="true"
237 
                        android:src="@drawable/app_talk_video_icon"
238 
                        android:visibility="gone"
239 
                        tools:visibility="visible" />
240 
                </RelativeLayout>
198 241
199 242 
                <TextView
200 243 
                    android:id="@+id/tv_ptime"
201 244 
                    android:layout_width="wrap_content"
202 245 
                    android:layout_height="wrap_content"
203 
                    android:layout_below="@+id/iv_commentPic"
246 
                    android:layout_below="@+id/imgLayout"
204 247 
                    android:layout_alignStart="@+id/tv_pcontext"
205 248 
                    android:layout_alignLeft="@+id/tv_pcontext"
206 249 
                    android:layout_marginTop="10dp"
207 250 
                    android:layout_marginBottom="8dp"
208 
                    android:text=""
251 
                    tools:text="2020-04-14"
209 252 
                    android:textAppearance="?android:attr/textAppearanceSmall"
210 253 
                    android:textColor="#c8c8c8"
211 254 
                    android:textSize="12sp" />
212 255
213 256 
                <TextView
257 
                    tools:visibility="visible"
214 258 
                    android:id="@+id/tv_pdelete"
215 259 
                    android:layout_width="wrap_content"
216 260 
                    android:layout_height="wrap_content"
 
@ -228,7 +272,7 @@
228 272 
                    android:id="@+id/ll_pzan"
229 273 
                    android:layout_width="wrap_content"
230 274 
                    android:layout_height="wrap_content"
231 
                    android:layout_below="@+id/iv_commentPic"
275 
                    android:layout_below="@+id/imgLayout"
232 276 
                    android:layout_toLeftOf="@+id/tv_preply"
233 277 
                    android:paddingLeft="10dp"
234 278 
                    android:paddingTop="10dp"
 
@ -261,7 +305,7 @@
261 305 
                    android:id="@+id/tv_preply"
262 306 
                    android:layout_width="wrap_content"
263 307 
                    android:layout_height="wrap_content"
264 
                    android:layout_below="@+id/iv_commentPic"
308 
                    android:layout_below="@+id/imgLayout"
265 309 
                    android:layout_alignEnd="@+id/tv_pcontext"
266 310 
                    android:layout_alignRight="@+id/tv_pcontext"
267 311 
                    android:layout_alignParentRight="true"
 
@ -277,6 +321,7 @@
277 321
278 322
279 323 
                <TextView
324 
                    tools:visibility="visible"
280 325 
                    android:id="@+id/tv_childName"
281 326 
                    android:layout_width="wrap_content"
282 327 
                    android:layout_height="wrap_content"
 
@ -289,6 +334,7 @@
289 334 
                    android:visibility="gone" />
290 335
291 336 
                <TextView
337 
                    tools:visibility="visible"
292 338 
                    android:id="@+id/textView14"
293 339 
                    android:layout_width="wrap_content"
294 340 
                    android:layout_height="wrap_content"
 
@ -301,6 +347,7 @@
301 347 
                    android:visibility="gone" />
302 348
303 349 
                <TextView
350 
                    tools:visibility="visible"
304 351 
                    android:id="@+id/tv_parentName"
305 352 
                    android:layout_width="wrap_content"
306 353 
                    android:layout_height="wrap_content"
 
@ -313,6 +360,7 @@
313 360 
                    android:visibility="gone" />
314 361
315 362 
                <TextView
363 
                    tools:visibility="visible"
316 364 
                    android:id="@+id/tv_commentDetail"
317 365 
                    android:layout_width="wrap_content"
318 366 
                    android:layout_height="wrap_content"
 
@ -325,6 +373,7 @@
325 373 
                    android:visibility="gone" />
326 374
327 375 
                <com.electric.chargingpile.view.MyListView
376
328 377 
                    android:id="@+id/lv_scomment"
329 378 
                    android:layout_width="match_parent"
330 379 
                    android:layout_height="wrap_content"
 
@ -395,7 +444,7 @@
395 444 
                <!--android:background="@color/bg_row"-->
396 445 
                <!--android:layout_below="@+id/ll_comment"/>-->
397 446 
                <View
398
447 
                    tools:visibility="visible"
399 448 
                    android:layout_width="match_parent"
400 449 
                    android:layout_height="0.5dp"
401 450 
                    android:layout_below="@+id/tv_ptime"
 
@ -656,10 +705,10 @@
656 705 
    </LinearLayout>
657 706
658 707 
    <RelativeLayout
708 
        tools:visibility="visible"
659 709 
        android:id="@+id/rl_point"
660 710 
        android:layout_width="80dp"
661 711 
        android:layout_height="80dp"
662 
        android:layout_alignBottom="@+id/sv"
663 712 
        android:layout_alignParentBottom="true"
664 713 
        android:layout_centerHorizontal="true"
665 714 
        android:layout_marginBottom="50dp"

+ 16 - 0
app/src/main/res/layout/activity_video_detail.xml
Ver fichero 

@ -0,0 +1,16 @@
1 
<?xml version="1.0" encoding="utf-8"?>
2 
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 
    xmlns:app="http://schemas.android.com/apk/res-auto"
4 
    xmlns:tools="http://schemas.android.com/tools"
5 
    android:layout_width="match_parent"
6 
    android:layout_height="match_parent">
7
8 
    <com.electric.chargingpile.video.VideoPlayer
9 
        android:id="@+id/videoPlayer"
10 
        android:layout_width="wrap_content"
11 
        android:layout_height="wrap_content"
12 
        app:layout_constraintEnd_toEndOf="parent"
13 
        app:layout_constraintStart_toStartOf="parent"
14 
        app:layout_constraintTop_toTopOf="parent" />
15
16 
</androidx.constraintlayout.widget.ConstraintLayout>

bug · 9076b871df - Gogs: Go Git Service
Начало Каталог Помощ
Регистрация Вход
dudu
/
cdzApp
Наблюдаван 2
Харесван 1
Разклонения 0
Код Задачи 0 Заявки за сливане 0 Ревизии 76 Версии 18 Уики
Преглед на файлове

bug

dxh преди 7 години
родител
75a5494c1e
ревизия
9076b871df
променени са 4 файла, в които са добавени 20 реда и са изтрити 3 реда
Разделен изглед Покажи статистика за разликите
  1. 5 1
      app/src/main/java/com/electric/chargingpile/adapter/VideoCommentAdapter.java
  2. 5 0
      app/src/main/java/com/electric/chargingpile/fragment/TalkRecommendFragment.java
  3. 4 0
      app/src/main/java/com/electric/chargingpile/view/VideoCommentDialog.java
  4. 6 2
      app/src/main/res/layout/app_talk_item_recylerview.xml

+ 5 - 1
app/src/main/java/com/electric/chargingpile/adapter/VideoCommentAdapter.java
Целия файл 

@ -68,7 +68,7 @@ public class VideoCommentAdapter extends RecyclerView.Adapter<VideoCommentAdapte
68 68
69 69 
        viewHolder.mItemUserName.setText(videoCommentBean.nickNameFromUser);
70 70
71 
        viewHolder.mItemUserTime.setText(videoCommentBean.addTime + "");
71 
        viewHolder.mItemUserTime.setText(videoCommentBean.addDate + "");
72 72 
        viewHolder.mItemUserCon.setText(videoCommentBean.content);
73 73 
//
74 74 
//        viewHolder.mItemUserOperation = (LinearLayout) itemView.findViewById(R.id.item_user_operation);
 
@ -106,6 +106,10 @@ public class VideoCommentAdapter extends RecyclerView.Adapter<VideoCommentAdapte
106 106 
        notifyDataSetChanged();
107 107 
    }
108 108
109 
    public int getAllCount(){
110 
        return dataList.size();
111 
    }
112
109 113 
    public void addData(List<VideoCommentBean> qadata) {
110 114 
        if (qadata != null) {
111 115 
            dataList.addAll(qadata);

+ 5 - 0
app/src/main/java/com/electric/chargingpile/fragment/TalkRecommendFragment.java
Целия файл 

@ -25,6 +25,7 @@ import com.electric.chargingpile.data.Person;
25 25 
import com.electric.chargingpile.data.TalkRecommendBean;
26 26 
import com.electric.chargingpile.iview.RecyclerItemTypeClickListener;
27 27 
import com.electric.chargingpile.util.JsonUtils;
28 
import com.electric.chargingpile.util.NetUtil;
28 29 
import com.electric.chargingpile.util.ToastUtil;
29 30 
import com.zhy.http.okhttp.OkHttpUtils;
30 31 
import com.zhy.http.okhttp.callback.StringCallback;
 
@ -121,6 +122,10 @@ public class TalkRecommendFragment extends Fragment implements View.OnClickListe
121 122 
                int pos = position - 1;
122 123 
                ArrayList<TalkRecommendBean> talkRecommendBeans = layoutAdapter.getCurrentData();
123 124
125 
                if (!NetUtil.CheckNetwork(getActivity())) {
126 
                    Toast.makeText(getActivity(), "请检查网络", Toast.LENGTH_SHORT).show();
127 
                    return;
128 
                }
124 129 
                if(type == 2){
125 130 
                    startActivity(new Intent(getActivity(), PersonalPageActivity.class).putExtra("targetUserId", talkRecommendBeans.get(pos).addUserId+""));
126 131 
                    return;

+ 4 - 0
app/src/main/java/com/electric/chargingpile/view/VideoCommentDialog.java
Целия файл 

@ -125,6 +125,9 @@ public class VideoCommentDialog extends Dialog implements View.OnClickListener {
125 125 
                                    videoCommentAdapter.addData(qadata);
126 126 
                                }
127 127 
                            }
128
129 
                            if(videoCommentAdapter.getAllCount()>0)
130 
                                showCommentTitle.setText("全部评论 " + videoCommentAdapter.getAllCount());
128 131 
                        }
129 132 
                        show_comment_progress_ll.setVisibility(View.GONE);
130 133 
                    }
 
@ -163,6 +166,7 @@ public class VideoCommentDialog extends Dialog implements View.OnClickListener {
163 166 
            public void afterTextChanged(Editable editable) {
164 167 
                int i2 = editable.length();
165 168 
                if(i2>200){
169 
                    Toast.makeText(context, "评论最多200字，请删减后再发布", Toast.LENGTH_SHORT).show();
166 170 
                    showCommentEd.setTextColor(Color.parseColor("#E90A0A"));
167 171 
                }else {
168 172 
                    showCommentEd.setTextColor(Color.parseColor("#ffffff"));

+ 6 - 2
app/src/main/res/layout/app_talk_item_recylerview.xml
Целия файл 

@ -58,7 +58,7 @@
58 58 
        android:paddingLeft="10dp"
59 59 
        android:paddingRight="10dp"
60 60 
        android:ellipsize="end"
61 
        android:maxLines="2"
61 
        android:maxLines="3"
62 62 
        android:text="123"
63 63 
        android:textColor="@color/color_222222"
64 64 
        android:textSize="15sp" />
 
@ -83,6 +83,7 @@
83 83 
            android:textSize="13sp" />
84 84
85 85 
        <ImageView
86 
            android:id="@+id/recycler_view_zan_icon"
86 87 
            android:layout_width="15dp"
87 88 
            android:layout_height="13dp"
88 89 
            android:layout_centerVertical="true"
 
@ -98,9 +99,12 @@
98 99
99 100 
        <TextView
100 101 
            android:id="@+id/user_avater_name"
101 
            android:layout_width="wrap_content"
102 
            android:layout_width="match_parent"
102 103 
            android:layout_height="wrap_content"
103 104 
            android:layout_centerVertical="true"
105 
            android:singleLine="true"
106 
            android:ellipsize="end"
107 
            android:layout_toLeftOf="@+id/recycler_view_zan_icon"
104 108 
            android:layout_toRightOf="@+id/user_avater"
105 109 
            android:paddingLeft="5dp"
106 110 
            android:text="456"