td> 180 
                }
181 
                break;
182 
            case R.id.noNetTry:
183 
                page = 1;
184 
                loadingDialog.show();
185 
                requestData();
186 
                break;
187 
            case R.id.userEdit:
188 
                MobclickAgent.onEvent(getApplicationContext(), "0802");
189 
                startActivity(new Intent(getApplicationContext(), UserInfoActivity.class));
190 
                break;
191 
        }
192 
    }
193
194 
    private void requestData() {
195 
        String url = MainApplication.urlNew + "/user/homepage.do";
196 
        Map<String, String> map = new HashMap<>();
197 
        map.put("page", page + "");
198 
        map.put("limit", "20");
199
200 
        if (fromUserCenter) {
201 
            map.put("targetUserId", MainApplication.userId); // 说明是自己
202 
        } else {
203 
            map.put("targetUserId", targetUserId);
204 
        }
205
206 
        CommonParams.addCommonParams(map);
207 
        OkHttpUtils.get().url(url).params(map).build().connTimeOut(6000).readTimeOut(6000).execute(new StringCallback() {
208 
            @Override
209 
            public void onError(Call call, Exception e) {
210 
                loadingDialog.dismiss();
211 
                if (page == 1) {
212 
                    xRefreshView.stopRefresh();
213 
                } else {
214 
                    page--;
215 
                    xRefreshView.stopLoadMore();
216 
                }
217 
                ToastUtil.showToast(UserPageActivity.this, "加载失败，请重试", Toast.LENGTH_SHORT);
218 
            }
219
220 
            @Override
221 
            public void onResponse(String s) {
222 
                loadingDialog.dismiss();
223 
                if (page == 1) {
224 
                    xRefreshView.stopRefresh();
225 
                } else {
226 
                    xRefreshView.stopLoadMore();
227 
                }
228
229 
                String code = JsonUtils.getKeyResult(s, "code");
230 
                if ("1000".equals(code)) {
231 
                    String data = JsonUtils.getKeyResult(s, "data");
232 
                    UserHomePageBean userHomePageBean = (UserHomePageBean) JsonUtils.parseToObjectBean(data, UserHomePageBean.class);
233 
                    if (page == 1) {
234 
                        xRefreshView.setLoadComplete(false);
235 
                        userVo = userHomePageBean.userVo;
236 
                        updateTopView();
237 
                        if (userHomePageBean.list.size() == 0) {
238 
                            zeroTopicNum.setVisibility(View.VISIBLE);
239 
                        } else {
240 
                            zeroTopicNum.setVisibility(View.GONE);
241 
                            userPageAdapter.setContentData(userHomePageBean.list);
242 
                        }
243 
                        userPageAdapter.setFooterData(false);
244 
                    } else {
245 
                        if (userHomePageBean.list.size() == 0) {
246 
                            xRefreshView.setLoadComplete(true);
247 
                            userPageAdapter.setFooterData(true);
248 
                        } else {
249 
                            userPageAdapter.addContentData(userHomePageBean.list);
250 
                        }
251 
                    }
252 
                } else {
253 
                    String desc = JsonUtils.getKeyResult(s, "desc");
254 
                    ToastUtil.showToast(UserPageActivity.this, desc, Toast.LENGTH_SHORT);
255 
                }
256
257 
            }
258 
        });
259 
    }
260
261 
    private void updateTopView() {
262 
        if (TextUtils.isEmpty(userVo.headImgUrl)) {
263 
            userHead.setImageResource(R.drawable.icon_face2_0);
264 
        } else {
265 
            Picasso.with(this).load("http://cdz.evcharge.cc/zhannew/uploadfile/" + userVo.headImgUrl).into(new Target() {
266 
                @Override
267 
                public void onBitmapLoaded(Bitmap bitmap, Picasso.LoadedFrom loadedFrom) {
268 
                    userHead.setImageBitmap(bitmap);
269 
                }
270
271 
                @Override
272 
                public void onBitmapFailed(Drawable drawable) {
273 
                    userHead.setImageResource(R.drawable.icon_face2_0);
274 
                }
275
276 
                @Override
277 
                public void onPrepareLoad(Drawable drawable) {
278 
                }
279 
            });
280 
        }
281
282 
        nickName.setText(userVo.nickName);
283 
        if (TextUtils.isEmpty(userVo.carName)) {
284 
            carName.setText("");
285 
        } else {
286 
            carName.setText(userVo.carName);
287 
        }
14 288 
    }
15 289 
}

+ 12 - 12
app/src/main/java/com/electric/chargingpile/adapter/TopicDetailAdapter.java
Bestand weergeven 

@ -18,7 +18,7 @@ import com.aspsine.irecyclerview.IViewHolder;
18 18 
import com.electric.chargingpile.R;
19 19 
import com.electric.chargingpile.application.MainApplication;
20 20 
import com.electric.chargingpile.data.ChatRecommendBean;
21 
import com.electric.chargingpile.data.HomePageBean;
21 
import com.electric.chargingpile.data.TopicHomePageBean;
22 22 
import com.electric.chargingpile.data.TopicDetailBeanLab;
23 23 
import com.electric.chargingpile.iview.RecyclerItemTypeClickListener;
24 24 
import com.electric.chargingpile.util.CircleTransform;
 
@ -52,7 +52,7 @@ public class TopicDetailAdapter extends RecyclerView.Adapter<IViewHolder> {
52 52 
    private Activity activity;
53 53 
    private LayoutInflater layoutInflater;
54 54 
    private final TopicDetailBeanLab beanLab;
55 
    private HomePageBean.HomePageTopicBean topicDetailBean;
55 
    private TopicHomePageBean.TopicVo topicVo;
56 56 
    private RecyclerItemTypeClickListener onRecyclerItemClickListener;
57 57 
    private ChooseTopicSortInterface chooseTopicSortInterface;
58 58 
    private final int screenWidth;
 
@ -131,15 +131,15 @@ public class TopicDetailAdapter extends RecyclerView.Adapter<IViewHolder> {
131 131 
        final HeaderViewHolder headerViewHolder = (HeaderViewHolder) viewHolder;
132 132 
        StaggeredGridLayoutManager.LayoutParams params = (StaggeredGridLayoutManager.LayoutParams) headerViewHolder.topicDetailHeader.getLayoutParams();
133 133 
        params.setFullSpan(true);
134 
        if (topicDetailBean == null) {
134 
        if (topicVo == null) {
135 135 
            return;
136 136 
        }
137 137
138 
        ImageDisplayUtils.dispalyImg(context, topicDetailBean.coverImgUrl, headerViewHolder.headImage);
139 
        headerViewHolder.name.setText(topicDetailBean.name);
140 
        headerViewHolder.desc.setText(topicDetailBean.desc);
141 
        headerViewHolder.read.setText(topicDetailBean.visitNums);
142 
        headerViewHolder.join.setText(topicDetailBean.joinNums);
138 
        ImageDisplayUtils.dispalyImg(context, topicVo.coverImgUrl, headerViewHolder.headImage);
139 
        headerViewHolder.name.setText(topicVo.name);
140 
        headerViewHolder.desc.setText(topicVo.desc);
141 
        headerViewHolder.read.setText(topicVo.visitNums);
142 
        headerViewHolder.join.setText(topicVo.joinNums);
143 143
144 144 
        headerViewHolder.sortConstrainLayout.setOnClickListener(new View.OnClickListener() {
145 145 
            @Override
 
@ -327,8 +327,8 @@ public class TopicDetailAdapter extends RecyclerView.Adapter<IViewHolder> {
327 327 
        notifyItemRangeChanged(startSize, beans.size());
328 328 
    }
329 329
330 
    public void setHeaderData(HomePageBean.HomePageTopicBean bean) {
331 
        topicDetailBean = bean;
330 
    public void setHeaderData(TopicHomePageBean.TopicVo bean) {
331 
        topicVo = bean;
332 332 
    }
333 333
334 334 
    public void setFooterData(Boolean showFooter) {
 
@ -371,7 +371,7 @@ public class TopicDetailAdapter extends RecyclerView.Adapter<IViewHolder> {
371 371 
        }
372 372 
    }
373 373
374 
    public class ContentViewHolder extends IViewHolder {
374 
    public static class ContentViewHolder extends IViewHolder {
375 375
376 376 
        ConstraintLayout image_video_item;
377 377 
        ImageView coverImage;
 
@ -412,7 +412,7 @@ public class TopicDetailAdapter extends RecyclerView.Adapter<IViewHolder> {
412 412 
        }
413 413 
    }
414 414
415 
    public class FooterViewHolder extends IViewHolder {
415 
    public static class FooterViewHolder extends IViewHolder {
416 416
417 417 
        ConstraintLayout footerContainer;
418 418 
        ConstraintLayout footerView;

+ 257 - 0
app/src/main/java/com/electric/chargingpile/adapter/UserPageAdapter.java
Bestand weergeven 

@ -0,0 +1,257 @@
1 
package com.electric.chargingpile.adapter;
2
3 
import android.app.Activity;
4 
import android.content.Context;
5 
import android.support.constraint.ConstraintLayout;
6 
import android.support.v7.widget.RecyclerView;
7 
import android.support.v7.widget.StaggeredGridLayoutManager;
8 
import android.text.TextUtils;
9 
import android.view.LayoutInflater;
10 
import android.view.View;
11 
import android.view.ViewGroup;
12 
import android.widget.Toast;
13
14 
import com.aspsine.irecyclerview.IViewHolder;
15 
import com.electric.chargingpile.R;
16 
import com.electric.chargingpile.activity.TopicDetailActivity;
17 
import com.electric.chargingpile.application.MainApplication;
18 
import com.electric.chargingpile.data.ChatRecommendBean;
19 
import com.electric.chargingpile.data.TopicDetailBeanLab;
20 
import com.electric.chargingpile.data.TopicHomePageBean;
21 
import com.electric.chargingpile.data.UserPageBeanLab;
22 
import com.electric.chargingpile.util.CircleTransform;
23 
import com.electric.chargingpile.util.CommonParams;
24 
import com.electric.chargingpile.util.DensityUtil;
25 
import com.electric.chargingpile.util.ImageDisplayUtils;
26 
import com.electric.chargingpile.util.JsonUtils;
27 
import com.electric.chargingpile.util.ScreenUtils;
28 
import com.electric.chargingpile.util.ToastUtil;
29 
import com.squareup.picasso.Picasso;
30 
import com.zhy.http.okhttp.OkHttpUtils;
31 
import com.zhy.http.okhttp.callback.StringCallback;
32
33 
import java.util.ArrayList;
34 
import java.util.HashMap;
35 
import java.util.List;
36 
import java.util.Map;
37
38 
import okhttp3.Call;
39
40 
public class UserPageAdapter extends RecyclerView.Adapter<IViewHolder> {
41 
    private static final String TAG = "UserPageAdapter";
42 
    public static final int TOPIC_DETAIL_HEADER = 1;
43 
    public static final int TOPIC_DETAIL_CONTENT = 2;
44 
    public static final int TOPIC_DETAIL_FOOTER = 3;
45 
    private Context context;
46 
    private Activity activity;
47 
    private LayoutInflater layoutInflater;
48 
    private final int screenWidth;
49 
    private final int screenHeight;
50 
    private final int statusHeight;
51 
    private final int headerHeight;
52 
    private final int itemWidth;
53 
    private final UserPageBeanLab beanLab;
54 
    private boolean showFooter = false;
55
56 
    public UserPageAdapter(Context context, Activity activity) {
57 
        this.context = context;
58 
        this.activity = activity;
59 
        this.layoutInflater = LayoutInflater.from(context);
60 
        beanLab = UserPageBeanLab.get(context);
61
62 
        screenWidth = ScreenUtils.getScreenWidth(context);
63 
        screenHeight = ScreenUtils.getScreenHeight(context);
64 
        statusHeight = ScreenUtils.getStatusHeight(context);
65 
        headerHeight = DensityUtil.dip2px(context, 260);
66 
        itemWidth = (screenWidth - DensityUtil.dip2px(context, 10 * 2)) / 2;
67 
    }
68
69 
    @Override
70 
    public IViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
71 
        View itemView = null;
72 
        IViewHolder viewHolder = null;
73 
        switch (viewType) {
74 
            case TOPIC_DETAIL_CONTENT:
75 
                itemView = layoutInflater.inflate(R.layout.activity_chat_content, parent, false);
76 
                viewHolder = new TopicDetailAdapter.ContentViewHolder(itemView);
77 
                break;
78 
            case TOPIC_DETAIL_FOOTER:
79 
                itemView = layoutInflater.inflate(R.layout.activity_chat_footer, parent, false);
80 
                viewHolder = new TopicDetailAdapter.FooterViewHolder(itemView);
81 
                break;
82 
        }
83 
        return viewHolder;
84 
    }
85
86 
    @Override
87 
    public void onBindViewHolder(IViewHolder viewHolder, int position) {
88 
        switch (getItemViewType(position)) {
89 
            case TOPIC_DETAIL_CONTENT:
90 
                bindContentViewHolder(viewHolder, position);
91 
                break;
92 
            case TOPIC_DETAIL_FOOTER:
93 
                bindFooterViewHolder(viewHolder, position);
94 
                break;
95 
        }
96 
    }
97
98 
    @Override
99 
    public int getItemViewType(int position) {
100 
        if (position == getItemCount()) {
101 
            return TOPIC_DETAIL_FOOTER;
102 
        }  else {
103 
            return TOPIC_DETAIL_CONTENT;
104 
        }
105 
    }
106
107 
    @Override
108 
    public int getItemCount() {
109 
        return beanLab.beans().size() + 1;
110 
    }
111
112
113 
    private void bindContentViewHolder(IViewHolder viewHolder, final int position) {
114 
        if (beanLab.beans().size() == 0 || position >= beanLab.beans().size()) {
115 
            return;
116 
        }
117
118 
        final ChatRecommendBean bean = beanLab.beans().get(position);
119 
        TopicDetailAdapter.ContentViewHolder contentViewHolder = (TopicDetailAdapter.ContentViewHolder) viewHolder;
120 
        ConstraintLayout.LayoutParams coverImageParams = (ConstraintLayout.LayoutParams) contentViewHolder.coverImage.getLayoutParams();
121 
        coverImageParams.width = itemWidth;
122
123 
        if (bean.coverImgW == 0 || bean.coverImgH == 0) {
124 
            coverImageParams.height = (int) (itemWidth * 16f / 9f);
125 
        } else {
126 
            if ((float) bean.coverImgH / bean.coverImgW > 16f / 9f) {
127 
                coverImageParams.height = (int) (itemWidth * 16f / 9f);
128 
            } else {
129 
                coverImageParams.height = (int) ((float) itemWidth * bean.coverImgH / bean.coverImgW);
130 
            }
131 
        }
132 
        contentViewHolder.coverImage.setLayoutParams(coverImageParams);
133 
        ImageDisplayUtils.dispalyImg(context, bean.coverImgUrl, contentViewHolder.coverImage);
134
135 
        contentViewHolder.videoIcon.setVisibility(bean.targetType == ChatRecommendBean.TARGET_TYPE_VIDEO ? View.VISIBLE : View.GONE);
136 
        contentViewHolder.isTop.setVisibility(bean.isTop == 1 ? View.VISIBLE : View.GONE);
137 
        contentViewHolder.title.setText(bean.title);
138 
        if (TextUtils.isEmpty(bean.headImgUrl)) {
139 
            Picasso.with(context)
140 
                    .load(R.drawable.icon_face2_0)
141 
                    .placeholder(R.drawable.icon_face2_0)
142 
                    .error(R.drawable.icon_face2_0)
143 
                    .transform(new CircleTransform())
144 
                    .into(contentViewHolder.headImage);
145 
        } else {
146 
            Picasso.with(context)
147 
                    .load("http://cdz.evcharge.cc/zhannew/uploadfile/" + bean.headImgUrl)
148 
                    .placeholder(R.drawable.icon_face2_0)
149 
                    .error(R.drawable.icon_face2_0)
150 
                    .transform(new CircleTransform())
151 
                    .into(contentViewHolder.headImage);
152 
        }
153
154 
        contentViewHolder.nickName.setText(bean.nickName);
155 
        contentViewHolder.likeInfo.setOnClickListener(new View.OnClickListener() {
156 
            @Override
157 
            public void onClick(View view) {
158 
                if (bean.likeFlg == 0) {
159 
                    doLike(position);
160 
                }
161 
            }
162 
        });
163
164 
        if (bean.likeFlg == 1) {
165 
            contentViewHolder.likeIcon.setBackgroundResource(R.drawable.app_talk_main_list_zan_red_icon);
166 
        } else {
167 
            contentViewHolder.likeIcon.setBackgroundResource(R.drawable.app_talk_main_list_zan_icon);
168 
        }
169
170 
        int likeNum = bean.likeNums;
171 
        if (likeNum > 0) {
172 
            contentViewHolder.likeNum.setVisibility(View.VISIBLE);
173 
            contentViewHolder.likeNum.setText(likeNum < 999 ? likeNum + "" : "999+");
174 
        } else {
175 
            contentViewHolder.likeNum.setVisibility(View.GONE);
176 
        }
177 
    }
178
179 
    private void bindFooterViewHolder(IViewHolder viewHolder, int position) {
180 
        TopicDetailAdapter.FooterViewHolder footerViewHolder = (TopicDetailAdapter.FooterViewHolder) viewHolder;
181 
        StaggeredGridLayoutManager.LayoutParams layoutParams = (StaggeredGridLayoutManager.LayoutParams) footerViewHolder.footerContainer.getLayoutParams();
182 
        layoutParams.setFullSpan(true);
183
184 
        footerViewHolder.footerContainer.setVisibility(showFooter ? View.VISIBLE : View.GONE);
185
186 
        ConstraintLayout.LayoutParams params = (ConstraintLayout.LayoutParams) footerViewHolder.footerView.getLayoutParams();
187 
        if (TopicDetailBeanLab.get(context).beans().size() == 0) {
188 
            footerViewHolder.footTextView.setText("还没有任何内容哦，快来抢沙发~");
189 
            params.height = DensityUtil.dip2px(context, (screenHeight - headerHeight - statusHeight) / 4);
190 
            params.bottomMargin = 0;
191 
        } else {
192 
            footerViewHolder.footTextView.setText("已经全部加载完毕");
193 
            params.height = DensityUtil.dip2px(context, 20);
194 
            params.bottomMargin = DensityUtil.dip2px(context, 10);
195 
        }
196
197 
        if (showFooter == false) {
198 
            params.height = 0;
199 
            params.bottomMargin = DensityUtil.dip2px(context, 10);
200 
        }
201
202 
        footerViewHolder.footTextView.setLayoutParams(params);
203 
    }
204
205 
    /**
206 
     * 点赞操作
207 
     *
208 
     * @param position
209 
     */
210 
    private void doLike(final int position) {
211 
        final ChatRecommendBean bean = TopicDetailBeanLab.get(context).beans().get(position);
212 
        String url = MainApplication.urlNew + "/topic/like.do";
213 
        Map<String, String> map = new HashMap<>();
214 
        map.put("targetId", bean.targetId + "");
215 
        map.put("targetType", bean.targetType + "");
216 
        map.put("flag", "1");
217 
        map.put("authorId", bean.addUserId + "");
218 
        CommonParams.addCommonParams(map);
219
220 
        OkHttpUtils.get().url(url).params(map).build().connTimeOut(6000).readTimeOut(6000).execute(new StringCallback() {
221 
            @Override
222 
            public void onError(Call call, Exception e) {
223 
                ToastUtil.showToast(context, "点赞失败，请重试", Toast.LENGTH_SHORT);
224 
            }
225
226 
            @Override
227 
            public void onResponse(String res) {
228 
                String code = JsonUtils.getKeyResult(res, "code");
229 
                String desc = JsonUtils.getKeyResult(res, "desc");
230 
                if ("1000".equals(code)) {
231 
                    bean.likeFlg = 1;
232 
                    bean.likeNums += 1;
233 
                    notifyItemChanged(position);
234 
                } else {
235 
                    ToastUtil.showToast(context, desc, Toast.LENGTH_SHORT);
236 
                }
237 
            }
238 
        });
239 
    }
240
241 
    public void setContentData(ArrayList<ChatRecommendBean> beans) {
242 
        beanLab.clear();
243 
        beanLab.add(beans);
244 
        notifyDataSetChanged();
245 
    }
246
247 
    public void addContentData(ArrayList<ChatRecommendBean> beans) {
248 
        int startSize = beanLab.beans().size();
249 
        beanLab.add(beans);
250 
        notifyItemRangeChanged(startSize, beans.size());
251 
    }
252
253 
    public void setFooterData(Boolean showFooter) {
254 
        this.showFooter = showFooter;
255 
        notifyItemRangeChanged(getItemCount(), 1);
256 
    }
257 
}

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

@ -73,10 +73,10 @@ public class MainApplication extends MultiDexApplication {
73 73 
    public static String firstPoint = "";
74 74 
    public static Boolean firstSsyd;
75 75 
    public static String password = "";
76 
    public static String url = "http://59.110.68.162";// 充电桩测试环境
77 
//    public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
78 
    public static String urlNew = "http://123.56.67.7:83/api/0200";// 一电测试环境
79 
//    public static String urlNew = "https://api.touchev.com:83/api/0200";// 一电正式环境
76 
//    public static String url = "http://59.110.68.162";// 充电桩测试环境
77 
    public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
78 
//    public static String urlNew = "http://123.56.67.7:83/api/0200";// 一电测试环境
79 
    public static String urlNew = "https://api.touchev.com:83/api/0200";// 一电正式环境
80 80 
    public static String pic_url = "http:/s/cdz.evcharge.cc/zhannew/uploadfile/";
81 81 
    //	public static String url = "https://cdz.d1ev.com";
82 82 
    public static String build_flag = "0";

+ 4 - 4
app/src/main/java/com/electric/chargingpile/data/TopicDetailBeanLab.java
Bestand weergeven 

@ -6,15 +6,15 @@ import java.util.ArrayList;
6 6 
import java.util.List;
7 7
8 8 
public class TopicDetailBeanLab {
9 
    private static TopicDetailBeanLab topicDetailBeanLab;
9 
    private static TopicDetailBeanLab beanLab;
10 10 
    private List<ChatRecommendBean> beans;
11 11
12 12 
    public static TopicDetailBeanLab get(Context context) {
13 
        if (topicDetailBeanLab == null) {
14 
            topicDetailBeanLab = new TopicDetailBeanLab(context);
13 
        if (beanLab == null) {
14 
            beanLab = new TopicDetailBeanLab(context);
15 15 
        }
16 16
17 
        return topicDetailBeanLab;
17 
        return beanLab;
18 18 
    }
19 19
20 20 
    private TopicDetailBeanLab(Context context) {

+ 0 - 41
app/src/main/java/com/electric/chargingpile/data/TopicDetailsListBean.java
Bestand weergeven 

@ -1,41 +0,0 @@
1 
package com.electric.chargingpile.data;
2
3 
public class TopicDetailsListBean {
4 
//     "targetId": 13,
5 
//             "targetType": 24,
6 
//             "title": "早上好。    周五啦，再坚持一天就可以迎来美好的周末了。现在照例先奉上虎嗅早报。    昨晚王兴和阿里的口水仗很是精彩了，不过除了怼阿里，王兴在采访中还说了啥？",
7 
//             "topicId": 1,
8 
//             "topicName": "你的电动车冬天续航有多少公里？你的电动车冬天续航有多少公里？你的",
9 
//             "addUserId": 130690,
10 
//             "addTime": 1553823519000,
11 
//             "imgUrls": [
12 
//             "http://cdn-fs.touchev.com/d/file/liaoliao/img/2019/4/
13 
//             "http://cdn-fs.touchev.com/d/file/cars/tuji/117/44/100/1/white9.JPG!w480"
14 
//             ],
15 
//             "coverImgUrl": "http://cdn-fs.touchev.com/d/file/liaoliao/img/2019/4/02/201915541933276282091.jpeg!w480",
16 
//             "headImgUrl": "2018/1381545893914photoIOS.png",
17 
//             "nickName": "千秋壹胡",
18 
//             "likeNums": 0,
19 
//             "commentNums": 0,
20 
//             "isTop": 1,
21 
//             "likeFlg": 0,
22 
//             "source": 2,
23 
//             "shareUrl": "https://m.d1ev.com/app.html"
24 
    public long targetId;
25 
    public int targetType;
26 
    public String title;
27 
    public int topicId;
28 
    public String topicName;
29 
    public long addUserId;
30 
    public String[] imgUrls;
31 
    public String coverImgUrl;
32 
    public String headImgUrl;
33 
    public String nickName;
34 
    public int likeNums;
35 
    public int commentNums;
36 
    public int isTop;
37 
    public int likeFlg;
38 
    public int source;
39 
    public int shareUrl;
40
41 
}

+ 13 - 13
app/src/main/java/com/electric/chargingpile/data/HomePageBean.java
Bestand weergeven 

@ -2,36 +2,36 @@ package com.electric.chargingpile.data;
2 2
3 3 
import java.util.ArrayList;
4 4
5 
public class HomePageBean {
5 
public class TopicHomePageBean {
6 6
7 7
8 8 
    public ArrayList<ChatRecommendBean> list; // 话题下的内容信息集合
9 
    public HomePageTopicBean topicVo;
9 
    public TopicVo topicVo;
10 10
11 
    public class HomePageTopicBean {
12 
        public String topicId; // 话题ID
13 
        public String name; // 话题名称
14 
        public String coverImgUrl; // 话题封面图片
15 
        public String desc; // 话题描述
16 
        public String joinNums; // 参与该话题的人数
17 
        public String visitNums; // 访问量
11 
    public class TopicVo {
12 
        public String topicId;      // 话题ID
13 
        public String name;         // 话题名称
14 
        public String coverImgUrl;  // 话题封面图片
15 
        public String desc;         // 话题描述
16 
        public String joinNums;     // 参与该话题的人数
17 
        public String visitNums;    // 访问量
18 18
19 19 
        @Override
20 20 
        public String toString() {
21 
            return "HomePageTopicBean{" +
21 
            return "TopicVo{" +
22 22 
                    "topicId='" + topicId + '\'' +
23 23 
                    ", name='" + name + '\'' +
24 24 
                    ", coverImgUrl='" + coverImgUrl + '\'' +
25 25 
                    ", desc='" + desc + '\'' +
26 
                    ", joinNums=" + joinNums +
27 
                    ", visitNums=" + visitNums +
26 
                    ", joinNums='" + joinNums + '\'' +
27 
                    ", visitNums='" + visitNums + '\'' +
28 28 
                    '}';
29 29 
        }
30 30 
    }
31 31
32 32 
    @Override
33 33 
    public String toString() {
34 
        return "HomePageBean{" +
34 
        return "TopicHomePageBean{" +
35 35 
                "list=" + list +
36 36 
                ", topicVo=" + topicVo +
37 37 
                '}';

+ 38 - 0
app/src/main/java/com/electric/chargingpile/data/UserHomePageBean.java
Bestand weergeven 

@ -0,0 +1,38 @@
1 
package com.electric.chargingpile.data;
2
3 
import java.util.ArrayList;
4
5 
public class UserHomePageBean {
6 
    public ArrayList<ChatRecommendBean> list;
7 
    public UserVo userVo;
8 
    public String shareUrl;
9 
    public class UserVo {
10 
        public long userId;
11 
        public String nickName;
12 
        public String headImgUrl;
13 
        public String carName;
14 
        public String phone;
15 
        public String topicNums;
16
17 
        @Override
18 
        public String toString() {
19 
            return "UserVo{" +
20 
                    "userId=" + userId +
21 
                    ", nickName='" + nickName + '\'' +
22 
                    ", headImgUrl='" + headImgUrl + '\'' +
23 
                    ", carName='" + carName + '\'' +
24 
                    ", phone='" + phone + '\'' +
25 
                    ", topicNums='" + topicNums + '\'' +
26 
                    '}';
27 
        }
28 
    }
29
30 
    @Override
31 
    public String toString() {
32 
        return "UserHomePageBean{" +
33 
                "list=" + list +
34 
                ", userVo=" + userVo +
35 
                ", shareUrl='" + shareUrl + '\'' +
36 
                '}';
37 
    }
38 
}

+ 45 - 0
app/src/main/java/com/electric/chargingpile/data/UserPageBeanLab.java
Bestand weergeven 

@ -0,0 +1,45 @@
1 
package com.electric.chargingpile.data;
2
3 
import android.content.Context;
4
5 
import java.util.ArrayList;
6 
import java.util.List;
7
8 
public class UserPageBeanLab {
9 
    private static UserPageBeanLab beanLab;
10 
    private List<ChatRecommendBean> beans;
11
12 
    public static UserPageBeanLab get(Context context) {
13 
        if (beanLab == null) {
14 
            beanLab = new UserPageBeanLab(context);
15 
        }
16
17 
        return beanLab;
18 
    }
19
20 
    private UserPageBeanLab(Context context) {
21 
        beans = new ArrayList<>();
22 
    }
23
24 
    public List<ChatRecommendBean> beans() {
25 
        return beans;
26 
    }
27
28 
    public ChatRecommendBean bean(int topicId) {
29 
        for (ChatRecommendBean bean : beans) {
30 
            if (bean.topicId == topicId) {
31 
                return bean;
32 
            }
33 
        }
34 
        return null;
35 
    }
36
37 
    public void clear() {
38 
        beans.clear();
39 
    }
40
41
42 
    public void add(List<ChatRecommendBean> list) {
43 
        beans.addAll(list);
44 
    }
45 
}

BIN
app/src/main/res/drawable-hdpi/user_page_bg.png
Bestand weergeven


BIN
app/src/main/res/drawable-mdpi/user_page_bg.png
Bestand weergeven


BIN
app/src/main/res/drawable-xhdpi/user_page_bg.png
Bestand weergeven


BIN
app/src/main/res/drawable-xxhdpi/user_page_bg.png
Bestand weergeven


BIN
app/src/main/res/drawable-xxxhdpi/user_page_bg.png
Bestand weergeven


+ 5 - 5
app/src/main/res/layout/activity_no_net.xml
Bestand weergeven 

@ -2,11 +2,11 @@
2 2 
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 3 
    android:layout_width="match_parent"
4 4 
    android:layout_height="match_parent"
5 
    android:background="@color/white"
6 
    android:id="@+id/no_net_view">
5 
    android:background="#f4f4f4"
6 
    android:id="@+id/noNetView">
7 7
8 8 
    <TextView
9 
        android:id="@+id/banquan"
9 
        android:id="@+id/noNetLabel"
10 10 
        android:layout_width="wrap_content"
11 11 
        android:layout_height="wrap_content"
12 12 
        android:layout_marginTop="130dp"

@ -17,12 +17,12 @@
17 17 
        android:textColor="#555555" />
18 18
19 19 
    <TextView
20 
        android:id="@+id/request_refresh"
20 
        android:id="@+id/noNetTry"
21 21 
        android:layout_width="144dp"
22 22 
        android:layout_height="40dp"
23 23 
        android:layout_centerHorizontal="true"
24 24 
        android:layout_marginTop="20dp"
25 
        android:layout_below="@+id/banquan"
25 
        android:layout_below="@+id/noNetLabel"
26 26 
        android:text="点击重新尝试"
27 27 
        android:gravity="center"
28 28 
        android:textSize="14sp"

+ 206 - 3
app/src/main/res/layout/activity_user_page.xml
Bestand weergeven 

@ -7,29 +7,232 @@
7 7 
    tools:context=".activity.UserPageActivity">
8 8
9 9 
    <android.support.constraint.ConstraintLayout
10 
        android:id="@+id/topView"
10 11 
        android:layout_width="0dp"
11 12 
        android:layout_height="174dp"
13 
        android:background="#ffffff"
12 14 
        app:layout_constraintEnd_toEndOf="parent"
13 15 
        app:layout_constraintStart_toStartOf="parent"
14 16 
        app:layout_constraintTop_toTopOf="parent">
15 17
16 18 
        <ImageView
19 
            android:id="@+id/userPageBg"
17 20 
            android:layout_width="0dp"
18 
            android:layout_height="150dp"
19 
            android:background="@drawable/user_page_bg"
21 
            android:layout_height="0dp"
22 
            android:scaleType="fitXY"
23 
            android:src="@drawable/user_page_bg"
24 
            app:layout_constraintBottom_toTopOf="@+id/topicNumInfo"
20 25 
            app:layout_constraintLeft_toLeftOf="parent"
21 26 
            app:layout_constraintRight_toRightOf="parent"
22 
            app:layout_constraintTop_toTopOf="parent" />
27 
            app:layout_constraintTop_toTopOf="parent"
28 
            tools:background="#ff0000" />
23 29
24 30
25 31 
        <android.support.constraint.ConstraintLayout
32 
            android:id="@+id/navBar"
26 33 
            android:layout_width="0dp"
27 34 
            android:layout_height="44dp"
28 35 
            app:layout_constraintEnd_toEndOf="parent"
29 36 
            app:layout_constraintStart_toStartOf="parent"
30 37 
            app:layout_constraintTop_toTopOf="parent">
31 38
39 
            <ImageView
40 
                android:id="@+id/backPress"
41 
                android:layout_width="wrap_content"
42 
                android:layout_height="match_parent"
43 
                android:contentDescription="@null"
44 
                android:paddingLeft="15dp"
45 
                android:paddingRight="15dp"
46 
                android:src="@drawable/app_white_back_icon"
47 
                app:layout_constraintBottom_toBottomOf="parent"
48 
                app:layout_constraintStart_toStartOf="parent"
49 
                app:layout_constraintTop_toTopOf="parent" />
50
51 
            <ImageView
52 
                android:id="@+id/morePress"
53 
                android:layout_width="wrap_content"
54 
                android:layout_height="match_parent"
55 
                android:contentDescription="@null"
56 
                android:paddingLeft="15dp"
57 
                android:paddingRight="15dp"
58 
                android:src="@drawable/app_header_more_icon"
59 
                app:layout_constraintBottom_toBottomOf="parent"
60 
                app:layout_constraintEnd_toEndOf="parent"
61 
                app:layout_constraintTop_toTopOf="parent" />
62 
        </android.support.constraint.ConstraintLayout>
63
64 
        <android.support.constraint.ConstraintLayout
65 
            android:id="@+id/userInfo"
66 
            android:layout_width="0dp"
67 
            android:layout_height="64dp"
68 
            app:layout_constraintLeft_toLeftOf="parent"
69 
            app:layout_constraintRight_toRightOf="parent"
70 
            app:layout_constraintTop_toBottomOf="@+id/navBar">
71
72 
            <com.electric.chargingpile.view.RoundImageView
73 
                android:id="@+id/userHead"
74 
                android:layout_width="56dp"
75 
                android:layout_height="56dp"
76 
                android:layout_gravity="center"
77 
                android:layout_marginLeft="16dp"
78 
                android:layout_marginTop="4dp"
79 
                android:layout_marginBottom="4dp"
80 
                android:background="@drawable/icon_user1118"
81 
                android:scaleType="fitXY"
82 
                app:layout_constraintBottom_toBottomOf="parent"
83 
                app:layout_constraintStart_toStartOf="parent"
84 
                app:layout_constraintTop_toTopOf="parent"
85 
                app:type="circle" />
86
87 
            <TextView
88 
                android:id="@+id/nickName"
89 
                android:layout_width="wrap_content"
90 
                android:layout_height="wrap_content"
91 
                android:layout_marginLeft="10dp"
92 
                android:layout_marginTop="8dp"
93 
                android:textColor="#ffffff"
94 
                android:textSize="16sp"
95 
                app:layout_constraintLeft_toRightOf="@+id/userHead"
96 
                app:layout_constraintTop_toTopOf="parent"
97 
                tools:text="吉利帝豪车主" />
98
99 
            <TextView
100 
                android:id="@+id/carName"
101 
                android:layout_width="wrap_content"
102 
                android:layout_height="wrap_content"
103 
                android:layout_marginLeft="10dp"
104 
                android:layout_marginTop="2dp"
105 
                android:textColor="#ffffff"
106 
                android:textSize="12sp"
107 
                app:layout_constraintLeft_toRightOf="@+id/userHead"
108 
                app:layout_constraintTop_toBottomOf="@+id/nickName"
109 
                tools:text="比亚迪 元EV" />
110
111 
            <android.support.constraint.ConstraintLayout
112 
                android:id="@+id/userEdit"
113 
                android:layout_width="90dp"
114 
                android:layout_height="match_parent"
115 
                android:visibility="gone"
116 
                app:layout_constraintBottom_toBottomOf="parent"
117 
                app:layout_constraintRight_toRightOf="parent"
118 
                app:layout_constraintTop_toTopOf="parent"
119 
                tools:visibility="visible">
120
121 
                <ImageView
122 
                    android:layout_width="wrap_content"
123 
                    android:layout_height="wrap_content"
124 
                    android:src="@drawable/app_header_edit_icon"
125 
                    app:layout_constraintBottom_toBottomOf="parent"
126 
                    app:layout_constraintEnd_toEndOf="parent"
127 
                    app:layout_constraintStart_toStartOf="parent"
128 
                    app:layout_constraintTop_toTopOf="parent" />
129 
            </android.support.constraint.ConstraintLayout>
130
131 
        </android.support.constraint.ConstraintLayout>
132
133 
        <android.support.constraint.ConstraintLayout
134 
            android:id="@+id/topicNumInfo"
135 
            android:layout_width="0dp"
136 
            android:layout_height="44dp"
137 
            app:layout_constraintBottom_toBottomOf="parent"
138 
            app:layout_constraintLeft_toLeftOf="parent"
139 
            app:layout_constraintRight_toRightOf="parent">
140
141 
            <android.support.constraint.ConstraintLayout
142 
                android:layout_width="wrap_content"
143 
                android:layout_height="wrap_content"
144 
                app:layout_constraintBottom_toBottomOf="parent"
145 
                app:layout_constraintEnd_toEndOf="parent"
146 
                app:layout_constraintStart_toStartOf="parent"
147 
                app:layout_constraintTop_toTopOf="parent">
148
149 
                <TextView
150 
                    android:id="@+id/topicNumLabel"
151 
                    android:layout_width="wrap_content"
152 
                    android:layout_height="wrap_content"
153 
                    android:text="帖子"
154 
                    android:textColor="#222222"
155 
                    android:textSize="16sp"
156 
                    app:layout_constraintBottom_toBottomOf="parent"
157 
                    app:layout_constraintLeft_toLeftOf="parent"
158 
                    app:layout_constraintTop_toTopOf="parent" />
159
160 
                <TextView
161 
                    android:layout_width="wrap_content"
162 
                    android:layout_height="wrap_content"
163 
                    android:paddingLeft="5dp"
164 
                    android:textColor="#555555"
165 
                    android:textSize="14sp"
166 
                    app:layout_constraintBottom_toBottomOf="parent"
167 
                    app:layout_constraintLeft_toRightOf="@+id/topicNumLabel"
168 
                    app:layout_constraintTop_toTopOf="parent"
169 
                    tools:text="2345" />
170 
            </android.support.constraint.ConstraintLayout>
171
172 
            <ImageView
173 
                android:layout_width="match_parent"
174 
                android:layout_height="1dp"
175 
                android:background="#dddddd"
176 
                app:layout_constraintBottom_toBottomOf="parent"
177 
                app:layout_constraintLeft_toLeftOf="parent"
178 
                app:layout_constraintRight_toRightOf="parent" />
32 179 
        </android.support.constraint.ConstraintLayout>
33 180
34 181 
    </android.support.constraint.ConstraintLayout>
182
183 
    <!-- 列表 -->
184
185 
    <com.andview.refreshview.XRefreshView
186 
        android:id="@+id/xRefreshView"
187 
        android:layout_width="0dp"
188 
        android:layout_height="0dp"
189 
        app:layout_constraintBottom_toBottomOf="parent"
190 
        app:layout_constraintLeft_toLeftOf="parent"
191 
        app:layout_constraintRight_toRightOf="parent"
192 
        app:layout_constraintTop_toBottomOf="@+id/topView">
193
194 
        <android.support.v7.widget.RecyclerView
195 
            android:id="@+id/recyclerView"
196 
            android:layout_width="match_parent"
197 
            android:layout_height="match_parent"
198 
            android:paddingTop="15dp">
199
200 
        </android.support.v7.widget.RecyclerView>
201 
    </com.andview.refreshview.XRefreshView>
202
203 
    <include
204 
        layout="@layout/activity_no_net"
205 
        android:layout_width="0dp"
206 
        android:layout_height="0dp"
207 
        android:visibility="gone"
208 
        app:layout_constraintBottom_toBottomOf="parent"
209 
        app:layout_constraintLeft_toLeftOf="parent"
210 
        app:layout_constraintRight_toRightOf="parent"
211 
        app:layout_constraintTop_toBottomOf="@+id/topView" />
212
213 
    <android.support.constraint.ConstraintLayout
214 
        android:id="@+id/zeroTopicNum"
215 
        android:layout_width="0dp"
216 
        android:layout_height="0dp"
217 
        android:visibility="gone"
218 
        app:layout_constraintBottom_toBottomOf="parent"
219 
        app:layout_constraintLeft_toLeftOf="parent"
220 
        app:layout_constraintRight_toRightOf="parent"
221 
        app:layout_constraintTop_toBottomOf="@+id/topView">
222
223 
        <TextView
224 
            android:layout_width="wrap_content"
225 
            android:layout_height="wrap_content"
226 
            android:gravity="center"
227 
            android:text="快来分享吧\n小主大家都很期待你的精彩内容哦"
228 
            android:textColor="#555555"
229 
            android:textSize="14sp"
230 
            app:layout_constraintBottom_toBottomOf="parent"
231 
            app:layout_constraintLeft_toLeftOf="parent"
232 
            app:layout_constraintRight_toRightOf="parent"
233 
            app:layout_constraintTop_toTopOf="parent"
234 
            app:layout_constraintVertical_bias="0.35000002" />
235
236 
    </android.support.constraint.ConstraintLayout>
237
35 238 
</android.support.constraint.ConstraintLayout>

代码更新 · 5336ca560f - Gogs: Go Git Service
首页 探索 帮助
注册 登录
dudu
/
cdzApp
关注 2
点赞 1
派生 0
代码 工单管理 0 合并请求 0 提交历史 167 版本发布 18 Wiki
浏览代码

代码更新

huyuguo 6 年之前
父节点
b891143db1
当前提交
5336ca560f
共有 4 个文件被更改，包括 35 次插入 和 48 次删除
分列视图 显示文件统计
  1. 4 4
      app/src/main/java/com/electric/chargingpile/application/MainApplication.java
  2. 22 40
      app/src/main/java/com/electric/chargingpile/fragment/ChatContentCommentListDialogFragment.java
  3. 7 3
      app/src/main/java/com/electric/chargingpile/fragment/CommonDialogFragment.java
  4. 2 1
      app/src/main/res/layout/list_item_comment.xml

+ 4 - 4
app/src/main/java/com/electric/chargingpile/application/MainApplication.java
查看文件 

@ -73,10 +73,10 @@ public class MainApplication extends MultiDexApplication {
73 73 
    public static String firstPoint = "";
74 74 
    public static Boolean firstSsyd;
75 75 
    public static String password = "";
76 
//    public static String url = "http://59.110.68.162";// 充电桩测试环境
77 
    public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
78 
//    public static String urlNew = "http://123.56.67.7:83/api/0200";// 一电测试环境
79 
    public static String urlNew = "https://api.touchev.com:83/api/0200";// 一电正式环境
76 
    public static String url = "http://59.110.68.162";// 充电桩测试环境
77 
//    public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
78 
    public static String urlNew = "http://123.56.67.7:83/api/0200";// 一电测试环境
79 
//    public static String urlNew = "https://api.touchev.com:83/api/0200";// 一电正式环境
80 80 
    public static String pic_url = "http:/s/cdz.evcharge.cc/zhannew/uploadfile/";
81 81 
    //	public static String url = "https://cdz.d1ev.com";
82 82 
    public static String build_flag = "0";

+ 22 - 40
app/src/main/java/com/electric/chargingpile/fragment/ChatContentCommentListDialogFragment.java
查看文件 

@ -64,6 +64,7 @@ public class ChatContentCommentListDialogFragment extends DialogFragment impleme
64 64 
    private ConstraintLayout loadingView;
65 65 
    private CommentAdapter commentAdapter;
66 66 
    private ConstraintLayout noDataView;
67 
    public String type;
67 68
68 69 
    public static ChatContentCommentListDialogFragment newInstance(ChatRecommendBean bean) {
69 70 
        Bundle args = new Bundle();
 
@ -159,9 +160,8 @@ public class ChatContentCommentListDialogFragment extends DialogFragment impleme
159 160 
    public void onClick(View view) {
160 161 
        switch (view.getId()) {
161 162 
            case R.id.bWriteComment: // 写评论
162 
                CommonDialogFragment commonDialogFragment = CommonDialogFragment.newInstance(bCommentContent.getText().toString(), CommonDialogFragment.DialogTypeComment);
163 
                CommonDialogFragment commonDialogFragment = CommonDialogFragment.newInstance(bCommentContent.getText().toString(), "优质评论会被优先展示", CommonDialogFragment.DialogTypeComment);
163 164 
                commonDialogFragment.show(getChildFragmentManager(), "CommonDialogFragment");
164
165 165 
                commonDialogFragment.setOnCommonDialogFragmentListener(new CommonDialogFragment.OnCommonDialogFragmentListener() {
166 166 
                    @Override
167 167 
                    public void updateComment(String comment) {
 
@ -223,6 +223,7 @@ public class ChatContentCommentListDialogFragment extends DialogFragment impleme
223 223
224 224 
            @Override
225 225 
            public void onResponse(String response) {
226 
                Log.d(TAG, "onResponse: " + response);
226 227 
                String code = JsonUtils.getKeyResult(response, "code");
227 228 
                String desc = JsonUtils.getKeyResult(response, "desc");
228 229 
                if ("1000".equals(code)) {
 
@ -233,6 +234,9 @@ public class ChatContentCommentListDialogFragment extends DialogFragment impleme
233 234 
                    if (chatContentCommentListDialogFragmentListener != null) {
234 235 
                        chatContentCommentListDialogFragmentListener.updateCommentNum(chatRecommendBean.commentNums);
235 236 
                    }
237 
                } else if ("8010".equals(code)) {
238 
                    startActivity(new Intent(getActivity().getApplicationContext(), LoginActivity.class));
239 
                    ToastUtil.showToast(getContext(), desc, Toast.LENGTH_SHORT);
236 240 
                } else {
237 241 
                    ToastUtil.showToast(getContext(), desc, Toast.LENGTH_SHORT);
238 242 
                }
 
@ -328,6 +332,7 @@ public class ChatContentCommentListDialogFragment extends DialogFragment impleme
328 332 
        private TextView replyLabel;
329 333 
        private ConstraintLayout replyAndDeleteView;
330 334 
        private TextView deleteComment;
335 
        private ConstraintLayout listItemView;
331 336
332 337 
        public CommentHolder(LayoutInflater layoutInflater, ViewGroup parent) {
333 338 
            super(layoutInflater.inflate(R.layout.list_item_comment, parent, false));
 
@ -348,13 +353,14 @@ public class ChatContentCommentListDialogFragment extends DialogFragment impleme
348 353 
            replyInfo = itemView.findViewById(R.id.replyInfo);
349 354 
            replyLabel = itemView.findViewById(R.id.replyLabel);
350 355 
            deleteComment = itemView.findViewById(R.id.deleteComment);
351
356 
            listItemView = itemView.findViewById(R.id.listItemView);
352 357 
        }
353 358
354 359 
        private void initListener() {
355 360 
            likeView.setOnClickListener(this);
356 361 
            replyInfo.setOnClickListener(this);
357 362 
            deleteComment.setOnClickListener(this);
363 
            listItemView.setOnClickListener(this);
358 364 
        }
359 365
360 366 
        @Override
 
@ -366,12 +372,10 @@ public class ChatContentCommentListDialogFragment extends DialogFragment impleme
366 372 
                case R.id.replyInfo: //  点击查看回复列表
367 373 
                    break;
368 374 
                case R.id.deleteComment: // 删除评论操作
369 
                    if (MainApplication.isLogin()) {
370 
                        loginSign();
371 
                    } else {
372 
                        startActivity(new Intent(getActivity().getApplicationContext(), LoginActivity.class));
373 
                        ToastUtil.showToast(getActivity().getApplicationContext(), "请先登录", Toast.LENGTH_SHORT);
374 
                    }
375 
                    deleteComment();
376 
                    break;
377 
                case R.id.listItemView: // 回复
378
375 379 
                    break;
376 380 
            }
377 381 
        }
 
@ -463,44 +467,19 @@ public class ChatContentCommentListDialogFragment extends DialogFragment impleme
463 467 
            });
464 468 
        }
465 469
466 
        // 服务器签名验证
467 
        private void loginSign() {
468 
            String url = MainApplication.urlNew + "/topic/sign.do";
469 
            final Map<String, String> map = new HashMap<>();
470 
            map.put("fileNames", "android");
471 
            map.put("targetType", ChatRecommendBean.TARGET_TYPE_IMAGE_TEXT + "");
472 
            CommonParams.addCommonParams(map);
473
474 
            OkHttpUtils.post().params(map).url(url).build().connTimeOut(6000).readTimeOut(6000).execute(new StringCallback() {
475 
                @Override
476 
                public void onError(Call call, Exception e) {
477 
                    ToastUtil.showToast(getContext(), e.getMessage(), Toast.LENGTH_SHORT);
478 
                }
479
480 
                @Override
481 
                public void onResponse(String response) {
482 
                    String code = JsonUtils.getKeyResult(response, "code");
483 
                    String desc = JsonUtils.getKeyResult(response, "desc");
484 
                    if ("1000".equals(code)) {
485 
                        deleteComment();
486 
                    } else if ("8010".equals(code)) {
487 
                        startActivity(new Intent(getContext(), LoginActivity.class));
488 
                        ToastUtil.showToast(getContext(), desc, Toast.LENGTH_LONG);
489 
                    } else {
490 
                        ToastUtil.showToast(getContext(), desc, Toast.LENGTH_SHORT);
491 
                    }
492 
                }
493 
            });
494 
        }
495
496 470 
        private void deleteComment() {
471 
            if (!MainApplication.isLogin()) {
472 
                startActivity(new Intent(getActivity().getApplicationContext(), LoginActivity.class));
473 
                ToastUtil.showToast(getActivity().getApplicationContext(), "请先登录", Toast.LENGTH_SHORT);
474 
                return;
475 
            }
476
497 477 
            String url = MainApplication.urlNew + "/topic/del.do";
498 478 
            final Map<String, String> map = new HashMap<>();
499 479 
            map.put("targetId", bean.id + "");
500 480 
            map.put("targetType", "25");
501 481 
            map.put("userId", bean.userId + "");
502 482 
            CommonParams.addCommonParams(map);
503
504 483 
            OkHttpUtils.post().params(map).url(url).build().connTimeOut(6000).readTimeOut(6000).execute(new StringCallback() {
505 484 
                @Override
506 485 
                public void onError(Call call, Exception e) {
 
@ -521,6 +500,9 @@ public class ChatContentCommentListDialogFragment extends DialogFragment impleme
521 500 
                        if (chatContentCommentListDialogFragmentListener != null) {
522 501 
                            chatContentCommentListDialogFragmentListener.updateCommentNum(chatRecommendBean.commentNums);
523 502 
                        }
503 
                    } else if ("8010".equals(code)) {
504 
                        startActivity(new Intent(getActivity().getApplicationContext(), LoginActivity.class));
505 
                        ToastUtil.showToast(getContext(), desc, Toast.LENGTH_SHORT);
524 506 
                    } else {
525 507 
                        ToastUtil.showToast(getContext(), desc, Toast.LENGTH_SHORT);
526 508 
                    }

+ 7 - 3
app/src/main/java/com/electric/chargingpile/fragment/CommonDialogFragment.java
查看文件 

@ -7,7 +7,6 @@ import android.support.constraint.ConstraintLayout;
7 7 
import android.support.v4.app.DialogFragment;
8 8 
import android.text.Editable;
9 9 
import android.text.TextWatcher;
10 
import android.util.Log;
11 10 
import android.view.Gravity;
12 11 
import android.view.View;
13 12 
import android.view.Window;
 
@ -27,6 +26,7 @@ public class CommonDialogFragment extends DialogFragment {
27 26
28 27 
    private static final String TAG = "CommonDialogFragment";
29 28 
    private static final String ARG_COMMENT = "comment";
29 
    private static final String ARG_HINT = "hint";
30 30 
    private static final String ARG_TYPE = "type";
31 31 
    private Dialog dialogFragment;
32 32 
    private String type;
 
@ -37,10 +37,11 @@ public class CommonDialogFragment extends DialogFragment {
37 37 
    private ConstraintLayout countInfo;
38 38 
    private TextView count;
39 39
40 
    public static CommonDialogFragment newInstance(String comment, String type) {
40 
    public static CommonDialogFragment newInstance(String comment,String hint, String type) {
41 41 
        CommonDialogFragment dialogFragment = new CommonDialogFragment();
42 42 
        Bundle args = new Bundle();
43 43 
        args.putString(ARG_COMMENT, comment);
44 
        args.putString(ARG_HINT, hint);
44 45 
        args.putString(ARG_TYPE, type);
45 46 
        dialogFragment.setArguments(args);
46 47 
        return dialogFragment;
 
@ -49,6 +50,9 @@ public class CommonDialogFragment extends DialogFragment {
49 50 
    @Override
50 51 
    public Dialog onCreateDialog(Bundle savedInstanceState) {
51 52 
        final String comment = getArguments().getString(ARG_COMMENT);
53 
        final String hint = getArguments().getString(ARG_HINT);
54 
        type = getArguments().getString(ARG_TYPE);
55
52 56 
        dialogFragment = new Dialog(getActivity(), R.style.BottomDialog);
53 57 
        // 外部点击设置为可取消
54 58 
        dialogFragment.setCancelable(true);
 
@ -73,7 +77,7 @@ public class CommonDialogFragment extends DialogFragment {
73 77
74 78 
        editText.setText(comment);
75 79 
        editText.setSelection(comment.length());
76
80 
        editText.setHint(hint);
77 81 
        updateView(comment);
78 82
79 83 
        send.setOnClickListener(new View.OnClickListener() {

+ 2 - 1
app/src/main/res/layout/list_item_comment.xml
查看文件 

@ -2,6 +2,7 @@
2 2 
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 3 
    xmlns:app="http://schemas.android.com/apk/res-auto"
4 4 
    xmlns:tools="http://schemas.android.com/tools"
5 
    android:id="@+id/listItemView"
5 6 
    android:layout_width="match_parent"
6 7 
    android:layout_height="wrap_content"
7 8 
    tools:background="#424242">
 
@ -98,8 +99,8 @@
98 99 
        android:layout_width="wrap_content"
99 100 
        android:layout_height="42dp"
100 101 
        android:paddingLeft="29dp"
101 
        app:layout_constraintLeft_toLeftOf="parent"
102 102 
        app:layout_constraintBottom_toBottomOf="parent"
103 
        app:layout_constraintLeft_toLeftOf="parent"
103 104 
        app:layout_constraintTop_toBottomOf="@+id/content"
104 105 
        tools:background="#06648f">
105 106