691d55172a781ef3e0021e66L364">364 364 
        tv_q_car.setText(CarTypeUtil.getCarType(chexing));
365 365 
        if ("".equals(userpic)) {
366 366 
            Picasso.with(QuestionActivity.this)
367 
                    .load(R.drawable.icon_face2_0)
367 
                    .load(R.drawable.icon_user1118)
368 368 
                    .transform(new CircleTransform())
369 369 
                    .into(iv_q_icon);
370 370 
        } else {
371 371 
            Picasso.with(QuestionActivity.this)
372 372 
                    .load(userpic)
373 
                    .error(R.drawable.icon_face2_0)
374 
                    .placeholder(R.drawable.icon_face2_0)
373 
                    .error(R.drawable.icon_user1118)
374 
                    .placeholder(R.drawable.icon_user1118)
375 375 
                    .transform(new CircleTransform())
376 376 
                    .into(iv_q_icon);
377 377 
        }

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

@ -216,8 +216,8 @@ public class SingleCommentActivity extends Activity implements View.OnClickListe
216 216 
        String userpic = JsonUtils.getKeyResult(data, "userpic");
217 217 
        Picasso.with(MainApplication.context)
218 218 
                .load(MainApplication.url + "/zhannew/uploadfile/" + userpic)
219 
                .placeholder(R.drawable.icon_face2_0)
220 
                .error(R.drawable.icon_face2_0)
219 
                .placeholder(R.drawable.icon_user1118)
220 
                .error(R.drawable.icon_user1118)
221 221 
                .into(iv_picon);
222 222 
        //设置名称
223 223 
        String nickname = JsonUtils.getKeyResult(data, "nickname");
 
@ -295,8 +295,8 @@ public class SingleCommentActivity extends Activity implements View.OnClickListe
295 295 
            final String[] ss = {file_url};
296 296 
            Picasso.with(MainApplication.context)
297 297 
                    .load(url)
298 
                    .placeholder(R.drawable.icon_face2_0)
299 
                    .error(R.drawable.icon_face2_0)
298 
                    .placeholder(R.drawable.icon_user1118)
299 
                    .error(R.drawable.icon_user1118)
300 300 
                    .into(iv_commentPic);
301 301 
            iv_commentPic.setOnClickListener(new View.OnClickListener() {
302 302 
                @Override

+ 2 - 2
app/src/main/java/com/electric/chargingpile/activity/SkipUserInfoActivity.java
查看文件 

@ -154,7 +154,7 @@ public class SkipUserInfoActivity extends Activity implements View.OnClickListen
154 154 
        et_car = (TextView) findViewById(R.id.et_che);
155 155
156 156
157 
        photo = BitmapFactory.decodeResource(getResources(), R.drawable.icon_face2_0);
157 
        photo = BitmapFactory.decodeResource(getResources(), R.drawable.icon_user1118);
158 158 
        rl_select_car = (RelativeLayout) findViewById(R.id.rl_select_car);
159 159 
        rl_select_car.setOnClickListener(this);
160 160 
        animation = AnimationUtils.loadAnimation(SkipUserInfoActivity.this, R.anim.nn);
 
@ -444,7 +444,7 @@ public class SkipUserInfoActivity extends Activity implements View.OnClickListen
444 444
445 445 
            case R.id.iv_right:
446 446 
//                startActivity(new Intent(SkipUserInfoActivity.this,LoginActivity.class));
447 
                Bitmap bmp = BitmapFactory.decodeResource(getResources(), R.drawable.icon_face2_0);
447 
                Bitmap bmp = BitmapFactory.decodeResource(getResources(), R.drawable.icon_user1118);
448 448 
                ImageTools.saveImageToGallery(getApplicationContext(), bmp, "user_icon");
449 449 
                ProfileManager.getInstance().setFirstPoint(SkipUserInfoActivity.this, "1");
450 450 
                ActivityManagerApplication.destoryActivity("login");

+ 6 - 6
app/src/main/java/com/electric/chargingpile/activity/UserCenterActivity.java
查看文件 

@ -488,15 +488,15 @@ public class UserCenterActivity extends Activity implements View.OnClickListener
488 488 
            userIcon.setImageBitmap(usericonbt);
489 489 
        } else if (MainApplication.userIcon.equals("")) {
490 490 
//            Log.e("2222", "22222");
491 
            userIcon.setImageBitmap(BitmapFactory.decodeResource(getResources(), R.drawable.icon_face2_0));
491 
            userIcon.setImageBitmap(BitmapFactory.decodeResource(getResources(), R.drawable.icon_user1118));
492 492 
        } else {
493 493 
//            Log.e("3333", "33333");
494 494 
//            userIcon.setImageBitmap(bm);
495 495 
            if (!MainApplication.userIcon.equals("")) {
496 496 
//                Glide.with(MainApplication.context)
497 497 
//                        .load(MainApplication.userIcon)
498 
//                        .error(R.drawable.icon_face2_0)
499 
//                        .placeholder(R.drawable.icon_face2_0)
498 
//                        .error(R.drawable.icon_user1118)
499 
//                        .placeholder(R.drawable.icon_user1118)
500 500 
//                        .into(userIcon);
501 501 
                PicassoUtil.loadingNetImage(getApplication(), MainApplication.userIcon, userIcon);
502 502 
            }
 
@ -1178,11 +1178,11 @@ public class UserCenterActivity extends Activity implements View.OnClickListener
1178 1178 
            if (!"".equals(MainApplication.userIcon)) {
1179 1179 
                Picasso.with(UserCenterActivity.this)
1180 1180 
                        .load(MainApplication.userIcon)
1181 
                        .placeholder(R.drawable.icon_face2_0)
1182 
                        .error(R.drawable.icon_face2_0)
1181 
                        .placeholder(R.drawable.icon_user1118)
1182 
                        .error(R.drawable.icon_user1118)
1183 1183 
                        .into(userIcon);
1184 1184 
            } else {
1185 
                userIcon.setImageResource(R.drawable.icon_face2_0);
1185 
                userIcon.setImageResource(R.drawable.icon_user1118);
1186 1186 
            }
1187 1187 
        }
1188 1188 
        if (MainApplication.isLogin()) {

+ 3 - 2
app/src/main/java/com/electric/chargingpile/activity/UserInfoActivity.java
查看文件 

@ -40,6 +40,7 @@ import android.widget.Button;
40 40 
import android.widget.CompoundButton;
41 41 
import android.widget.EditText;
42 42 
import android.widget.ImageView;
43 
import android.widget.LinearLayout;
43 44 
import android.widget.PopupWindow;
44 45 
import android.widget.RelativeLayout;
45 46 
import android.widget.Spinner;
 
@ -143,7 +144,7 @@ public class UserInfoActivity extends Activity implements View.OnClickListener,
143 144 
    private LoadingDialog loadDialog;
144 145 
    // 1.去认证车主（获得充电优惠）      > 2.认证车主             审核中  3.认证车主             宝马
145 146 
    private int certificateStatus = 0; // 1 去认证  2审核中  3认证车主
146 
    private RelativeLayout go_certificate;
147 
    private LinearLayout go_certificate;
147 148 
    private TextView go_title;
148 149 
    private TextView go_desc;
149 150 
    private ImageView go_cursor;
 
@ -272,7 +273,7 @@ public class UserInfoActivity extends Activity implements View.OnClickListener,
272 273 
                        }
273 274 
                    });
274 275 
        } else {
275 
            iconPic.setImageResource(R.drawable.icon_face2_0);
276 
            iconPic.setImageResource(R.drawable.icon_user1118);
276 277 
            photo = ((BitmapDrawable) iconPic.getDrawable()).getBitmap();
277 278 
        }
278 279 
    }

+ 5 - 5
app/src/main/java/com/electric/chargingpile/activity/UserPageActivity.java
查看文件 

@ -186,11 +186,11 @@ public class UserPageActivity extends AppCompatActivity implements View.OnClickL
186 186 
            if (!"".equals(MainApplication.userIcon)) {
187 187 
                Picasso.with(UserPageActivity.this)
188 188 
                        .load(MainApplication.userIcon)
189 
                        .placeholder(R.drawable.icon_face2_0)
190 
                        .error(R.drawable.icon_face2_0)
189 
                        .placeholder(R.drawable.icon_user1118)
190 
                        .error(R.drawable.icon_user1118)
191 191 
                        .into(userHead);
192 192 
            } else {
193 
                userHead.setImageResource(R.drawable.icon_face2_0);
193 
                userHead.setImageResource(R.drawable.icon_user1118);
194 194 
            }
195 195 
        }
196 196 
    }
 
@ -308,7 +308,7 @@ public class UserPageActivity extends AppCompatActivity implements View.OnClickL
308 308
309 309 
    private void updateTopView() {
310 310 
        if (TextUtils.isEmpty(userVo.headImgUrl)) {
311 
            userHead.setImageResource(R.drawable.icon_face2_0);
311 
            userHead.setImageResource(R.drawable.icon_user1118);
312 312 
        } else {
313 313 
            Picasso.with(this).load("http://cdz.evcharge.cc/zhannew/uploadfile/" + userVo.headImgUrl).into(new Target() {
314 314 
                @Override
 
@ -318,7 +318,7 @@ public class UserPageActivity extends AppCompatActivity implements View.OnClickL
318 318
319 319 
                @Override
320 320 
                public void onBitmapFailed(Drawable drawable) {
321 
                    userHead.setImageResource(R.drawable.icon_face2_0);
321 
                    userHead.setImageResource(R.drawable.icon_user1118);
322 322 
                }
323 323
324 324 
                @Override

+ 5 - 5
app/src/main/java/com/electric/chargingpile/adapter/AnswerAdapter.java
查看文件 

@ -83,16 +83,16 @@ public class AnswerAdapter extends BaseAdapter {
83 83 
        final AnswerBean answerBean = datas.get(position);
84 84 
        if ("".equals(answerBean.getUserpic())) {
85 85 
            Picasso.with(context)
86 
                    .load(R.drawable.icon_face2_0)
87 
                    .placeholder(R.drawable.icon_face2_0)
88 
                    .error(R.drawable.icon_face2_0)
86 
                    .load(R.drawable.icon_user1118)
87 
                    .placeholder(R.drawable.icon_user1118)
88 
                    .error(R.drawable.icon_user1118)
89 89 
                    .transform(new CircleTransform())
90 90 
                    .into(holder.iv_a_icon);
91 91 
        } else {
92 92 
            Picasso.with(context)
93 93 
                    .load(answerBean.getUserpic())
94 
                    .placeholder(R.drawable.icon_face2_0)
95 
                    .error(R.drawable.icon_face2_0)
94 
                    .placeholder(R.drawable.icon_user1118)
95 
                    .error(R.drawable.icon_user1118)
96 96 
                    .transform(new CircleTransform())
97 97 
                    .into(holder.iv_a_icon);
98 98 
        }

+ 5 - 5
app/src/main/java/com/electric/chargingpile/adapter/ChatRecommendAdapter.java
查看文件 

@ -197,16 +197,16 @@ public class ChatRecommendAdapter extends RecyclerView.Adapter<IViewHolder> {
197 197
198 198 
            if (TextUtils.isEmpty(bean.headImgUrl)) {
199 199 
                Picasso.with(context)
200 
                        .load(R.drawable.icon_face2_0)
201 
                        .placeholder(R.drawable.icon_face2_0)
202 
                        .error(R.drawable.icon_face2_0)
200 
                        .load(R.drawable.icon_user1118)
201 
                        .placeholder(R.drawable.icon_user1118)
202 
                        .error(R.drawable.icon_user1118)
203 203 
                        .transform(new CircleTransform())
204 204 
                        .into(contentViewHolder.headImage);
205 205 
            } else {
206 206 
                Picasso.with(context)
207 207 
                        .load("http://cdz.evcharge.cc/zhannew/uploadfile/" + bean.headImgUrl)
208 
                        .placeholder(R.drawable.icon_face2_0)
209 
                        .error(R.drawable.icon_face2_0)
208 
                        .placeholder(R.drawable.icon_user1118)
209 
                        .error(R.drawable.icon_user1118)
210 210 
                        .transform(new CircleTransform())
211 211 
                        .into(contentViewHolder.headImage);
212 212 
            }

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

@ -447,7 +447,7 @@ public class CommentAdapter extends BaseAdapter {
447 447 
//                public void run() {
448 448 
//                    String s = commentsBean.getUserpic();
449 449 
//                    if (s.equals("")){
450 
//                        holder.iv_icon.setImageResource(R.drawable.icon_face2_0);
450 
//                        holder.iv_icon.setImageResource(R.drawable.icon_user1118);
451 451 
//                    }else {
452 452 
//                        Bitmap bitmap = getHttpBitmap("http://cdz.d1ev.com/zhannew/uploadfile/"+s);
453 453 
//                        holder.iv_icon.setImageBitmap(bitmap);

@ -455,14 +455,14 @@ public class CommentAdapter extends BaseAdapter {
455 455 
//                }
456 456 
//            }).start();
457 457
458 
            holder.iv_icon.setImageResource(R.drawable.icon_face2_0);
458 
            holder.iv_icon.setImageResource(R.drawable.icon_user1118);
459 459 
            PicassoUtil.loadingNetImage(convertView.getContext(), "http://cdz.d1ev.com/zhannew/uploadfile/" + commentsBean.getUserpic()
460 460 
                    , holder.iv_icon);
461 461 
//            if (com.bumptech.glide.util.Util.isOnMainThread()) {
462 462 
//                Glide.with(finalConvertView.getContext())
463 463 
//                        .load("http://cdz.d1ev.com/zhannew/uploadfile/" + commentsBean.getUserpic())
464 
//                        .placeholder(R.drawable.icon_face2_0)
465 
//                        .error(R.drawable.icon_face2_0)
464 
//                        .placeholder(R.drawable.icon_user1118)
465 
//                        .error(R.drawable.icon_user1118)
466 466 
//                        .into(holder.iv_icon);
467 467 
//            }
468 468

+ 2 - 2
app/src/main/java/com/electric/chargingpile/adapter/FeedbackMessageAdapter.java
查看文件 

@ -90,8 +90,8 @@ public class FeedbackMessageAdapter extends BaseAdapter {
90 90 
            Log.e("url", "getView: url" + feedbackMessageData.getName_pic());
91 91 
            Picasso.with(MainApplication.context)
92 92 
                    .load(feedbackMessageData.getName_pic())
93 
                    .error(R.drawable.icon_face2_0)
94 
                    .placeholder(R.drawable.icon_face2_0)
93 
                    .error(R.drawable.icon_user1118)
94 
                    .placeholder(R.drawable.icon_user1118)
95 95 
                    .into(holder.item_iv_icon_right);
96 96
97 97 
        } else if (feedbackMessageData.getType().equals("2")) {

+ 5 - 5
app/src/main/java/com/electric/chargingpile/adapter/LayoutAdapter.java
查看文件 

@ -248,16 +248,16 @@ public class LayoutAdapter extends RecyclerView.Adapter<IViewHolder> {
248 248
249 249 
        if (TextUtils.isEmpty(talkRecommendBean.headImgUrl)) {
250 250 
            Picasso.with(context)
251 
                    .load(R.drawable.icon_face2_0)
252 
                    .placeholder(R.drawable.icon_face2_0)
253 
                    .error(R.drawable.icon_face2_0)
251 
                    .load(R.drawable.icon_user1118)
252 
                    .placeholder(R.drawable.icon_user1118)
253 
                    .error(R.drawable.icon_user1118)
254 254 
                    .transform(new CircleTransform())
255 255 
                    .into(simpleViewHolder.user_avater);
256 256 
        } else {
257 257 
            Picasso.with(context)
258 258 
                    .load("http://cdz.evcharge.cc/zhannew/uploadfile/" + talkRecommendBean.headImgUrl)
259 
                    .placeholder(R.drawable.icon_face2_0)
260 
                    .error(R.drawable.icon_face2_0)
259 
                    .placeholder(R.drawable.icon_user1118)
260 
                    .error(R.drawable.icon_user1118)
261 261 
                    .transform(new CircleTransform())
262 262 
                    .into(simpleViewHolder.user_avater);
263 263 
        }

+ 3 - 3
app/src/main/java/com/electric/chargingpile/adapter/MonthListAdapter.java
查看文件 

@ -119,11 +119,11 @@ public class MonthListAdapter extends BaseAdapter {
119 119 
                holder.tv_month_name.setText(Util.handlePhoneComment(datas.get(position).getString(
120 120 
                        "tel")));
121 121 
            }
122 
            holder.iv_icon.setImageResource(R.drawable.icon_face2_0);
122 
            holder.iv_icon.setImageResource(R.drawable.icon_user1118);
123 123 
            Picasso.with(MainApplication.context)
124 124 
                    .load("http://cdz.d1ev.com/zhannew/uploadfile/" + datas.get(position).getString("userpic"))
125 
                    .error(R.drawable.icon_face2_0)
126 
                    .placeholder(R.drawable.icon_face2_0)
125 
                    .error(R.drawable.icon_user1118)
126 
                    .placeholder(R.drawable.icon_user1118)
127 127 
                    .into(holder.iv_icon);
128 128 
//                PicassoUtil.loadingNetImage(convertView.getContext(), "http://cdz.d1ev.com/zhannew/uploadfile/" + datas.get(position).getString(
129 129 
//                        "userpic"), holder.iv_icon);

+ 5 - 5
app/src/main/java/com/electric/chargingpile/adapter/MyCollectAnswerAdapter.java
查看文件 

@ -97,16 +97,16 @@ public class MyCollectAnswerAdapter extends BaseAdapter {
97 97
98 98 
        if ("".equals(myCollectAnswer.getUserpic())) {
99 99 
            Picasso.with(context)
100 
                    .load(R.drawable.icon_face2_0)
101 
                    .placeholder(R.drawable.icon_face2_0)
102 
                    .error(R.drawable.icon_face2_0)
100 
                    .load(R.drawable.icon_user1118)
101 
                    .placeholder(R.drawable.icon_user1118)
102 
                    .error(R.drawable.icon_user1118)
103 103 
                    .transform(new CircleTransform())
104 104 
                    .into(holder.iv_usericon);
105 105 
        } else {
106 106 
            Picasso.with(context)
107 107 
                    .load(myCollectAnswer.getUserpic())
108 
                    .placeholder(R.drawable.icon_face2_0)
109 
                    .error(R.drawable.icon_face2_0)
108 
                    .placeholder(R.drawable.icon_user1118)
109 
                    .error(R.drawable.icon_user1118)
110 110 
                    .transform(new CircleTransform())
111 111 
                    .into(holder.iv_usericon);
112 112 
        }

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

@ -157,8 +157,8 @@ public class NewPingLunAdapter extends BaseAdapter {
157 157 
                    final String[] s = {file_url};
158 158 
                    Picasso.with(MainApplication.context)
159 159 
                            .load(MainApplication.url + "/zhannew/uploadfile/" + thumUrl)
160 
                            .placeholder(R.drawable.icon_face2_0)
161 
                            .error(R.drawable.icon_face2_0)
160 
                            .placeholder(R.drawable.icon_user1118)
161 
                            .error(R.drawable.icon_user1118)
162 162 
                            .into(holder.iv_commentPic);
163 163 
//                    PicassoUtil.loadingNetImage(convertView.getContext(),url,holder.iv_commentPic);
164 164 
                    final View finalConvertView2 = convertView;
 
@ -380,8 +380,8 @@ public class NewPingLunAdapter extends BaseAdapter {
380 380 
//                        "userpic"), holder.iv_icon);
381 381 
                Picasso.with(MainApplication.context)
382 382 
                        .load("http://cdz.d1ev.com/zhannew/uploadfile/" + datas.get(position).getString("userpic"))
383 
                        .error(R.drawable.icon_face2_0)
384 
                        .placeholder(R.drawable.icon_face2_0)
383 
                        .error(R.drawable.icon_user1118)
384 
                        .placeholder(R.drawable.icon_user1118)
385 385 
                        .into(holder.iv_icon);
386 386
387 387 
//                holder.tv_carType.setText(datas.get(position).getString("tel"));

+ 2 - 2
app/src/main/java/com/electric/chargingpile/adapter/PingLunAdapter.java
查看文件 

@ -271,8 +271,8 @@ public class PingLunAdapter extends BaseAdapter {
271 271 
//                        "userpic"), holder.iv_icon);
272 272 
                Picasso.with(MainApplication.context)
273 273 
                        .load(MainApplication.url + "/zhannew/uploadfile/" + datas.get(position).getString("userpic"))
274 
                        .error(R.drawable.icon_face2_0)
275 
                        .placeholder(R.drawable.icon_face2_0)
274 
                        .error(R.drawable.icon_user1118)
275 
                        .placeholder(R.drawable.icon_user1118)
276 276 
                        .into(holder.iv_icon);
277 277
278 278 
//                holder.tv_carType.setText(datas.get(position).getString("tel"));

+ 10 - 10
app/src/main/java/com/electric/chargingpile/adapter/QADataAdapter.java
查看文件 

@ -118,16 +118,16 @@ public class QADataAdapter extends BaseAdapter {
118 118 
                holder.ll_answer.setVisibility(View.GONE);
119 119 
                if ("".equals(qa.getUserpic())) {
120 120 
                    Picasso.with(context)
121 
                            .load(R.drawable.icon_face2_0)
122 
                            .placeholder(R.drawable.icon_face2_0)
123 
                            .error(R.drawable.icon_face2_0)
121 
                            .load(R.drawable.icon_user1118)
122 
                            .placeholder(R.drawable.icon_user1118)
123 
                            .error(R.drawable.icon_user1118)
124 124 
                            .transform(new CircleTransform())
125 125 
                            .into(holder.iv_q_usericon);
126 126 
                } else {
127 127 
                    Picasso.with(context)
128 128 
                            .load(qa.getUserpic())
129 
                            .placeholder(R.drawable.icon_face2_0)
130 
                            .error(R.drawable.icon_face2_0)
129 
                            .placeholder(R.drawable.icon_user1118)
130 
                            .error(R.drawable.icon_user1118)
131 131 
                            .transform(new CircleTransform())
132 132 
                            .into(holder.iv_q_usericon);
133 133 
                }
 
@ -203,16 +203,16 @@ public class QADataAdapter extends BaseAdapter {
203 203 
                holder.iv_a_image.setVisibility(View.GONE);
204 204 
                if ("".equals(qa.getUserpic())) {
205 205 
                    Picasso.with(context)
206 
                            .load(R.drawable.icon_face2_0)
207 
                            .placeholder(R.drawable.icon_face2_0)
208 
                            .error(R.drawable.icon_face2_0)
206 
                            .load(R.drawable.icon_user1118)
207 
                            .placeholder(R.drawable.icon_user1118)
208 
                            .error(R.drawable.icon_user1118)
209 209 
                            .transform(new CircleTransform())
210 210 
                            .into(holder.iv_a_usericon);
211 211 
                } else {
212 212 
                    Picasso.with(context)
213 213 
                            .load(qa.getUserpic())
214 
                            .placeholder(R.drawable.icon_face2_0)
215 
                            .error(R.drawable.icon_face2_0)
214 
                            .placeholder(R.drawable.icon_user1118)
215 
                            .error(R.drawable.icon_user1118)
216 216 
                            .transform(new CircleTransform())
217 217 
                            .into(holder.iv_a_usericon);
218 218 
                }

+ 10 - 10
app/src/main/java/com/electric/chargingpile/adapter/QADataFramAdapter.java
查看文件 

@ -118,16 +118,16 @@ public class QADataFramAdapter extends BaseAdapter {
118 118 
                holder.ll_answer.setVisibility(View.GONE);
119 119 
                if ("".equals(qa.getUserpic())) {
120 120 
                    Picasso.with(context)
121 
                            .load(R.drawable.icon_face2_0)
122 
                            .placeholder(R.drawable.icon_face2_0)
123 
                            .error(R.drawable.icon_face2_0)
121 
                            .load(R.drawable.icon_user1118)
122 
                            .placeholder(R.drawable.icon_user1118)
123 
                            .error(R.drawable.icon_user1118)
124 124 
                            .transform(new CircleTransform())
125 125 
                            .into(holder.iv_q_usericon);
126 126 
                } else {
127 127 
                    Picasso.with(context)
128 128 
                            .load(qa.getUserpic())
129 
                            .placeholder(R.drawable.icon_face2_0)
130 
                            .error(R.drawable.icon_face2_0)
129 
                            .placeholder(R.drawable.icon_user1118)
130 
                            .error(R.drawable.icon_user1118)
131 131 
                            .transform(new CircleTransform())
132 132 
                            .into(holder.iv_q_usericon);
133 133 
                }
 
@ -203,16 +203,16 @@ public class QADataFramAdapter extends BaseAdapter {
203 203 
                holder.iv_a_image.setVisibility(View.GONE);
204 204 
                if ("".equals(qa.getUserpic())) {
205 205 
                    Picasso.with(context)
206 
                            .load(R.drawable.icon_face2_0)
207 
                            .placeholder(R.drawable.icon_face2_0)
208 
                            .error(R.drawable.icon_face2_0)
206 
                            .load(R.drawable.icon_user1118)
207 
                            .placeholder(R.drawable.icon_user1118)
208 
                            .error(R.drawable.icon_user1118)
209 209 
                            .transform(new CircleTransform())
210 210 
                            .into(holder.iv_a_usericon);
211 211 
                } else {
212 212 
                    Picasso.with(context)
213 213 
                            .load(qa.getUserpic())
214 
                            .placeholder(R.drawable.icon_face2_0)
215 
                            .error(R.drawable.icon_face2_0)
214 
                            .placeholder(R.drawable.icon_user1118)
215 
                            .error(R.drawable.icon_user1118)
216 216 
                            .transform(new CircleTransform())
217 217 
                            .into(holder.iv_a_usericon);
218 218 
                }

+ 5 - 5
app/src/main/java/com/electric/chargingpile/adapter/QianDaoAdapter.java
查看文件 

@ -157,17 +157,17 @@ public class QianDaoAdapter extends BaseAdapter {
157 157 
            } else {
158 158 
                holder.item_name.setText(name);
159 159 
            }
160 
            holder.item_icon.setImageResource(R.drawable.icon_face2_0);
160 
            holder.item_icon.setImageResource(R.drawable.icon_user1118);
161 161 
            final String pic_url = MainApplication.url + "/zhannew/uploadfile/" + list.get(position).getUserpic();
162 162 
            Picasso.with(MainApplication.context)
163 163 
                    .load(pic_url)
164 
                    .error(R.drawable.icon_face2_0)
165 
                    .placeholder(R.drawable.icon_face2_0)
164 
                    .error(R.drawable.icon_user1118)
165 
                    .placeholder(R.drawable.icon_user1118)
166 166 
                    .into(holder.item_icon);
167 167 
//            Glide.with(MainApplication.context)
168 168 
//                    .load(pic_url)
169 
//                    .error(R.drawable.icon_face2_0)
170 
//                    .placeholder(R.drawable.icon_face2_0)
169 
//                    .error(R.drawable.icon_user1118)
170 
//                    .placeholder(R.drawable.icon_user1118)
171 171 
//                    .into(holder.item_icon);
172 172 
            if (position == list.size() - 1) {
173 173 
                holder.item_view1.setVisibility(View.GONE);

+ 2 - 2
app/src/main/java/com/electric/chargingpile/adapter/SonCommentAdapter.java
查看文件 

@ -153,8 +153,8 @@ public class SonCommentAdapter extends BaseAdapter {
153 153
154 154 
                Picasso.with(MainApplication.context)
155 155 
                        .load("http://cdz.d1ev.com/zhannew/uploadfile/" + datas.get(position).getString("userpic"))
156 
                        .error(R.drawable.icon_face2_0)
157 
                        .placeholder(R.drawable.icon_face2_0)
156 
                        .error(R.drawable.icon_user1118)
157 
                        .placeholder(R.drawable.icon_user1118)
158 158 
                        .into(holder.iv_icon);
159 159
160 160 
//                holder.tv_carType.setText(datas.get(position).getString("tel"));

+ 5 - 5
app/src/main/java/com/electric/chargingpile/adapter/TopicDetailAdapter.java
查看文件 

@ -207,16 +207,16 @@ public class TopicDetailAdapter extends RecyclerView.Adapter<IViewHolder> {
207 207 
        });
208 208 
        if (TextUtils.isEmpty(bean.headImgUrl)) {
209 209 
            Picasso.with(context)
210 
                    .load(R.drawable.icon_face2_0)
211 
                    .placeholder(R.drawable.icon_face2_0)
212 
                    .error(R.drawable.icon_face2_0)
210 
                    .load(R.drawable.icon_user1118)
211 
                    .placeholder(R.drawable.icon_user1118)
212 
                    .error(R.drawable.icon_user1118)
213 213 
                    .transform(new CircleTransform())
214 214 
                    .into(contentViewHolder.headImage);
215 215 
        } else {
216 216 
            Picasso.with(context)
217 217 
                    .load("http://cdz.evcharge.cc/zhannew/uploadfile/" + bean.headImgUrl)
218 
                    .placeholder(R.drawable.icon_face2_0)
219 
                    .error(R.drawable.icon_face2_0)
218 
                    .placeholder(R.drawable.icon_user1118)
219 
                    .error(R.drawable.icon_user1118)
220 220 
                    .transform(new CircleTransform())
221 221 
                    .into(contentViewHolder.headImage);
222 222 
        }

+ 3 - 3
app/src/main/java/com/electric/chargingpile/adapter/TotalListAdapter.java
查看文件 

@ -116,13 +116,13 @@ public class TotalListAdapter extends BaseAdapter {
116 116 
                holder.tv_total_name.setText(Util.handlePhoneComment(datas.get(position).getString(
117 117 
                        "tel")));
118 118 
            }
119 
            holder.iv_icon.setImageResource(R.drawable.icon_face2_0);
119 
            holder.iv_icon.setImageResource(R.drawable.icon_user1118);
120 120 
//            PicassoUtil.loadingNetImage(convertView.getContext(), "http://cdz.d1ev.com/zhannew/uploadfile/" + datas.get(position).getString(
121 121 
//                    "userpic"), holder.iv_icon);
122 122 
            Picasso.with(MainApplication.context)
123 123 
                    .load("http://cdz.d1ev.com/zhannew/uploadfile/" + datas.get(position).getString("userpic"))
124 
                    .error(R.drawable.icon_face2_0)
125 
                    .placeholder(R.drawable.icon_face2_0)
124 
                    .error(R.drawable.icon_user1118)
125 
                    .placeholder(R.drawable.icon_user1118)
126 126 
                    .into(holder.iv_icon);
127 127 
            holder.tv_total_charge.setText(datas.get(position).getString(
128 128 
                    "power"));

+ 5 - 5
app/src/main/java/com/electric/chargingpile/adapter/UnansweredAdapter.java
查看文件 

@ -96,16 +96,16 @@ public class UnansweredAdapter extends BaseAdapter {
96 96 
        final UnansweredBean unansweredBean = datas.get(position);
97 97 
        if ("".equals(unansweredBean.getUserpic())) {
98 98 
            Picasso.with(context)
99 
                    .load(R.drawable.icon_face2_0)
100 
                    .placeholder(R.drawable.icon_face2_0)
101 
                    .error(R.drawable.icon_face2_0)
99 
                    .load(R.drawable.icon_user1118)
100 
                    .placeholder(R.drawable.icon_user1118)
101 
                    .error(R.drawable.icon_user1118)
102 102 
                    .transform(new CircleTransform())
103 103 
                    .into(holder.iv_q_usericon);
104 104 
        } else {
105 105 
            Picasso.with(context)
106 106 
                    .load(unansweredBean.getUserpic())
107 
                    .placeholder(R.drawable.icon_face2_0)
108 
                    .error(R.drawable.icon_face2_0)
107 
                    .placeholder(R.drawable.icon_user1118)
108 
                    .error(R.drawable.icon_user1118)
109 109 
                    .transform(new CircleTransform())
110 110 
                    .into(holder.iv_q_usericon);
111 111 
        }

+ 5 - 5
app/src/main/java/com/electric/chargingpile/adapter/UserPageAdapter.java
查看文件 

@ -121,16 +121,16 @@ public class UserPageAdapter extends RecyclerView.Adapter<IViewHolder> {
121 121 
        contentViewHolder.title.setText(bean.title);
122 122 
        if (TextUtils.isEmpty(bean.headImgUrl)) {
123 123 
            Picasso.with(context)
124 
                    .load(R.drawable.icon_face2_0)
125 
                    .placeholder(R.drawable.icon_face2_0)
126 
                    .error(R.drawable.icon_face2_0)
124 
                    .load(R.drawable.icon_user1118)
125 
                    .placeholder(R.drawable.icon_user1118)
126 
                    .error(R.drawable.icon_user1118)
127 127 
                    .transform(new CircleTransform())
128 128 
                    .into(contentViewHolder.headImage);
129 129 
        } else {
130 130 
            Picasso.with(context)
131 131 
                    .load("http://cdz.evcharge.cc/zhannew/uploadfile/" + bean.headImgUrl)
132 
                    .placeholder(R.drawable.icon_face2_0)
133 
                    .error(R.drawable.icon_face2_0)
132 
                    .placeholder(R.drawable.icon_user1118)
133 
                    .error(R.drawable.icon_user1118)
134 134 
                    .transform(new CircleTransform())
135 135 
                    .into(contentViewHolder.headImage);
136 136 
        }

+ 5 - 5
app/src/main/java/com/electric/chargingpile/adapter/VideoCommentAdapter.java
查看文件 

@ -52,16 +52,16 @@ public class VideoCommentAdapter extends RecyclerView.Adapter<VideoCommentAdapte
52 52
53 53 
        if (TextUtils.isEmpty(videoCommentBean.headImgFromUser)) {
54 54 
            Picasso.with(context)
55 
                    .load(R.drawable.icon_face2_0)
56 
                    .placeholder(R.drawable.icon_face2_0)
57 
                    .error(R.drawable.icon_face2_0)
55 
                    .load(R.drawable.icon_user1118)
56 
                    .placeholder(R.drawable.icon_user1118)
57 
                    .error(R.drawable.icon_user1118)
58 58 
                    .transform(new CircleTransform())
59 59 
                    .into(viewHolder.mItemUserAvatar);
60 60 
        } else {
61 61 
            Picasso.with(context)
62 62 
                    .load("http://cdz.evcharge.cc/zhannew/uploadfile/"+videoCommentBean.headImgFromUser)
63 
                    .placeholder(R.drawable.icon_face2_0)
64 
                    .error(R.drawable.icon_face2_0)
63 
                    .placeholder(R.drawable.icon_user1118)
64 
                    .error(R.drawable.icon_user1118)
65 65 
                    .transform(new CircleTransform())
66 66 
                    .into(viewHolder.mItemUserAvatar);
67 67 
        }

+ 5 - 5
app/src/main/java/com/electric/chargingpile/adapter/WaterFallAdapter.java
查看文件 

@ -123,16 +123,16 @@ public class WaterFallAdapter extends RecyclerView.Adapter<IViewHolder> {
123 123
124 124 
        if (TextUtils.isEmpty(talkRecommendBean.headImgUrl)) {
125 125 
            Picasso.with(context)
126 
                    .load(R.drawable.icon_face2_0)
127 
                    .placeholder(R.drawable.icon_face2_0)
128 
                    .error(R.drawable.icon_face2_0)
126 
                    .load(R.drawable.icon_user1118)
127 
                    .placeholder(R.drawable.icon_user1118)
128 
                    .error(R.drawable.icon_user1118)
129 129 
                    .transform(new CircleTransform())
130 130 
                    .into(simpleViewHolder.user_avater);
131 131 
        } else {
132 132 
            Picasso.with(context)
133 133 
                    .load(talkRecommendBean.headImgUrl)
134 
                    .placeholder(R.drawable.icon_face2_0)
135 
                    .error(R.drawable.icon_face2_0)
134 
                    .placeholder(R.drawable.icon_user1118)
135 
                    .error(R.drawable.icon_user1118)
136 136 
                    .transform(new CircleTransform())
137 137 
                    .into(simpleViewHolder.user_avater);
138 138 
        }

+ 3 - 3
app/src/main/java/com/electric/chargingpile/adapter/ZhanCommentsAapter.java
查看文件 

@ -199,12 +199,12 @@ public class ZhanCommentsAapter extends BaseAdapter {
199 199 
                    holder.tv_pcontext.setText(ss);
200 200 
                }
201 201 
                //父级头像
202 
                holder.iv_picon.setImageResource(R.drawable.icon_face2_0);
202 
                holder.iv_picon.setImageResource(R.drawable.icon_user1118);
203 203 
                final String pic_url = MainApplication.url + "/zhannew/uploadfile/" + datas.get(position).getString("userpic");
204 204 
                Picasso.with(MainApplication.context)
205 205 
                        .load(pic_url)
206 
                        .error(R.drawable.icon_face2_0)
207 
                        .placeholder(R.drawable.icon_face2_0)
206 
                        .error(R.drawable.icon_user1118)
207 
                        .placeholder(R.drawable.icon_user1118)
208 208 
                        .transform(new CircleTransform())
209 209 
                        .into(holder.iv_picon);
210 210 
                //父级显示名称

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

@ -465,16 +465,16 @@ public class ChatContentCommentListDialogFragment extends DialogFragment impleme
465 465
466 466 
            if (TextUtils.isEmpty(bean.headImgFromUser)) {
467 467 
                Picasso.with(getContext())
468 
                        .load(R.drawable.icon_face2_0)
469 
                        .placeholder(R.drawable.icon_face2_0)
470 
                        .error(R.drawable.icon_face2_0)
468 
                        .load(R.drawable.icon_user1118)
469 
                        .placeholder(R.drawable.icon_user1118)
470 
                        .error(R.drawable.icon_user1118)
471 471 
                        .transform(new CircleTransform())
472 472 
                        .into(headImage);
473 473 
            } else {
474 474 
                Picasso.with(getContext())
475 475 
                        .load("http://cdz.evcharge.cc/zhannew/uploadfile/" + bean.headImgFromUser)
476 
                        .placeholder(R.drawable.icon_face2_0)
477 
                        .error(R.drawable.icon_face2_0)
476 
                        .placeholder(R.drawable.icon_user1118)
477 
                        .error(R.drawable.icon_user1118)
478 478 
                        .transform(new CircleTransform())
479 479 
                        .into(headImage);
480 480 
            }

+ 10 - 10
app/src/main/java/com/electric/chargingpile/fragment/ChatContentReplyListDialogFragment.java
查看文件 

@ -149,16 +149,16 @@ public class ChatContentReplyListDialogFragment extends DialogFragment implement
149 149
150 150 
        if (TextUtils.isEmpty(commentBean.headImgFromUser)) {
151 151 
            Picasso.with(getContext())
152 
                    .load(R.drawable.icon_face2_0)
153 
                    .placeholder(R.drawable.icon_face2_0)
154 
                    .error(R.drawable.icon_face2_0)
152 
                    .load(R.drawable.icon_user1118)
153 
                    .placeholder(R.drawable.icon_user1118)
154 
                    .error(R.drawable.icon_user1118)
155 155 
                    .transform(new CircleTransform())
156 156 
                    .into(commentHeadImage);
157 157 
        } else {
158 158 
            Picasso.with(getContext())
159 159 
                    .load("http://cdz.evcharge.cc/zhannew/uploadfile/" + commentBean.headImgFromUser)
160 
                    .placeholder(R.drawable.icon_face2_0)
161 
                    .error(R.drawable.icon_face2_0)
160 
                    .placeholder(R.drawable.icon_user1118)
161 
                    .error(R.drawable.icon_user1118)
162 162 
                    .transform(new CircleTransform())
163 163 
                    .into(commentHeadImage);
164 164 
        }
 
@ -431,16 +431,16 @@ public class ChatContentReplyListDialogFragment extends DialogFragment implement
431 431
432 432 
            if (TextUtils.isEmpty(bean.headImgFromUser)) {
433 433 
                Picasso.with(getContext())
434 
                        .load(R.drawable.icon_face2_0)
435 
                        .placeholder(R.drawable.icon_face2_0)
436 
                        .error(R.drawable.icon_face2_0)
434 
                        .load(R.drawable.icon_user1118)
435 
                        .placeholder(R.drawable.icon_user1118)
436 
                        .error(R.drawable.icon_user1118)
437 437 
                        .transform(new CircleTransform())
438 438 
                        .into(headImage);
439 439 
            } else {
440 440 
                Picasso.with(getContext())
441 441 
                        .load("http://cdz.evcharge.cc/zhannew/uploadfile/" + bean.headImgFromUser)
442 
                        .placeholder(R.drawable.icon_face2_0)
443 
                        .error(R.drawable.icon_face2_0)
442 
                        .placeholder(R.drawable.icon_user1118)
443 
                        .error(R.drawable.icon_user1118)
444 444 
                        .transform(new CircleTransform())
445 445 
                        .into(headImage);
446 446 
            }

+ 5 - 5
app/src/main/java/com/electric/chargingpile/fragment/DetailsFragment.java
查看文件 

@ -684,18 +684,18 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
684 684 
//                                if (null != getActivity()) {
685 685 
//                                    Glide.with(getActivity())
686 686 
//                                            .load(url)
687 
//                                            .placeholder(R.drawable.icon_face2_0)
688 
//                                            .error(R.drawable.icon_face2_0)
687 
//                                            .placeholder(R.drawable.icon_user1118)
688 
//                                            .error(R.drawable.icon_user1118)
689 689 
//                                            .into(iv_new_icon);
690 690 
//                                }else {
691 
//                                    iv_new_icon.setImageResource(R.drawable.icon_face2_0);
691 
//                                    iv_new_icon.setImageResource(R.drawable.icon_user1118);
692 692 
//                                }
693 693 
//                                PicassoUtil.loadingNetImage(getActivity(), url
694 694 
//                                        , iv_new_icon);
695 695 
                                Picasso.with(MainApplication.context)
696 696 
                                        .load(url)
697 
                                        .error(R.drawable.icon_face2_0)
698 
                                        .placeholder(R.drawable.icon_face2_0)
697 
                                        .error(R.drawable.icon_user1118)
698 
                                        .placeholder(R.drawable.icon_user1118)
699 699 
                                        .into(iv_new_icon);
700 700
701 701 
                                if (content.equals("") || content.equals(" ")) {

+ 2 - 2
app/src/main/java/com/electric/chargingpile/fragment/MonthListFragment.java
查看文件 

@ -165,8 +165,8 @@ public class MonthListFragment extends Fragment {
165 165 
//                                        , iv_icon);
166 166 
                                Picasso.with(MainApplication.context)
167 167 
                                        .load(MainApplication.pic_url + userpic)
168 
                                        .error(R.drawable.icon_face2_0)
169 
                                        .placeholder(R.drawable.icon_face2_0)
168 
                                        .error(R.drawable.icon_user1118)
169 
                                        .placeholder(R.drawable.icon_user1118)
170 170 
                                        .into(iv_icon);
171 171
172 172 
                            }

+ 5 - 5
app/src/main/java/com/electric/chargingpile/fragment/SvVideoShowView.java
查看文件 

@ -178,16 +178,16 @@ public class SvVideoShowView implements View.OnClickListener {
178 178
179 179 
        if (TextUtils.isEmpty(talkRecommendBean.headImgUrl)) {
180 180 
            Picasso.with(activity)
181 
                    .load(R.drawable.icon_face2_0)
182 
                    .placeholder(R.drawable.icon_face2_0)
183 
                    .error(R.drawable.icon_face2_0)
181 
                    .load(R.drawable.icon_user1118)
182 
                    .placeholder(R.drawable.icon_user1118)
183 
                    .error(R.drawable.icon_user1118)
184 184 
                    .transform(new CircleTransform())
185 185 
                    .into(sv_show_user_avatar);
186 186 
        } else {
187 187 
            Picasso.with(activity)
188 188 
                    .load("http://cdz.evcharge.cc/zhannew/uploadfile/" + talkRecommendBean.headImgUrl)
189 
                    .placeholder(R.drawable.icon_face2_0)
190 
                    .error(R.drawable.icon_face2_0)
189 
                    .placeholder(R.drawable.icon_user1118)
190 
                    .error(R.drawable.icon_user1118)
191 191 
                    .transform(new CircleTransform())
192 192 
                    .into(sv_show_user_avatar);
193 193 
        }

+ 2 - 2
app/src/main/java/com/electric/chargingpile/fragment/TotalListFragment.java
查看文件 

@ -152,8 +152,8 @@ public class TotalListFragment extends Fragment {
152 152 
//                                        , iv_icon);
153 153 
                                Picasso.with(MainApplication.context)
154 154 
                                        .load(MainApplication.pic_url + userpic)
155 
                                        .error(R.drawable.icon_face2_0)
156 
                                        .placeholder(R.drawable.icon_face2_0)
155 
                                        .error(R.drawable.icon_user1118)
156 
                                        .placeholder(R.drawable.icon_user1118)
157 157 
                                        .into(iv_icon);
158 158 
                            }
159 159 
                            //当月充电排行

+ 2 - 2
app/src/main/java/com/electric/chargingpile/util/PicassoUtil.java
查看文件 

@ -11,10 +11,10 @@ import com.nostra13.universalimageloader.core.ImageLoader;
11 11 
public class PicassoUtil {
12 12 
    public static void loadingNetImage(Context context, String url, ImageView imageView) {
13 13 
        if (!"".equals(url)) {
14 
            ImageLoader.getInstance().displayImage(url, imageView, MainApplication.getCacheOptions(R.drawable.icon_face2_0));
14 
            ImageLoader.getInstance().displayImage(url, imageView, MainApplication.getCacheOptions(R.drawable.icon_user1118));
15 15 
//			ImageLoader.getInstance().clearDiscCache();
16 16 
        } else {
17 
            imageView.setImageResource(R.drawable.icon_face2_0);
17 
            imageView.setImageResource(R.drawable.icon_user1118);
18 18 
        }
19 19 
    }
20 20

+ 5 - 5
app/src/main/java/com/electric/chargingpile/view/VideoPubilshDialog.java
查看文件 

@ -65,16 +65,16 @@ public class VideoPubilshDialog extends Dialog implements View.OnClickListener {
65 65 
        }
66 66 
        if (TextUtils.isEmpty(talkRecommendBean.headImgUrl)) {
67 67 
            Picasso.with(context)
68 
                    .load(R.drawable.icon_face2_0)
69 
                    .placeholder(R.drawable.icon_face2_0)
70 
                    .error(R.drawable.icon_face2_0)
68 
                    .load(R.drawable.icon_user1118)
69 
                    .placeholder(R.drawable.icon_user1118)
70 
                    .error(R.drawable.icon_user1118)
71 71 
                    .transform(new CircleTransform())
72 72 
                    .into(videoPublishUserAvatar);
73 73 
        } else {
74 74 
            Picasso.with(context)
75 75 
                    .load(talkRecommendBean.headImgUrl)
76 
                    .placeholder(R.drawable.icon_face2_0)
77 
                    .error(R.drawable.icon_face2_0)
76 
                    .placeholder(R.drawable.icon_user1118)
77 
                    .error(R.drawable.icon_user1118)
78 78 
                    .transform(new CircleTransform())
79 79 
                    .into(videoPublishUserAvatar);
80 80 
        }

+ 9 - 0
app/src/main/res/drawable/bg_white_radius6.xml
查看文件 

@ -0,0 +1,9 @@
1 
<?xml version="1.0" encoding="utf-8"?>
2 
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3 
    <item >
4 
        <shape android:shape="rectangle">
5 
            <solid android:color="@color/color_white" />
6 
            <corners android:radius="6dp" />
7 
        </shape>
8 
    </item>
9 
</selector>

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

@ -60,7 +60,7 @@
60 60 
            android:id="@+id/iv_icon"
61 61 
            android:layout_width="55dp"
62 62 
            android:layout_height="55dp"
63 
            android:src="@drawable/icon_face2_0"/>
63 
            android:src="@drawable/icon_user1118"/>
64 64
65 65 
        <RelativeLayout
66 66 
            android:layout_width="wrap_content"

+ 54 - 47
app/src/main/res/layout/activity_skip_user_info.xml
查看文件 

@ -65,59 +65,66 @@
65 65 
        <!--android:layout_marginTop="50dp"-->
66 66 
        <!--android:src="@drawable/icon626" />-->
67 67
68 
        <RelativeLayout
69 
            android:id="@+id/rl_icon"
70 
            android:layout_width="fill_parent"
71 
            android:layout_height="80dp"
72 
            android:layout_marginTop="15dp"
73 
            android:layout_marginBottom="15dp"
74 
            android:layout_marginStart="12dp"
75 
            android:layout_marginEnd="12dp"
76 
            android:background="@drawable/bg_white_radius6">
77
78 
            <TextView
79 
                android:layout_marginStart="20dp"
80 
                android:layout_toEndOf="@+id/iv_user_icon"
81 
                android:id="@+id/tv_head"
82 
                android:layout_width="wrap_content"
83 
                android:layout_height="match_parent"
84 
                android:gravity="center"
85 
                android:paddingLeft="16dp"
86 
                android:text="头像"
87 
                android:textColor="@color/title_row"
88 
                android:textSize="15sp" />
89
90 
            <com.electric.chargingpile.view.RoundImageView
91 
                android:id="@+id/iv_user_icon"
92 
                android:layout_width="45dp"
93 
                android:layout_height="45dp"
94 
                android:layout_marginStart="14dp"
95 
                android:layout_alignParentStart="true"
96 
                android:layout_centerVertical="true"
97 
                android:src="@drawable/icon_user1118" />
98 
            <!--<ImageView-->
99 
            <!--android:id="@+id/iv_user_icon"-->
100 
            <!--android:layout_width="55dp"-->
101 
            <!--android:layout_height="55dp"-->
102 
            <!--android:src="@drawable/icon_user1118"-->
103 
            <!--android:layout_centerVertical="true"-->
104 
            <!--android:layout_alignParentRight="true"-->
105 
            <!--android:layout_alignParentEnd="true"-->
106 
            <!--android:layout_marginRight="32dp"-->
107 
            <!--android:layout_marginEnd="32dp" />-->
108 
            <ImageView
109 
                android:layout_width="wrap_content"
110 
                android:layout_height="match_parent"
111 
                android:layout_alignParentEnd="true"
112 
                android:layout_alignParentRight="true"
113 
                android:layout_centerVertical="true"
114 
                android:layout_marginRight="16dp"
115 
                android:src="@drawable/icon_more2_0" />
116
117
118 
        </RelativeLayout>
68 119
69 120 
        <LinearLayout
70 121 
            android:layout_width="wrap_content"
122 
            android:layout_marginStart="12dp"
123 
            android:layout_marginEnd="12dp"
71 124 
            android:layout_height="wrap_content"
72 
            android:background="@color/white"
125 
            android:background="@drawable/bg_white_radius6"
73 126 
            android:orientation="vertical">
74 127
75 
            <RelativeLayout
76 
                android:id="@+id/rl_icon"
77 
                android:layout_width="fill_parent"
78 
                android:layout_height="62dp"
79 
                android:background="@color/white">
80
81 
                <TextView
82 
                    android:layout_width="wrap_content"
83 
                    android:layout_height="match_parent"
84 
                    android:gravity="center"
85 
                    android:paddingLeft="16dp"
86 
                    android:text="头像"
87 
                    android:textColor="@color/title_row"
88 
                    android:textSize="15sp" />
89
90 
                <com.electric.chargingpile.view.RoundImageView
91 
                    android:id="@+id/iv_user_icon"
92 
                    android:layout_width="45dp"
93 
                    android:layout_height="45dp"
94 
                    android:layout_alignParentEnd="true"
95 
                    android:layout_alignParentRight="true"
96 
                    android:layout_centerVertical="true"
97 
                    android:layout_marginEnd="32dp"
98 
                    android:layout_marginRight="32dp"
99 
                    android:src="@drawable/icon_face2_0" />
100 
                <!--<ImageView-->
101 
                <!--android:id="@+id/iv_user_icon"-->
102 
                <!--android:layout_width="55dp"-->
103 
                <!--android:layout_height="55dp"-->
104 
                <!--android:src="@drawable/icon_face2_0"-->
105 
                <!--android:layout_centerVertical="true"-->
106 
                <!--android:layout_alignParentRight="true"-->
107 
                <!--android:layout_alignParentEnd="true"-->
108 
                <!--android:layout_marginRight="32dp"-->
109 
                <!--android:layout_marginEnd="32dp" />-->
110 
                <ImageView
111 
                    android:layout_width="wrap_content"
112 
                    android:layout_height="match_parent"
113 
                    android:layout_alignParentEnd="true"
114 
                    android:layout_alignParentRight="true"
115 
                    android:layout_centerVertical="true"
116 
                    android:layout_marginRight="16dp"
117 
                    android:src="@drawable/icon_more2_0" />
118
119
120 
            </RelativeLayout>
121 128
122 129 
            <View
123 130 
                android:layout_width="match_parent"

+ 89 - 73
app/src/main/res/layout/activity_user_info.xml
查看文件 

@ -59,62 +59,63 @@
59 59 
        android:background="@color/user_background"
60 60 
        android:orientation="vertical">
61 61
62 
        <RelativeLayout
63 
            android:layout_marginEnd="12dp"
64 
            android:layout_marginStart="12dp"
65 
            android:layout_marginBottom="15dp"
66 
            android:layout_marginTop="15dp"
67 
            android:id="@+id/rl_icon"
68 
            android:layout_width="fill_parent"
69 
            android:layout_height="80dp"
70 
            android:background="@drawable/bg_white_radius6">
71 
            <com.electric.chargingpile.view.RoundImageView
72 
                android:layout_alignParentStart="true"
73 
                android:id="@+id/iv_user_icon"
74 
                android:layout_width="45dp"
75 
                android:layout_height="45dp"
76 
                android:layout_marginStart="14dp"
77 
                android:layout_centerVertical="true"
78 
                android:src="@drawable/icon_user1118" />
62 79
63 
        <LinearLayout
64 
            android:layout_width="wrap_content"
65 
            android:layout_height="wrap_content"
66 
            android:background="@color/white"
67 
            android:orientation="vertical">
80 
            <TextView
81 
                android:layout_marginStart="20dp"
82 
                android:layout_toEndOf="@+id/iv_user_icon"
83 
                android:layout_width="wrap_content"
84 
                android:layout_height="match_parent"
85 
                android:gravity="center"
86 
                android:paddingEnd="15dp"
87 
                android:text="修改头像"
88 
                android:textColor="@color/color_f9f9f9"
89 
                android:textSize="15sp" />
68 90
69 
            <RelativeLayout
70 
                android:id="@+id/rl_icon"
71 
                android:layout_width="fill_parent"
72 
                android:layout_height="62dp"
73 
                android:background="@color/white">
74 91
75 
                <TextView
76 
                    android:layout_width="wrap_content"
77 
                    android:layout_height="match_parent"
78 
                    android:gravity="center"
79 
                    android:paddingLeft="15dp"
80 
                    android:text="头像"
81 
                    android:textColor="@color/title_row"
82 
                    android:textSize="15sp" />
92 
            <ImageView
93 
                android:layout_marginEnd="14dp"
94 
                android:layout_alignParentEnd="true"
95 
                android:layout_width="wrap_content"
96 
                android:layout_height="match_parent"
97 
                android:src="@drawable/icon_more2_0" />
83 98
84 
                <com.electric.chargingpile.view.RoundImageView
85 
                    android:id="@+id/iv_user_icon"
86 
                    android:layout_width="45dp"
87 
                    android:layout_height="45dp"
88 
                    android:layout_alignParentEnd="true"
89 
                    android:layout_alignParentRight="true"
90 
                    android:layout_centerVertical="true"
91 
                    android:layout_marginEnd="32dp"
92 
                    android:layout_marginRight="32dp"
93 
                    android:src="@drawable/icon_face2_0" />
94 99
95 
                <ImageView
96 
                    android:layout_width="wrap_content"
97 
                    android:layout_height="match_parent"
98 
                    android:layout_alignParentEnd="true"
99 
                    android:layout_alignParentRight="true"
100 
                    android:layout_centerVertical="true"
101 
                    android:layout_marginEnd="15dp"
102 
                    android:layout_marginRight="15dp"
103 
                    android:src="@drawable/icon_more2_0" />
100 
        </RelativeLayout>
104 101
105 102
106 
            </RelativeLayout>
103 
        <LinearLayout
104 
            android:paddingBottom="10dp"
105 
            android:paddingTop="10dp"
106 
            android:layout_width="wrap_content"
107 
            android:layout_height="wrap_content"
108 
            android:layout_marginStart="12dp"
109 
            android:layout_marginEnd="12dp"
110 
            android:background="@drawable/bg_white_radius6"
111 
            android:orientation="vertical">
112
107 113
108 
            <View
109 
                android:layout_width="match_parent"
110 
                android:layout_height="0.5dp"
111 
                android:layout_marginLeft="15dp"
112 
                android:background="@color/ui_line" />
113 114
114 115 
            <RelativeLayout
115 116 
                android:layout_width="fill_parent"
116 117 
                android:layout_height="45dp"
117 
                android:background="@color/white">
118 
               >
118 119
119 120 
                <TextView
120 121 
                    android:layout_width="wrap_content"
 
@ -122,7 +123,7 @@
122 123 
                    android:gravity="center"
123 124 
                    android:paddingLeft="15dp"
124 125 
                    android:text="昵称"
125 
                    android:textColor="@color/title_row"
126 
                    android:textColor="@color/color_f9f9f9"
126 127 
                    android:textSize="15sp" />
127 128
128 129 
                <EditText
 
@ -146,17 +147,11 @@
146 147
147 148 
            </RelativeLayout>
148 149
149 
            <View
150 
                android:layout_width="match_parent"
151 
                android:layout_height="0.5dp"
152 
                android:layout_marginLeft="15dp"
153 
                android:background="@color/ui_line"
154 
                android:visibility="visible" />
155 150
156 151 
            <RelativeLayout
157 152 
                android:layout_width="fill_parent"
158 153 
                android:layout_height="45dp"
159 
                android:background="@color/white">
154 
                >
160 155
161 156 
                <TextView
162 157 
                    android:layout_width="wrap_content"
 
@ -164,7 +159,7 @@
164 159 
                    android:gravity="center"
165 160 
                    android:paddingLeft="15dp"
166 161 
                    android:text="手机号"
167 
                    android:textColor="@color/title_row"
162 
                    android:textColor="@color/color_f9f9f9"
168 163 
                    android:textSize="15sp" />
169 164
170 165 
                <TextView
 
@ -183,19 +178,12 @@
183 178
184 179 
            </RelativeLayout>
185 180
186 
            <View
187 
                android:layout_width="match_parent"
188 
                android:layout_height="0.5dp"
189 
                android:layout_marginLeft="15dp"
190 
                android:background="@color/ui_line"
191 
                android:visibility="visible" />
192 181
193 182
194 
            <RelativeLayout
183 
            <LinearLayout
195 184 
                android:id="@+id/go_certificate"
196 185 
                android:layout_width="fill_parent"
197 186 
                android:layout_height="45dp"
198 
                android:background="@color/white"
199 187 
                android:visibility="visible">
200 188
201 189 
                <TextView
 
@ -204,10 +192,13 @@
204 192 
                    android:layout_height="match_parent"
205 193 
                    android:gravity="center"
206 194 
                    android:paddingLeft="15dp"
207 
                    android:textColor="@color/title_row"
195 
                    android:textColor="@color/color_f9f9f9"
208 196 
                    android:textSize="15sp"
209 
                    android:text="去认证车主（获得充电优惠）" />
210
197 
                    android:text="认证车主" />
198 
                <View
199 
                    android:layout_weight="1"
200 
                    android:layout_width="0dp"
201 
                    android:layout_height="match_parent"/>
211 202 
                <TextView
212 203 
                    android:id="@+id/go_desc"
213 204 
                    android:layout_width="wrap_content"
 
@ -215,8 +206,6 @@
215 206 
                    android:layout_alignParentTop="true"
216 207 
                    android:layout_alignParentEnd="true"
217 208 
                    android:layout_alignParentRight="true"
218 
                    android:layout_marginEnd="15dp"
219 
                    android:layout_marginRight="15dp"
220 209 
                    android:background="@color/white"
221 210 
                    android:gravity="center|right"
222 211 
                    android:singleLine="true"
 
@ -226,23 +215,49 @@
226 215 
                    android:textSize="15sp" />
227 216
228 217 
                <ImageView
218 
                    android:paddingEnd="14dp"
219 
                    android:paddingStart="9dp"
229 220 
                    android:id="@+id/go_cursor"
230 221 
                    android:layout_width="wrap_content"
231 222 
                    android:layout_height="match_parent"
232 223 
                    android:layout_alignParentEnd="true"
233 224 
                    android:layout_alignParentRight="true"
234 225 
                    android:layout_centerVertical="true"
235 
                    android:layout_marginRight="15dp"
236 226 
                    android:src="@drawable/icon_more2_0" />
237 227
238 
            </RelativeLayout>
228 
            </LinearLayout>
239 229
240 
            <View
230 
            <LinearLayout
241 231 
                android:layout_width="match_parent"
242 
                android:layout_height="0.5dp"
243 
                android:layout_marginLeft="15dp"
244 
                android:background="@color/ui_line"
245 
                android:visibility="visible" />
232 
                android:layout_height="45dp">
233 
                <TextView
234 
                    android:gravity="center"
235 
                    android:paddingLeft="15dp"
236 
                    android:layout_width="wrap_content"
237 
                    android:layout_height="match_parent"
238 
                    android:text="意向车型"
239 
                    android:textColor="@color/color_f9f9f9"
240 
                    android:textSize="14sp"
241 
                    />
242 
                <View
243 
                    android:layout_weight="1"
244 
                    android:layout_width="0dp"
245 
                    android:layout_height="match_parent"/>
246 
                <TextView
247 
                    android:gravity="center"
248 
                    android:layout_width="wrap_content"
249 
                    android:layout_height="match_parent"
250 
                    android:text="首次选择意向车型（得充电余额）"
251 
                    android:textColor="#ff0e0e0e"
252 
                    android:textSize="14sp"
253 
                    />
254 
                <ImageView
255 
                    android:paddingEnd="14dp"
256 
                   android:paddingStart="9dp"
257 
                    android:src="@drawable/icon_more2_0"
258 
                    android:layout_width="wrap_content"
259 
                    android:layout_height="match_parent"/>
260 
            </LinearLayout>
246 261
247 262 
            <com.zhy.autolayout.AutoRelativeLayout
248 263 
                android:layout_width="fill_parent"
 
@ -317,6 +332,7 @@
317 332
318 333
319 334 
            <View
335 
                android:visibility="gone"
320 336 
                android:layout_width="match_parent"
321 337 
                android:layout_height="0.5dp"
322 338 
                android:background="@color/ui_line" />

+ 1 - 0
app/src/main/res/values/color.xml
查看文件 

@ -190,6 +190,7 @@
190 190 
    <color name="color_1bb637">#1bb637</color>
191 191 
    <color name="color_0e0e0e">#0E0E0E</color>
192 192 
    <color name="color_c4c7d2">#C4C7D2</color>
193 
    <color name="color_f9f9f9">#ff9b9b9b</color>
193 194 
    <color name="color_ffe32727">#ffe32727</color>
194 195 
    <color name="color_f6f6f6">#F6F6F6</color>
195 196 
    <color name="sv_black">#FF000000</color>

首页搜索相关问题修复 · da3749f236 - Gogs: Go Git Service
Sākums Izpētīt Palīdzība
Reģistrēties Pierakstīties
dudu
/
cdzApp
Vērot 2
Pievienot zvaigznīti 1
Atdalīts 0
Kods Problēmas 0 Izmaiņu pieprasījumi 0 Revīzijas 372 Laidieni 18 Vikivietne
Pārlūkot izejas kodu

首页搜索相关问题修复

huyuguo 5 gadi atpakaļ
vecāks
ea9a7fa213
revīzija
da3749f236
6 mainītis faili ar 272 papildinājumiem un 216 dzēšanām
Apvienotais skats Rādīt salīdzināšanas statistiku
  1. 2 2
      app/src/main/java/com/electric/chargingpile/activity/MainMapActivity.java
  2. 52 28
      app/src/main/java/com/electric/chargingpile/activity/SearchActivity.java
  3. 31 22
      app/src/main/java/com/electric/chargingpile/activity/SearchAllActivity.java
  4. 6 0
      app/src/main/java/com/electric/chargingpile/util/DBOpenHandler.java
  5. 172 155
      app/src/main/res/layout/activity_search.xml
  6. 9 9
      app/src/main/res/layout/activity_search_all.xml

+ 2 - 2
app/src/main/java/com/electric/chargingpile/activity/MainMapActivity.java
Parādīt failu

1664
1664
1665 
        String search_address = ProfileManager.getInstance().getSearchAddress(this);
 1665 
        String search_address = ProfileManager.getInstance().getSearchAddress(this);
1666 
        if (search_address.equals("")) {
 1666 
        if (search_address.equals("")) {
1667 
            tv_search.setText("请输入要查找的地名");
1667 
            tv_search.setText("请输入地址/关键字");
1668 
            iv_clear_address.setVisibility(View.INVISIBLE);
 1668 
            iv_clear_address.setVisibility(View.INVISIBLE);
1669 
        } else {
 1669 
        } else {
1670 
            tv_search.setText(search_address);
 1670 
            tv_search.setText(search_address);
2814 
                MobclickAgent.onEvent(context, "0068");
 2814 
                MobclickAgent.onEvent(context, "0068");
2815 
                break;
 2815 
                break;
2816 
            case R.id.iv_clear_address:
 2816 
            case R.id.iv_clear_address:
2817 
                tv_search.setText("请输入要查找的地名");
2817 
                tv_search.setText("请输入地址/关键字");
2818 
                iv_clear_address.setVisibility(View.INVISIBLE);
 2818 
                iv_clear_address.setVisibility(View.INVISIBLE);
2819 
                ProfileManager.getInstance().setSearchAddress(this, "");
 2819 
                ProfileManager.getInstance().setSearchAddress(this, "");
2820 
//                if (search_marker != null){
 2820 
//                if (search_marker != null){

+ 52 - 28
app/src/main/java/com/electric/chargingpile/activity/SearchActivity.java
Parādīt failu

86 
    private HistoryInfo history;
86 
    private HistoryInfo history;
87
87
88 
    private List<RecommendZhan> pointList = new ArrayList<>();
88 
    private List<RecommendZhan> pointList = new ArrayList<>();
89 
    private List<RecommendZhan> pointAllList = new ArrayList<>();
90 
    private String pointAllData = "";
89 
    public static List<RecommendZhan> pointAllList = new ArrayList<>();
91
90
92 
    private Map<String, String> map;
91 
    private Map<String, String> map;
93
92
109 
    private Button cancleButton;
108 
    private Button cancleButton;
110 
    private TextView tvOne, tvTwo, tvThree;
109 
    private TextView tvOne, tvTwo, tvThree;
111 
    private Double bd_lon, bd_lat, bd_jing, bd_wei;
110 
    private Double bd_lon, bd_lat, bd_jing, bd_wei;
111 
    private TextView no_result;
112
112
113 
    @Override
113 
    @Override
114 
    protected void onCreate(Bundle savedInstanceState) {
114 
    protected void onCreate(Bundle savedInstanceState) {
129 
        tvSearch.setOnClickListener(this);
129 
        tvSearch.setOnClickListener(this);
130 
        ivClear = (ImageView) findViewById(R.id.iv_search_clear);
130 
        ivClear = (ImageView) findViewById(R.id.iv_search_clear);
131 
        ivClear.setOnClickListener(this);
131 
        ivClear.setOnClickListener(this);
132 
        no_result = findViewById(R.id.no_result);
132
133
133 
        etSearch = (EditText) findViewById(R.id.et_search);
134 
        etSearch = (EditText) findViewById(R.id.et_search);
134 
        etSearch.setOnClickListener(new OnClickListener() {
135 
        etSearch.setOnClickListener(new OnClickListener() {
174 
                    pointList.clear();
175 
                    pointList.clear();
175 
                    addressAllList.clear();
176 
                    addressAllList.clear();
176 
                    pointAllList.clear();
177 
                    pointAllList.clear();
177 
                    pointAllData = "";
178 
                    adapter.notifyDataSetChanged();
178 
                    adapter.notifyDataSetChanged();
179
179
180 
                } else {
180 
                } else {
205 
                        Toast.makeText(SearchActivity.this, "搜索内容不能为空", Toast.LENGTH_SHORT).show();
205 
                        Toast.makeText(SearchActivity.this, "搜索内容不能为空", Toast.LENGTH_SHORT).show();
206 
                        addressList.clear();
206 
                        addressList.clear();
207 
                        addressAllList.clear();
207 
                        addressAllList.clear();
208 
                        pointAllList.clear();
209 
                        pointList.clear();
210 
                        adapter.notifyDataSetChanged();
208 
                        historyList.setVisibility(View.VISIBLE);
211 
                        historyList.setVisibility(View.VISIBLE);
209 
                        lvContent.setVisibility(View.GONE);
212 
                        lvContent.setVisibility(View.GONE);
210 
                    } else {
213 
                    } else {
214 
                        no_result.setVisibility(View.GONE);
211 
                        keyWord = s;
215 
                        keyWord = s;
212 
                        doSearchQuery();
216 
                        doSearchQuery();
213 
                        doPointNameSearchQuery();
217 
                        doPointNameSearchQuery();
298 
                values.put("type", addressList.get(position).get("address"));
302 
                values.put("type", addressList.get(position).get("address"));
299 
                values.put("jing", addressList.get(position).get("jing"));
303 
                values.put("jing", addressList.get(position).get("jing"));
300 
                values.put("wei", addressList.get(position).get("wei"));
304 
                values.put("wei", addressList.get(position).get("wei"));
305 
                db.del(addressList.get(position).get("name"), addressList.get(position).get("address"));
301 
                db.insert(values);
306 
                db.insert(values);
302
307
303 
                Cursor c = db.query();
308 
                Cursor c = db.query();
318 
                if (v != null) {
323 
                if (v != null) {
319 
                    imm.hideSoftInputFromWindow(v.getWindowToken(), 0);
324 
                    imm.hideSoftInputFromWindow(v.getWindowToken(), 0);
320 
                }
325 
                }
326 
                db.close();
321 
                finish();
327 
                finish();
322 
            }
328 
            }
323 
        });
329 
        });
474 
                                });
480 
                                });
475 
                            }
481 
                            }
476
482
483 
                            if (addressList.size() == 0 && pointList.size() == 0) {
484 
                                no_result.setVisibility(View.VISIBLE);
485 
                            } else {
486 
                                no_result.setVisibility(View.GONE);
487 
                            }
488
477 
                        } catch (Exception e) {
489 
                        } catch (Exception e) {
478 
                            e.printStackTrace();
490 
                            e.printStackTrace();
479 
                        }
491 
                        }
482 
                        addressList.clear();
494 
                        addressList.clear();
483 
                        addressAllList.clear();
495 
                        addressAllList.clear();
484 
                        adapter.notifyDataSetChanged();
496 
                        adapter.notifyDataSetChanged();
497
498 
                        if (addressList.size() == 0 && pointList.size() == 0) {
499 
                            no_result.setVisibility(View.VISIBLE);
500 
                        } else {
501 
                            no_result.setVisibility(View.GONE);
502 
                        }
485 
                    }
503 
                    }
486 
                }
504 
                }
487 
            } else {
505 
            } else {
624 
                @Override
642 
                @Override
625 
                public void onClick(View v) { // 全部目的地
643 
                public void onClick(View v) { // 全部目的地
626 
                    Intent intent = new Intent();
644 
                    Intent intent = new Intent();
627 
                    intent.putExtra("key_word",keyWord);
645 
                    intent.putExtra("key_word", keyWord);
628 
                    intent.setClass(getApplicationContext(), SearchAllActivity.class);
646 
                    intent.setClass(getApplicationContext(), SearchAllActivity.class);
629 
                    Bundle bundle = new Bundle();
647 
                    Bundle bundle = new Bundle();
630 
                    ArrayList arrayList = new ArrayList();
648 
                    ArrayList arrayList = new ArrayList();
656 
                viewHolder.point_header_title.setVisibility(View.GONE);
674 
                viewHolder.point_header_title.setVisibility(View.GONE);
657 
            }
675 
            }
658
676
659 
            if (position == list.size() + pList.size() - 1 && pointAllList.size() > 3) {
677 
            if (position == list.size() + pList.size() - 1 && pointAllList.size() > 5) {
660 
                viewHolder.query_all_points.setVisibility(View.VISIBLE);
678 
                viewHolder.query_all_points.setVisibility(View.VISIBLE);
661 
            } else {
679 
            } else {
662 
                viewHolder.query_all_points.setVisibility(View.GONE);
680 
                viewHolder.query_all_points.setVisibility(View.GONE);
668 
                    Intent intent = new Intent();
686 
                    Intent intent = new Intent();
669 
                    intent.setClass(getApplicationContext(), SearchAllActivity.class);
687 
                    intent.setClass(getApplicationContext(), SearchAllActivity.class);
670 
                    intent.putExtra("title", "全部站点");
688 
                    intent.putExtra("title", "全部站点");
671 
                    intent.putExtra("data", pointAllData);
672 
                    startActivity(intent);
689 
                    startActivity(intent);
673 
                }
690 
                }
674 
            });
691 
            });
741 
                }
758 
                }
742 
            }
759 
            }
743
760
761 
            viewHolder.fenshi_info_textview.setText("");
762
744 
            if ("1".equals(point.getFenshi_is())) {
763 
            if ("1".equals(point.getFenshi_is())) {
745 
                viewHolder.fenshi_info_textview.setText("");
746 
                ArrayList<PileData.FenshiInfoBean> fenshiList = (ArrayList<PileData.FenshiInfoBean>) JsonUtils.parseToObjectList(point.getFenshi_info(), PileData.FenshiInfoBean.class);
764 
                ArrayList<PileData.FenshiInfoBean> fenshiList = (ArrayList<PileData.FenshiInfoBean>) JsonUtils.parseToObjectList(point.getFenshi_info(), PileData.FenshiInfoBean.class);
747 
                Calendar calendar = Calendar.getInstance();
748 
                int hours = calendar.get(Calendar.HOUR_OF_DAY);
749 
                int minutes = calendar.get(Calendar.MINUTE);
750 
                int totalMinutes = hours * 60 + minutes;
751
752 
                for (PileData.FenshiInfoBean bean : fenshiList) {
753 
                    if (bean.getStartTotalMinutes() > totalMinutes) {
754 
                        double service_free = 0;
755 
                        double charge_free = 0;
756 
                        try {
757 
                            service_free = Double.valueOf(bean.getService_free());
758 
                            charge_free = Double.valueOf(bean.getCharge_free());
759 
                        } catch (Exception e) {
760 
                            e.printStackTrace();
765 
                if (fenshiList.size() == 1) {
766 
                    viewHolder.fenshi_info_textview.setText("全天价格统一");
767 
                } else {
768 
                    Calendar calendar = Calendar.getInstance();
769 
                    int hours = calendar.get(Calendar.HOUR_OF_DAY);
770 
                    int minutes = calendar.get(Calendar.MINUTE);
771 
                    int totalMinutes = hours * 60 + minutes;
772
773 
                    for (PileData.FenshiInfoBean bean : fenshiList) {
774 
                        if (bean.getStartTotalMinutes() > totalMinutes) {
775 
                            double service_free = 0;
776 
                            double charge_free = 0;
777 
                            try {
778 
                                service_free = Double.valueOf(bean.getService_free());
779 
                                charge_free = Double.valueOf(bean.getCharge_free());
780 
                            } catch (Exception e) {
781 
                                e.printStackTrace();
782 
                            }
783 
                            viewHolder.fenshi_info_textview.setText(String.format("%s开始 %.2f元/度", bean.getStart(), service_free + charge_free));
784 
                            break;
761 
                        }
785 
                        }
762 
                        viewHolder.fenshi_info_textview.setText(String.format("%s开始 %.2f元/度", bean.getStart(), service_free + charge_free));
763 
                        break;
764 
                    }
786 
                    }
765 
                }
787 
                }
766 
            } else {
767 
                viewHolder.fenshi_info_textview.setText("");
768 
            }
788 
            }
769
789
770 
            viewHolder.iv_label_public.setText(point.getBelong_attribute());
790 
            viewHolder.iv_label_public.setText(point.getBelong_attribute());
919 
                    }
939 
                    }
920 
                    if (null != info_decode && !info_decode.equals("")) {
940 
                    if (null != info_decode && !info_decode.equals("")) {
921 
                        pointAllList.clear();
941 
                        pointAllList.clear();
922 
                        pointAllData = "";
923 
                        pointList.clear();
942 
                        pointList.clear();
924
943
925 
                        List<RecommendZhan> list = JsonUtils.parseToObjectList(info_decode, RecommendZhan.class);
944 
                        List<RecommendZhan> list = JsonUtils.parseToObjectList(info_decode, RecommendZhan.class);
926 
                        if (list != null) {
945 
                        if (list != null) {
927 
                            pointAllData = info_decode;
928 
                            for (RecommendZhan point : list) {
946 
                            for (RecommendZhan point : list) {
929 
                                String wei = point.getPoi_wei().trim();
947 
                                String wei = point.getPoi_wei().trim();
930 
                                String jing = point.getPoi_jing().trim();
948 
                                String jing = point.getPoi_jing().trim();
950
968
951 
                            for (RecommendZhan point : pointAllList) {
969 
                            for (RecommendZhan point : pointAllList) {
952 
                                pointList.add(point);
970 
                                pointList.add(point);
953 
                                if (pointList.size() >= 3) {
971 
                                if (pointList.size() >= 5) {
954 
                                    break;
972 
                                    break;
955 
                                }
973 
                                }
956 
                            }
974 
                            }
961 
                        }
979 
                        }
962 
                    }
980 
                    }
963 
                }
981 
                }
982
983 
                if (addressList.size() == 0 && pointList.size() == 0) {
984 
                    no_result.setVisibility(View.VISIBLE);
985 
                } else {
986 
                    no_result.setVisibility(View.GONE);
987 
                }
964 
            }
988 
            }
965 
        });
989 
        });
966
990

+ 31 - 22
app/src/main/java/com/electric/chargingpile/activity/SearchAllActivity.java
Parādīt failu

61 
        iv_title.setText(title);
 61 
        iv_title.setText(title);
62
62
63 
        List<Map<String, String>> addressAllList;
 63 
        List<Map<String, String>> addressAllList;
64 
        List<RecommendZhan> pointAllList;
64 
        List<RecommendZhan> pointAllList = new ArrayList<>();
65 
        if ("全部目的地".equals(title)) {
 65 
        if ("全部目的地".equals(title)) {
66 
            ArrayList arrayList = getIntent().getExtras().getParcelableArrayList("list");
 66 
            ArrayList arrayList = getIntent().getExtras().getParcelableArrayList("list");
67 
            addressAllList = (List<Map<String, String>>) arrayList.get(0);
 67 
            addressAllList = (List<Map<String, String>>) arrayList.get(0);
69 
            pointAllList = new ArrayList<>();
 69 
            pointAllList = new ArrayList<>();
70 
        } else {
 70 
        } else {
71 
            addressAllList = new ArrayList<>();
 71 
            addressAllList = new ArrayList<>();
72 
            String data = getIntent().getStringExtra("data");
73 
            pointAllList = JsonUtils.parseToObjectList(data, RecommendZhan.class);
72 
            pointAllList.addAll(SearchActivity.pointAllList);
74 
        }
 73 
        }
75
74
76
75
94 
            }
 93 
            }
95 
        });
 94 
        });
96
95
96 
        findViewById(R.id.iv_back).setOnClickListener(new View.OnClickListener() {
97 
            @Override
98 
            public void onClick(View v) {
99 
                finish();
100 
            }
101 
        });
102
97 
    }
 103 
    }
98
104
99 
    public class SearchAdapter extends BaseAdapter {
 105 
    public class SearchAdapter extends BaseAdapter {
293 
                    viewHolder.comment_cnt.setText(point.getComment_cnt() / 10000 + "w+次评论");
 299 
                    viewHolder.comment_cnt.setText(point.getComment_cnt() / 10000 + "w+次评论");
294 
                }
 300 
                }
295 
            }
 301 
            }
302 
            viewHolder.fenshi_info_textview.setText("");
296
303
297 
            if ("1".equals(point.getFenshi_is())) {
 304 
            if ("1".equals(point.getFenshi_is())) {
298 
                viewHolder.fenshi_info_textview.setText("");
305
299 
                ArrayList<PileData.FenshiInfoBean> fenshiList = (ArrayList<PileData.FenshiInfoBean>) JsonUtils.parseToObjectList(point.getFenshi_info(), PileData.FenshiInfoBean.class);
 306 
                ArrayList<PileData.FenshiInfoBean> fenshiList = (ArrayList<PileData.FenshiInfoBean>) JsonUtils.parseToObjectList(point.getFenshi_info(), PileData.FenshiInfoBean.class);
300 
                Calendar calendar = Calendar.getInstance();
301 
                int hours = calendar.get(Calendar.HOUR_OF_DAY);
302 
                int minutes = calendar.get(Calendar.MINUTE);
303 
                int totalMinutes = hours * 60 + minutes;
304
305 
                for (PileData.FenshiInfoBean bean : fenshiList) {
306 
                    if (bean.getStartTotalMinutes() > totalMinutes) {
307 
                        double service_free = 0;
308 
                        double charge_free = 0;
309 
                        try {
310 
                            service_free = Double.valueOf(bean.getService_free());
311 
                            charge_free = Double.valueOf(bean.getCharge_free());
312 
                        } catch (Exception e) {
313 
                            e.printStackTrace();
307 
                if (fenshiList.size() == 1) {
308 
                    viewHolder.fenshi_info_textview.setText("全天价格统一");
309 
                } else {
310 
                    Calendar calendar = Calendar.getInstance();
311 
                    int hours = calendar.get(Calendar.HOUR_OF_DAY);
312 
                    int minutes = calendar.get(Calendar.MINUTE);
313 
                    int totalMinutes = hours * 60 + minutes;
314
315 
                    for (PileData.FenshiInfoBean bean : fenshiList) {
316 
                        if (bean.getStartTotalMinutes() > totalMinutes) {
317 
                            double service_free = 0;
318 
                            double charge_free = 0;
319 
                            try {
320 
                                service_free = Double.valueOf(bean.getService_free());
321 
                                charge_free = Double.valueOf(bean.getCharge_free());
322 
                            } catch (Exception e) {
323 
                                e.printStackTrace();
324 
                            }
325 
                            viewHolder.fenshi_info_textview.setText(String.format("%s开始 %.2f元/度", bean.getStart(), service_free + charge_free));
326 
                            break;
314 
                        }
 327 
                        }
315 
                        viewHolder.fenshi_info_textview.setText(String.format("%s开始 %.2f元/度", bean.getStart(), service_free + charge_free));
316 
                        break;
317 
                    }
 328 
                    }
318 
                }
 329 
                }
319 
            } else {
320 
                viewHolder.fenshi_info_textview.setText("");
321 
            }
 330 
            }
322
331
323 
            viewHolder.iv_label_public.setText(point.getBelong_attribute());
 332 
            viewHolder.iv_label_public.setText(point.getBelong_attribute());

+ 6 - 0
app/src/main/java/com/electric/chargingpile/util/DBOpenHandler.java
Parādīt failu

68 
            // 获取SQLiteDatabase
68 
            // 获取SQLiteDatabase
69 
            db = getWritableDatabase();
69 
            db = getWritableDatabase();
70 
        db.delete(TABLE_NAME_HISTORYINFO, "keyword=?", new String[]{keyword});
70 
        db.delete(TABLE_NAME_HISTORYINFO, "keyword=?", new String[]{keyword});
71 
    }
71
72
73 
    public void del(String keyword, String type) {
74 
        if (db == null)
75 
            // 获取SQLiteDatabase
76 
            db = getWritableDatabase();
77 
        db.delete(TABLE_NAME_HISTORYINFO, "keyword=? and type=?", new String[]{keyword, type});
72 
    }
78 
    }
73
79
74 
    // 关闭数据库
80 
    // 关闭数据库

+ 172 - 155
app/src/main/res/layout/activity_search.xml
Parādīt failu

1 
<?xml version="1.0" encoding="utf-8"?>
1 
<?xml version="1.0" encoding="utf-8"?>
2 
<com.zhy.autolayout.AutoLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
2 
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 
    xmlns:tools="http://schemas.android.com/tools"
3 
    xmlns:tools="http://schemas.android.com/tools"
4 
    android:layout_width="match_parent"
4 
    android:layout_width="match_parent"
5 
    android:layout_height="match_parent"
6 
    android:background="@color/activity_bgcolor"
7 
    android:orientation="vertical">
5 
    android:layout_height="match_parent">
8
6
7 
    <TextView
8 
        android:id="@+id/no_result"
9 
        android:layout_width="match_parent"
10 
        android:layout_height="match_parent"
11 
        android:gravity="center"
12 
        android:text="没有匹配到搜索结果"
13 
        android:textColor="#999999"
14 
        android:visibility="gone"
15 
        tools:visibility="visible"
16 
        android:textSize="16sp" />
9 
    <com.zhy.autolayout.AutoLinearLayout
17 
    <com.zhy.autolayout.AutoLinearLayout
10 
        android:layout_width="match_parent"
18 
        android:layout_width="match_parent"
11 
        android:layout_height="130px"
12 
        android:background="@color/titlebar_color"
13 
        android:orientation="horizontal">
14
15 
        <RelativeLayout
16 
            android:layout_width="0dp"
17 
            android:layout_height="match_parent"
18 
            android:layout_marginLeft="16dp"
19 
            android:layout_marginTop="7dp"
20 
            android:layout_marginBottom="7dp"
21 
            android:layout_weight="5"
22 
            android:background="@drawable/bg">
23
24
25 
            <EditText
26 
                android:id="@+id/et_search"
27 
                android:layout_width="fill_parent"
28 
                android:layout_height="match_parent"
29 
                android:layout_alignParentTop="true"
30 
                android:layout_marginTop="1dp"
31 
                android:layout_marginRight="13dp"
32 
                android:layout_marginBottom="1dp"
33 
                android:layout_toRightOf="@+id/iv_sou"
34 
                android:background="#f1f1f1"
35 
                android:focusable="true"
36 
                android:hint="请输入要查找的地名"
37 
                android:imeOptions="actionSearch"
38 
                android:singleLine="true"
39 
                android:text=""
40 
                android:textColorHint="@color/ui_68"
41 
                android:textCursorDrawable="@drawable/search_biao"
42 
                android:textSize="14sp" />
43
44 
            <ImageView
45 
                android:id="@+id/iv_search_clear"
46 
                android:layout_width="wrap_content"
47 
                android:layout_height="wrap_content"
48 
                android:layout_alignEnd="@+id/et_search"
49 
                android:layout_alignRight="@+id/et_search"
50 
                android:layout_centerVertical="true"
51 
                android:contentDescription="@null"
52 
                android:padding="5dp"
53 
                android:src="@drawable/icon_edit_delete2_0" />
19 
        android:layout_height="match_parent"
20 
        android:background="@color/activity_bgcolor"
21 
        android:orientation="vertical">
54
22
55 
            <ImageView
56 
                android:id="@+id/iv_sou"
57 
                android:layout_width="wrap_content"
58 
                android:layout_height="wrap_content"
59 
                android:layout_centerVertical="true"
60 
                android:layout_marginLeft="42px"
61 
                android:layout_marginRight="15px"
62 
                android:src="@drawable/icon_search1118" />
63 
        </RelativeLayout>
64
65 
        <TextView
66 
            android:id="@+id/tv_search"
67 
            android:layout_width="wrap_content"
68 
            android:layout_height="match_parent"
69 
            android:layout_alignParentRight="true"
70 
            android:layout_centerVertical="true"
71 
            android:contentDescription="@null"
72 
            android:gravity="center"
73 
            android:paddingLeft="16dp"
74 
            android:paddingTop="5dp"
75 
            android:paddingRight="16dp"
76 
            android:paddingBottom="5dp"
77 
            android:text="取消"
78 
            android:textColor="@color/lvse"
79 
            android:textSize="15sp" />
80
81 
        <LinearLayout
82 
            android:id="@+id/ll_menu"
23 
        <com.zhy.autolayout.AutoLinearLayout
83 
            android:layout_width="match_parent"
24 
            android:layout_width="match_parent"
84 
            android:layout_height="50dp"
85 
            android:background="@color/white"
25 
            android:layout_height="130px"
26 
            android:background="@color/titlebar_color"
27 
            android:orientation="horizontal">
28
29 
            <RelativeLayout
30 
                android:layout_width="0dp"
31 
                android:layout_height="match_parent"
32 
                android:layout_marginLeft="16dp"
33 
                android:layout_marginTop="7dp"
34 
                android:layout_marginBottom="7dp"
35 
                android:layout_weight="5"
36 
                android:background="@drawable/bg">
86
37
87 
            android:orientation="vertical"
88 
            android:visibility="gone">
89
38
90 
            <LinearLayout
91 
                android:id="@+id/ll_address"
92 
                android:layout_width="match_parent"
93 
                android:layout_height="0dp"
94 
                android:layout_weight="1">
39 
                <EditText
40 
                    android:id="@+id/et_search"
41 
                    android:layout_width="fill_parent"
42 
                    android:layout_height="match_parent"
43 
                    android:layout_alignParentTop="true"
44 
                    android:layout_marginTop="1dp"
45 
                    android:layout_marginRight="13dp"
46 
                    android:layout_marginBottom="1dp"
47 
                    android:layout_toRightOf="@+id/iv_sou"
48 
                    android:background="#f1f1f1"
49 
                    android:focusable="true"
50 
                    android:hint="请输入地址/关键字"
51 
                    android:imeOptions="actionSearch"
52 
                    android:singleLine="true"
53 
                    android:text=""
54 
                    android:textColorHint="@color/ui_68"
55 
                    android:textCursorDrawable="@drawable/search_biao"
56 
                    android:textSize="14sp" />
95
57
96 
                <ImageView
58 
                <ImageView
97 
                    android:layout_width="0dp"
98 
                    android:layout_height="match_parent"
99 
                    android:layout_weight="1"
59 
                    android:id="@+id/iv_search_clear"
60 
                    android:layout_width="wrap_content"
61 
                    android:layout_height="wrap_content"
62 
                    android:layout_alignEnd="@+id/et_search"
63 
                    android:layout_alignRight="@+id/et_search"
64 
                    android:layout_centerVertical="true"
65 
                    android:contentDescription="@null"
100 
                    android:padding="5dp"
66 
                    android:padding="5dp"
101 
                    android:src="@drawable/icon_screening" />
67 
                    android:src="@drawable/icon_edit_delete2_0" />
102
68
103 
                <TextView
104 
                    android:id="@+id/address_search"
105 
                    android:layout_width="0dp"
106 
                    android:layout_height="match_parent"
107 
                    android:layout_weight="6"
108 
                    android:gravity="center_vertical"
109 
                    android:paddingLeft="5dp"
110 
                    android:text="找地名:"
111 
                    android:textColor="@color/text_light_grey"
112 
                    android:textSize="18sp" />
113 
            </LinearLayout>
114
115 
            <View
116 
                android:layout_width="match_parent"
117 
                android:layout_height="0.5dp"
118 
                android:background="@color/title_line"
119 
                android:visibility="gone" />
69 
                <ImageView
70 
                    android:id="@+id/iv_sou"
71 
                    android:layout_width="wrap_content"
72 
                    android:layout_height="wrap_content"
73 
                    android:layout_centerVertical="true"
74 
                    android:layout_marginLeft="42px"
75 
                    android:layout_marginRight="15px"
76 
                    android:src="@drawable/icon_search1118" />
77 
            </RelativeLayout>
78
79 
            <TextView
80 
                android:id="@+id/tv_search"
81 
                android:layout_width="wrap_content"
82 
                android:layout_height="match_parent"
83 
                android:layout_alignParentRight="true"
84 
                android:layout_centerVertical="true"
85 
                android:contentDescription="@null"
86 
                android:gravity="center"
87 
                android:paddingLeft="16dp"
88 
                android:paddingTop="5dp"
89 
                android:paddingRight="16dp"
90 
                android:paddingBottom="5dp"
91 
                android:text="取消"
92 
                android:textColor="@color/lvse"
93 
                android:textSize="15sp" />
120
94
121 
            <LinearLayout
95 
            <LinearLayout
122 
                android:id="@+id/ll_zhan"
96 
                android:id="@+id/ll_menu"
123 
                android:layout_width="match_parent"
97 
                android:layout_width="match_parent"
124 
                android:layout_height="0dp"
125 
                android:layout_weight="1">
126
127 
                <ImageView
128 
                    android:layout_width="0dp"
129 
                    android:layout_height="match_parent"
130 
                    android:layout_weight="1"
131 
                    android:padding="5dp"
132 
                    android:src="@drawable/icon_screening" />
133
134 
                <TextView
135 
                    android:id="@+id/zhan_search"
136 
                    android:layout_width="0dp"
137 
                    android:layout_height="match_parent"
138 
                    android:layout_weight="6"
139 
                    android:gravity="center_vertical"
140 
                    android:paddingLeft="5dp"
141 
                    android:text="找电桩:"
142 
                    android:textColor="@color/text_light_grey"
143 
                    android:textSize="18sp" />
98 
                android:layout_height="50dp"
99 
                android:background="@color/white"
100
101 
                android:orientation="vertical"
102 
                android:visibility="gone">
103
104 
                <LinearLayout
105 
                    android:id="@+id/ll_address"
106 
                    android:layout_width="match_parent"
107 
                    android:layout_height="0dp"
108 
                    android:layout_weight="1">
109
110 
                    <ImageView
111 
                        android:layout_width="0dp"
112 
                        android:layout_height="match_parent"
113 
                        android:layout_weight="1"
114 
                        android:padding="5dp"
115 
                        android:src="@drawable/icon_screening" />
116
117 
                    <TextView
118 
                        android:id="@+id/address_search"
119 
                        android:layout_width="0dp"
120 
                        android:layout_height="match_parent"
121 
                        android:layout_weight="6"
122 
                        android:gravity="center_vertical"
123 
                        android:paddingLeft="5dp"
124 
                        android:text="找地名:"
125 
                        android:textColor="@color/text_light_grey"
126 
                        android:textSize="18sp" />
127 
                </LinearLayout>
128
129 
                <View
130 
                    android:layout_width="match_parent"
131 
                    android:layout_height="0.5dp"
132 
                    android:background="@color/title_line"
133 
                    android:visibility="gone" />
134
135 
                <LinearLayout
136 
                    android:id="@+id/ll_zhan"
137 
                    android:layout_width="match_parent"
138 
                    android:layout_height="0dp"
139 
                    android:layout_weight="1">
140
141 
                    <ImageView
142 
                        android:layout_width="0dp"
143 
                        android:layout_height="match_parent"
144 
                        android:layout_weight="1"
145 
                        android:padding="5dp"
146 
                        android:src="@drawable/icon_screening" />
147
148 
                    <TextView
149 
                        android:id="@+id/zhan_search"
150 
                        android:layout_width="0dp"
151 
                        android:layout_height="match_parent"
152 
                        android:layout_weight="6"
153 
                        android:gravity="center_vertical"
154 
                        android:paddingLeft="5dp"
155 
                        android:text="找电桩:"
156 
                        android:textColor="@color/text_light_grey"
157 
                        android:textSize="18sp" />
158 
                </LinearLayout>
144 
            </LinearLayout>
159 
            </LinearLayout>
145 
        </LinearLayout>
146
160
161 
        </com.zhy.autolayout.AutoLinearLayout>
162
163 
        <View
164 
            android:layout_width="match_parent"
165 
            android:layout_height="0.5dp"
166 
            android:background="@color/ui_titleline"
167 
            android:visibility="visible" />
168
169 
        <ListView
170 
            android:id="@+id/lv_search_list"
171 
            android:layout_width="fill_parent"
172 
            android:layout_height="0dp"
173 
            android:layout_weight="9.8"
174 
            android:background="@color/white"
175 
            android:cacheColorHint="@color/transparent"
176 
            android:fadingEdge="none"
177 
            android:listSelector="@color/transparent" />
178
179 
        <ListView
180 
            android:id="@+id/lv_history_list"
181 
            android:layout_width="fill_parent"
182 
            android:layout_height="0dp"
183 
            android:layout_weight="9.8"
184 
            android:background="@color/white"
185 
            android:cacheColorHint="@color/transparent"
186 
            android:divider="@drawable/list_item_divider"
187 
            android:dividerHeight="0.5dp"
188 
            android:fadingEdge="none"
189 
            android:listSelector="@color/transparent" />
147 
    </com.zhy.autolayout.AutoLinearLayout>
190 
    </com.zhy.autolayout.AutoLinearLayout>
148
191
149 
    <View
150 
        android:layout_width="match_parent"
151 
        android:layout_height="0.5dp"
152 
        android:background="@color/ui_titleline"
153 
        android:visibility="visible" />
154
155 
    <ListView
156 
        android:id="@+id/lv_search_list"
157 
        android:layout_width="fill_parent"
158 
        android:layout_height="0dp"
159 
        android:layout_weight="9.8"
160 
        android:background="@color/white"
161 
        android:cacheColorHint="@color/transparent"
162 
        android:fadingEdge="none"
163 
        android:listSelector="@color/transparent" />
164
165 
    <ListView
166 
        android:id="@+id/lv_history_list"
167 
        android:layout_width="fill_parent"
168 
        android:layout_height="0dp"
169 
        android:layout_weight="9.8"
170 
        android:background="@color/white"
171 
        android:cacheColorHint="@color/transparent"
172 
        android:divider="@drawable/list_item_divider"
173 
        android:dividerHeight="0.5dp"
174 
        android:fadingEdge="none"
175 
        android:listSelector="@color/transparent" />
176 
</com.zhy.autolayout.AutoLinearLayout>
192
193 
</androidx.constraintlayout.widget.ConstraintLayout>

+ 9 - 9
app/src/main/res/layout/activity_search_all.xml
Parādīt failu

14 
        app:layout_constraintRight_toRightOf="parent"
 14 
        app:layout_constraintRight_toRightOf="parent"
15 
        app:layout_constraintTop_toTopOf="parent">
 15 
        app:layout_constraintTop_toTopOf="parent">
16
16
17 
        <TextView
18 
            android:id="@+id/iv_title"
19 
            android:layout_width="match_parent"
20 
            android:layout_height="match_parent"
21 
            android:gravity="center"
22 
            android:textColor="#222222"
23 
            android:textSize="18sp"
24 
            tools:text="全部目的地" />
25
17 
        <ImageView
 26 
        <ImageView
18 
            android:id="@+id/iv_back"
 27 
            android:id="@+id/iv_back"
19 
            android:layout_width="wrap_content"
 28 
            android:layout_width="wrap_content"
26 
            app:layout_constraintLeft_toLeftOf="parent"
 35 
            app:layout_constraintLeft_toLeftOf="parent"
27 
            app:layout_constraintTop_toTopOf="parent" />
 36 
            app:layout_constraintTop_toTopOf="parent" />
28
37
29 
        <TextView
30 
            android:id="@+id/iv_title"
31 
            android:layout_width="match_parent"
32 
            android:layout_height="match_parent"
33 
            android:gravity="center"
34 
            android:textColor="#222222"
35 
            android:textSize="18sp"
36 
            tools:text="全部目的地" />
37
38 
        <View
 38 
        <View
39 
            android:layout_width="match_parent"
 39 
            android:layout_width="match_parent"
40 
            android:layout_height="0.5dp"
 40 
            android:layout_height="0.5dp"