ソースを参照

修改默认头像,修改个人信息页以及开屏跳过的个人信息页

hy 3 年 前
コミット
ab3b7cad20
共有45 個のファイルを変更した328 個の追加294 個の削除を含む
  1. 6 6
      app/src/main/java/com/electric/chargingpile/activity/AnswerDetailsActivity.java
  2. 5 5
      app/src/main/java/com/electric/chargingpile/activity/ChatContentListActivity.java
  3. 3 3
      app/src/main/java/com/electric/chargingpile/activity/MemberCenterActivity.java
  4. 2 2
      app/src/main/java/com/electric/chargingpile/activity/MemberLevelActivity.java
  5. 5 5
      app/src/main/java/com/electric/chargingpile/activity/MyQAActivity.java
  6. 1 1
      app/src/main/java/com/electric/chargingpile/activity/PersonalPageActivity.java
  7. 3 3
      app/src/main/java/com/electric/chargingpile/activity/QuestionActivity.java
  8. 4 4
      app/src/main/java/com/electric/chargingpile/activity/SingleCommentActivity.java
  9. 2 2
      app/src/main/java/com/electric/chargingpile/activity/SkipUserInfoActivity.java
  10. 6 6
      app/src/main/java/com/electric/chargingpile/activity/UserCenterActivity.java
  11. 3 2
      app/src/main/java/com/electric/chargingpile/activity/UserInfoActivity.java
  12. 5 5
      app/src/main/java/com/electric/chargingpile/activity/UserPageActivity.java
  13. 5 5
      app/src/main/java/com/electric/chargingpile/adapter/AnswerAdapter.java
  14. 5 5
      app/src/main/java/com/electric/chargingpile/adapter/ChatRecommendAdapter.java
  15. 4 4
      app/src/main/java/com/electric/chargingpile/adapter/CommentAdapter.java
  16. 2 2
      app/src/main/java/com/electric/chargingpile/adapter/FeedbackMessageAdapter.java
  17. 5 5
      app/src/main/java/com/electric/chargingpile/adapter/LayoutAdapter.java
  18. 3 3
      app/src/main/java/com/electric/chargingpile/adapter/MonthListAdapter.java
  19. 5 5
      app/src/main/java/com/electric/chargingpile/adapter/MyCollectAnswerAdapter.java
  20. 4 4
      app/src/main/java/com/electric/chargingpile/adapter/NewPingLunAdapter.java
  21. 2 2
      app/src/main/java/com/electric/chargingpile/adapter/PingLunAdapter.java
  22. 10 10
      app/src/main/java/com/electric/chargingpile/adapter/QADataAdapter.java
  23. 10 10
      app/src/main/java/com/electric/chargingpile/adapter/QADataFramAdapter.java
  24. 5 5
      app/src/main/java/com/electric/chargingpile/adapter/QianDaoAdapter.java
  25. 2 2
      app/src/main/java/com/electric/chargingpile/adapter/SonCommentAdapter.java
  26. 5 5
      app/src/main/java/com/electric/chargingpile/adapter/TopicDetailAdapter.java
  27. 3 3
      app/src/main/java/com/electric/chargingpile/adapter/TotalListAdapter.java
  28. 5 5
      app/src/main/java/com/electric/chargingpile/adapter/UnansweredAdapter.java
  29. 5 5
      app/src/main/java/com/electric/chargingpile/adapter/UserPageAdapter.java
  30. 5 5
      app/src/main/java/com/electric/chargingpile/adapter/VideoCommentAdapter.java
  31. 5 5
      app/src/main/java/com/electric/chargingpile/adapter/WaterFallAdapter.java
  32. 3 3
      app/src/main/java/com/electric/chargingpile/adapter/ZhanCommentsAapter.java
  33. 5 5
      app/src/main/java/com/electric/chargingpile/fragment/ChatContentCommentListDialogFragment.java
  34. 10 10
      app/src/main/java/com/electric/chargingpile/fragment/ChatContentReplyListDialogFragment.java
  35. 5 5
      app/src/main/java/com/electric/chargingpile/fragment/DetailsFragment.java
  36. 2 2
      app/src/main/java/com/electric/chargingpile/fragment/MonthListFragment.java
  37. 5 5
      app/src/main/java/com/electric/chargingpile/fragment/SvVideoShowView.java
  38. 2 2
      app/src/main/java/com/electric/chargingpile/fragment/TotalListFragment.java
  39. 2 2
      app/src/main/java/com/electric/chargingpile/util/PicassoUtil.java
  40. 5 5
      app/src/main/java/com/electric/chargingpile/view/VideoPubilshDialog.java
  41. 9 0
      app/src/main/res/drawable/bg_white_radius6.xml
  42. 1 1
      app/src/main/res/layout/activity_member_level.xml
  43. 54 47
      app/src/main/res/layout/activity_skip_user_info.xml
  44. 89 73
      app/src/main/res/layout/activity_user_info.xml
  45. 1 0
      app/src/main/res/values/color.xml

+ 6 - 6
app/src/main/java/com/electric/chargingpile/activity/AnswerDetailsActivity.java

@ -281,14 +281,14 @@ public class AnswerDetailsActivity extends AppCompatActivity implements View.OnC
281 281
        tv_a_car.setText(CarTypeUtil.getCarType(a_chexing));
282 282
        if ("".equals(a_userpic)) {
283 283
            Picasso.with(AnswerDetailsActivity.this)
284
                    .load(R.drawable.icon_face2_0)
284
                    .load(R.drawable.icon_user1118)
285 285
                    .transform(new CircleTransform())
286 286
                    .into(iv_a_icon);
287 287
        } else {
288 288
            Picasso.with(AnswerDetailsActivity.this)
289 289
                    .load(a_userpic)
290
                    .error(R.drawable.icon_face2_0)
291
                    .placeholder(R.drawable.icon_face2_0)
290
                    .error(R.drawable.icon_user1118)
291
                    .placeholder(R.drawable.icon_user1118)
292 292
                    .transform(new CircleTransform())
293 293
                    .into(iv_a_icon);
294 294
        }
@ -305,14 +305,14 @@ public class AnswerDetailsActivity extends AppCompatActivity implements View.OnC
305 305
//        Log.e(TAG, "showData: q_userpic=" + q_userpic);
306 306
        if ("".equals(q_userpic)) {
307 307
            Picasso.with(AnswerDetailsActivity.this)
308
                    .load(R.drawable.icon_face2_0)
308
                    .load(R.drawable.icon_user1118)
309 309
                    .transform(new CircleTransform())
310 310
                    .into(iv_q_icon);
311 311
        } else {
312 312
            Picasso.with(AnswerDetailsActivity.this)
313 313
                    .load(q_userpic)
314
                    .error(R.drawable.icon_face2_0)
315
                    .placeholder(R.drawable.icon_face2_0)
314
                    .error(R.drawable.icon_user1118)
315
                    .placeholder(R.drawable.icon_user1118)
316 316
                    .transform(new CircleTransform())
317 317
                    .into(iv_q_icon);
318 318
        }

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

@ -705,16 +705,16 @@ public class ChatContentListActivity extends AppCompatActivity {
705 705
706 706
            if (TextUtils.isEmpty(bean.headImgUrl)) {
707 707
                Picasso.with(getContext())
708
                        .load(R.drawable.icon_face2_0)
709
                        .placeholder(R.drawable.icon_face2_0)
710
                        .error(R.drawable.icon_face2_0)
708
                        .load(R.drawable.icon_user1118)
709
                        .placeholder(R.drawable.icon_user1118)
710
                        .error(R.drawable.icon_user1118)
711 711
                        .transform(new CircleTransform())
712 712
                        .into(headImage);
713 713
            } else {
714 714
                Picasso.with(getContext())
715 715
                        .load("http://cdz.evcharge.cc/zhannew/uploadfile/" + bean.headImgUrl)
716
                        .placeholder(R.drawable.icon_face2_0)
717
                        .error(R.drawable.icon_face2_0)
716
                        .placeholder(R.drawable.icon_user1118)
717
                        .error(R.drawable.icon_user1118)
718 718
                        .transform(new CircleTransform())
719 719
                        .into(headImage);
720 720
            }

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

@ -110,9 +110,9 @@ public class MemberCenterActivity extends Activity implements View.OnClickListen
110 110
            } else {
111 111
                tv_nickname.setText(MainApplication.userNickname);
112 112
            }
113
            iv_icon.setImageResource(R.drawable.icon_face2_0);
114
            Picasso.with(this).load(MainApplication.userIcon).error(R.drawable.icon_face2_0)
115
                    .placeholder(R.drawable.icon_face2_0).into(iv_icon);
113
            iv_icon.setImageResource(R.drawable.icon_user1118);
114
            Picasso.with(this).load(MainApplication.userIcon).error(R.drawable.icon_user1118)
115
                    .placeholder(R.drawable.icon_user1118).into(iv_icon);
116 116
117 117
            Log.e(TAG, "bindViewData: MainApplication.userPhone=" + MainApplication.userPhone);
118 118

+ 2 - 2
app/src/main/java/com/electric/chargingpile/activity/MemberLevelActivity.java

@ -83,8 +83,8 @@ public class MemberLevelActivity extends Activity implements View.OnClickListene
83 83
84 84
    private void bindViewData() {
85 85
        try {
86
            Picasso.with(this).load(MainApplication.userIcon).error(R.drawable.icon_face2_0)
87
                    .placeholder(R.drawable.icon_face2_0).into(iv_icon);
86
            Picasso.with(this).load(MainApplication.userIcon).error(R.drawable.icon_user1118)
87
                    .placeholder(R.drawable.icon_user1118).into(iv_icon);
88 88
        } catch (Exception e) {
89 89
            e.printStackTrace();
90 90
        }

+ 5 - 5
app/src/main/java/com/electric/chargingpile/activity/MyQAActivity.java

@ -133,16 +133,16 @@ public class MyQAActivity extends AppCompatActivity implements View.OnClickListe
133 133
        String unread = JsonUtils.getKeyResult(s, "unread");
134 134
        if ("".equals(userpic)) {
135 135
            Picasso.with(MyQAActivity.this)
136
                    .load(R.drawable.icon_face2_0)
137
                    .error(R.drawable.icon_face2_0)
138
                    .placeholder(R.drawable.icon_face2_0)
136
                    .load(R.drawable.icon_user1118)
137
                    .error(R.drawable.icon_user1118)
138
                    .placeholder(R.drawable.icon_user1118)
139 139
                    .transform(new CircleTransform())
140 140
                    .into(iv_icon);
141 141
        } else {
142 142
            Picasso.with(MyQAActivity.this)
143 143
                    .load(userpic)
144
                    .error(R.drawable.icon_face2_0)
145
                    .placeholder(R.drawable.icon_face2_0)
144
                    .error(R.drawable.icon_user1118)
145
                    .placeholder(R.drawable.icon_user1118)
146 146
                    .transform(new CircleTransform())
147 147
                    .into(iv_icon);
148 148
        }

+ 1 - 1
app/src/main/java/com/electric/chargingpile/activity/PersonalPageActivity.java

@ -177,7 +177,7 @@ public class PersonalPageActivity extends Activity implements View.OnClickListen
177 177
//                        }
178 178
//                    });
179 179
//        } else {
180
//            iconPic.setImageResource(R.drawable.icon_face2_0);
180
//            iconPic.setImageResource(R.drawable.icon_user1118);
181 181
//        }
182 182
    }
183 183

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

@ -364,14 +364,14 @@ public class QuestionActivity extends AppCompatActivity implements View.OnClickL
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>