hjx-app / PresonalCenter

Download as
Browse Code »

Commit 66c44ff2208bff830c1105f20b3ce11083c06033

Authored by xiongwei
1 parent 5f17f7d7de
Exists in master

头像问题

Showing 35 changed files with 417 additions and 180 deletions   Show diff stats
PersonalCenter/app/build.gradle
Diff comments   View file @66c44ff
... ... @@ -7,8 +7,8 @@ android {
7 7 applicationId "com.hjx.personalcenter"
8 8 minSdkVersion 15
9 9 targetSdkVersion 25
10   - versionCode 1
11   - versionName "1.0.1"
  10 + versionCode 3
  11 + versionName "1.0.3"
12 12 testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
13 13 }
14 14 buildTypes {
... ... @@ -44,11 +44,11 @@ dependencies {
44 44 compile files('libs/android-async-http-1.4.8.jar')
45 45 compile 'com.google.code.gson:gson:2.7'
46 46 compile 'com.zaaach:toprightmenu:1.0'
47   - compile 'com.facebook.fresco:fresco:1.1.0'
48 47 compile 'com.android.support:recyclerview-v7:25.+'
49 48 debugCompile 'com.squareup.leakcanary:leakcanary-android:1.3'
50 49 releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.3'
51 50 compile 'com.google.zxing:core:3.3.0'
52 51 compile 'com.google.zxing:android-core:3.3.0'
53 52 compile project(path: ':mypresonallibrary')
  53 + compile files('libs/picasso-2.5.2.jar')
54 54 }
... ...
PersonalCenter/app/libs/picasso-2.5.2.jar
Diff comments   View file @66c44ff
No preview for this file type
PersonalCenter/app/src/main/AndroidManifest.xml
Diff comments   View file @66c44ff
... ... @@ -12,7 +12,7 @@
12 12 android:theme="@style/AppTheme">
13 13 <activity
14 14 android:name=".activity.MainActivity"
15   - android:launchMode="singleTask"
  15 + android:launchMode="standard"
16 16 android:screenOrientation="sensorLandscape">
17 17 </activity>
18 18 <activity
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/View/Imageviews.java
Diff comments   View file @66c44ff
... ... @@ -0,0 +1,91 @@
  1 +package com.hjx.personalcenter.View;
  2 +
  3 +import android.annotation.SuppressLint;
  4 +import android.content.Context;
  5 +import android.graphics.Bitmap;
  6 +import android.graphics.Bitmap.Config;
  7 +import android.graphics.Canvas;
  8 +import android.graphics.Paint;
  9 +import android.graphics.PorterDuff.Mode;
  10 +import android.graphics.PorterDuffXfermode;
  11 +import android.graphics.Rect;
  12 +import android.graphics.drawable.BitmapDrawable;
  13 +import android.graphics.drawable.Drawable;
  14 +import android.util.AttributeSet;
  15 +import android.widget.ImageView;
  16 +
  17 +/**
  18 + * 自定义的圆形ImageView，可以直接当组件在布局中使用。
  19 + *
  20 + * @author caizhiming
  21 + */
  22 +@SuppressLint("AppCompatCustomView")
  23 +public class Imageviews extends ImageView {
  24 +
  25 + private Paint paint;
  26 +
  27 + public Imageviews(Context context) {
  28 + this(context, null);
  29 + }
  30 +
  31 + public Imageviews(Context context, AttributeSet attrs) {
  32 + this(context, attrs, 0);
  33 + }
  34 +
  35 + public Imageviews(Context context, AttributeSet attrs, int defStyle) {
  36 + super(context, attrs, defStyle);
  37 + paint = new Paint();
  38 +
  39 + }
  40 +
  41 + /**
  42 + * 绘制圆形图片
  43 + *
  44 + * @author caizhiming
  45 + */
  46 + @Override
  47 + protected void onDraw(Canvas canvas) {
  48 +
  49 + Drawable drawable = getDrawable();
  50 + if (null != drawable) {
  51 + Bitmap bitmap = ((BitmapDrawable) drawable).getBitmap();
  52 + Bitmap b = getCircleBitmap(bitmap, 14);
  53 + final Rect rectSrc = new Rect(0, 0, b.getWidth(), b.getHeight());
  54 + final Rect rectDest = new Rect(0, 0, getWidth(), getHeight());
  55 + paint.reset();
  56 + canvas.drawBitmap(b, rectSrc, rectDest, paint);
  57 +
  58 + } else {
  59 + super.onDraw(canvas);
  60 + }
  61 + }
  62 +
  63 + /**
  64 + * 获取圆形图片方法
  65 + *
  66 + * @param bitmap
  67 + * @param pixels
  68 + * @return Bitmap
  69 + * @author caizhiming
  70 + */
  71 + private Bitmap getCircleBitmap(Bitmap bitmap, int pixels) {
  72 + Bitmap output = Bitmap.createBitmap(bitmap.getWidth(),
  73 + bitmap.getHeight(), Config.ARGB_8888);
  74 + Canvas canvas = new Canvas(output);
  75 +
  76 + final int color = 0xff424242;
  77 +
  78 + final Rect rect = new Rect(0, 0, bitmap.getWidth(), bitmap.getHeight());
  79 + paint.setAntiAlias(true);
  80 + canvas.drawARGB(0, 0, 0, 0);
  81 + paint.setColor(color);
  82 + int x = bitmap.getWidth();
  83 +
  84 + canvas.drawCircle(x / 2, x / 2, x / 2, paint);
  85 + paint.setXfermode(new PorterDuffXfermode(Mode.SRC_IN));
  86 + canvas.drawBitmap(bitmap, rect, rect, paint);
  87 + return output;
  88 +
  89 +
  90 + }
  91 +}
0 92 \ No newline at end of file
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/View/RoundImageView60dip.java
Diff comments   View file @66c44ff
... ... @@ -0,0 +1,87 @@
  1 +package com.hjx.personalcenter.View;
  2 +
  3 +
  4 +import android.content.Context;
  5 +import android.graphics.Canvas;
  6 +import android.graphics.Color;
  7 +import android.graphics.Paint;
  8 +import android.graphics.PorterDuff;
  9 +import android.graphics.PorterDuffXfermode;
  10 +import android.graphics.RectF;
  11 +import android.support.v7.widget.AppCompatImageView;
  12 +import android.util.AttributeSet;
  13 +
  14 +import com.hjx.personalcenter.activity.MyApplication;
  15 +
  16 +
  17 +/**
  18 + *
  19 + * @author skg
  20 + */
  21 +public class RoundImageView60dip extends AppCompatImageView {
  22 +
  23 + public RoundImageView60dip(Context context, AttributeSet attrs) {
  24 + super(context, attrs);
  25 + init();
  26 + }
  27 +
  28 + public RoundImageView60dip(Context context, AttributeSet attrs, int defStyle) {
  29 + super(context, attrs, defStyle);
  30 + init();
  31 + }
  32 +
  33 + public RoundImageView60dip(Context context) {
  34 + super(context);
  35 + init();
  36 + }
  37 +
  38 + private final RectF roundRect = new RectF();
  39 + private float rect_adius = dip2px(60);
  40 + private final Paint maskPaint = new Paint();
  41 + private final Paint zonePaint = new Paint();
  42 +
  43 + private void init() {
  44 + maskPaint.setAntiAlias(true);
  45 + maskPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
  46 + //
  47 + zonePaint.setAntiAlias(true);
  48 + zonePaint.setColor(Color.WHITE);
  49 + //
  50 + /*float density = getResources().getDisplayMetrics().density;
  51 + rect_adius = rect_adius * density;*/
  52 + }
  53 +
  54 + public void setRectAdius(float adius) {
  55 + rect_adius = adius;
  56 + invalidate();
  57 + }
  58 +
  59 + @Override
  60 + protected void onLayout(boolean changed, int left, int top, int right,
  61 + int bottom) {
  62 + super.onLayout(changed, left, top, right, bottom);
  63 + int w = getWidth();
  64 + int h = getHeight();
  65 + roundRect.set(0, 0, w, h);
  66 + }
  67 +
  68 + @Override
  69 + public void draw(Canvas canvas) {
  70 + canvas.saveLayer(roundRect, zonePaint, Canvas.ALL_SAVE_FLAG);
  71 + canvas.drawRoundRect(roundRect, rect_adius, rect_adius, zonePaint);
  72 + //
  73 + canvas.saveLayer(roundRect, maskPaint, Canvas.ALL_SAVE_FLAG);
  74 + super.draw(canvas);
  75 + canvas.restore();
  76 + }
  77 +
  78 + /**
  79 + * �����ֻ��ķֱ��ʴ� dp �ĵ�λ ת��Ϊ px(����)
  80 + */
  81 + public static int dip2px(float dpValue) {
  82 + final float scale = MyApplication.getInstance().getResources()
  83 + .getDisplayMetrics().density;
  84 + return (int) (dpValue * scale + 0.5f);
  85 + }
  86 +
  87 +}
0 88 \ No newline at end of file
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/AccountManagementActivity.java
Diff comments   View file @66c44ff
... ... @@ -13,7 +13,6 @@ import android.widget.ImageView;
13 13 import android.widget.LinearLayout;
14 14 import android.widget.TextView;
15 15  
16   -import com.facebook.drawee.view.SimpleDraweeView;
17 16 import com.hjx.personalcenter.R;
18 17 import com.hjx.personalcenter.adapter.AccountChildsAdapter;
19 18 import com.hjx.personalcenter.customdialog.RecyclerViewSpaceItem;
... ... @@ -24,6 +23,7 @@ import com.hjx.personalcenter.http.HttpManager;
24 23 import com.hjx.personalcenter.model.ChildsInfo;
25 24 import com.hjx.personalcenter.util.AlertUtils;
26 25 import com.hjx.personalcenter.util.GetDevicesUtil;
  26 +import com.squareup.picasso.Picasso;
27 27  
28 28 import java.util.ArrayList;
29 29 import java.util.List;
... ... @@ -37,7 +37,7 @@ public class AccountManagementActivity extends FragmentActivity implements View.
37 37 private TextView changbangding, changpassword, usernames,
38 38 tv_username, tv_grade, tv_school, tv_adress, tv_changzhu;
39 39 private ImageView iv_useing, cancel;
40   - private SimpleDraweeView mSimpleDraweeView;
  40 + private ImageView mSimpleDraweeView;
41 41 private RecyclerView listview;
42 42 private LinearLayout add_accunt, ll_zhu_backgrangd;
43 43 private AccountChildsAdapter childsAdapter;
... ... @@ -90,7 +90,9 @@ public class AccountManagementActivity extends FragmentActivity implements View.
90 90 tv_grade.setText(grade);
91 91 tv_school.setText(school);
92 92 tv_adress.setText(addr);
93   - mSimpleDraweeView.setImageURI(phote);
  93 + if (phote!=null&&!phote.isEmpty()) {
  94 + Picasso.with(AccountManagementActivity.this).load(phote).into(mSimpleDraweeView);
  95 + }
94 96 data.clear();
95 97 data.addAll(childList);
96 98 childsAdapter.notifyDataSetChanged();
... ... @@ -117,7 +119,7 @@ public class AccountManagementActivity extends FragmentActivity implements View.
117 119 tv_grade = (TextView) findViewById(R.id.tv_account_grade);
118 120 tv_school = (TextView) findViewById(R.id.tv_account_school);
119 121 tv_adress = (TextView) findViewById(R.id.tv_account_adress);
120   - mSimpleDraweeView = (SimpleDraweeView) findViewById(R.id.tv_account_head);
  122 + mSimpleDraweeView = (ImageView) findViewById(R.id.tv_account_head);
121 123 iv_useing = (ImageView) findViewById(R.id.iv_shiyongzhong);
122 124 cancel = (ImageView) findViewById(R.id.cancel);
123 125 ll_zhu_backgrangd = (LinearLayout) findViewById(R.id.ll_zhu_backgrangd);
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChoiseTextBookActivity.java
Diff comments   View file @66c44ff
... ... @@ -14,7 +14,6 @@ import android.widget.ImageView;
14 14 import android.widget.TextView;
15 15 import android.widget.Toast;
16 16  
17   -import com.facebook.drawee.view.SimpleDraweeView;
18 17 import com.hjx.personalcenter.R;
19 18 import com.hjx.personalcenter.adapter.GridAdapter;
20 19 import com.hjx.personalcenter.customdialog.ElectronicCardDialog;
... ... @@ -27,6 +26,7 @@ import com.hjx.personalcenter.model.DefautPublishInfo;
27 26 import com.hjx.personalcenter.model.VersionInfo;
28 27 import com.hjx.personalcenter.util.AlertUtils;
29 28 import com.hjx.personalcenter.util.GetDevicesUtil;
  29 +import com.squareup.picasso.Picasso;
30 30  
31 31 import org.json.JSONException;
32 32 import org.json.JSONObject;
... ... @@ -45,7 +45,7 @@ public class ChoiseTextBookActivity extends FragmentActivity implements View.OnC
45 45 private ImageView cancel;
46 46 private ArrayList<DefautPublishInfo.DataBean> defautPublishInfos = new ArrayList<>();
47 47 private GridAdapter sim_adapter;
48   - private SimpleDraweeView simpleDraweeView;
  48 + private ImageView simpleDraweeView;
49 49 private TextView publish;
50 50 private String chinese, math, english, physics, chemistry, history, geography, political, biology, science;
51 51  
... ... @@ -235,7 +235,7 @@ public class ChoiseTextBookActivity extends FragmentActivity implements View.OnC
235 235 public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
236 236 SaveParam.getInstance().saveLoginParam(this, SaveParam.SUBJECT, defautPublishInfos.get(position).getSubject());
237 237 VerSionDialog.getInstance(this).show(getSupportFragmentManager(), "VerSionDialog");
238   - simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.image_publish);
  238 + simpleDraweeView = (ImageView) view.findViewById(R.id.image_publish);
239 239 publish = (TextView) view.findViewById(R.id.tv_publish);
240 240  
241 241 }
... ... @@ -244,7 +244,9 @@ public class ChoiseTextBookActivity extends FragmentActivity implements View.OnC
244 244 public void versionOnItemClick(ArrayList<VersionInfo.DataBean> data, int position, int type) {
245 245 String imageurl = data.get(position).getPressCover();
246 246 String publishs = data.get(position).getPressName();
247   - simpleDraweeView.setImageURI(imageurl);
  247 + if (imageurl!=null&&!imageurl.isEmpty()) {
  248 + Picasso.with(ChoiseTextBookActivity.this).load(imageurl).into(simpleDraweeView);
  249 + }
248 250 publish.setText(publishs);
249 251 String subject = SaveParam.getInstance().getLoginParam(this, SaveParam.SUBJECT);
250 252 Log.e("test", "选择的科目" + subject);
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardInfoOKActivity.java
Diff comments   View file @66c44ff
... ... @@ -2,6 +2,7 @@ package com.hjx.personalcenter.activity;
2 2  
3 3 import android.os.Bundle;
4 4 import android.support.v4.app.FragmentActivity;
  5 +import android.view.KeyEvent;
5 6 import android.view.View;
6 7 import android.widget.Button;
7 8 import android.widget.ImageView;
... ... @@ -104,6 +105,17 @@ public class ElectronicCardInfoOKActivity extends FragmentActivity implements Vi
104 105 break;
105 106 }
106 107 }
  108 + @Override
  109 + public boolean onKeyDown(int keyCode, KeyEvent event) {
  110 + if (keyCode == KeyEvent.KEYCODE_BACK) {
  111 + SaveParam.getInstance().saveCustomizeParam(ElectronicCardInfoOKActivity.this,SaveParam.CARDPHONE,"");
  112 + return false;//return true;拦截事件传递,从而屏蔽back键。
  113 + }
  114 + if (KeyEvent.KEYCODE_HOME == keyCode) {
  115 + SaveParam.getInstance().saveCustomizeParam(ElectronicCardInfoOKActivity.this,SaveParam.CARDPHONE,"");
  116 + return false;//同理
  117 + }
  118 + return super.onKeyDown(keyCode, event);
  119 + }
107 120  
108   -
109 121 }
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/FeedBackActivity.java
Diff comments   View file @66c44ff
... ... @@ -19,12 +19,6 @@ import android.widget.ImageView;
19 19 import android.widget.TextView;
20 20 import android.widget.Toast;
21 21  
22   -import com.facebook.drawee.backends.pipeline.Fresco;
23   -import com.facebook.drawee.generic.GenericDraweeHierarchy;
24   -import com.facebook.drawee.generic.GenericDraweeHierarchyBuilder;
25   -import com.facebook.drawee.generic.RoundingParams;
26   -import com.facebook.drawee.interfaces.DraweeController;
27   -import com.facebook.drawee.view.SimpleDraweeView;
28 22 import com.hjx.personalcenter.R;
29 23 import com.hjx.personalcenter.db.SaveParam;
30 24 import com.hjx.personalcenter.http.HttpManager;
... ... @@ -53,7 +47,7 @@ public class FeedBackActivity extends FragmentActivity implements View.OnClickLi
53 47 private static final int REQUEST_CODE_TAKE_PHOTO = 1;
54 48 private static final int REQUEST_CODE_ALBUM = 2;
55 49 private static final int REQUEST_CODE_CROUP_PHOTO = 3;
56   - private SimpleDraweeView mSimpleDraweeView;
  50 + private ImageView mSimpleDraweeView;
57 51 String type = "个人中心";
58 52 private File file;
59 53 private Uri uri;
... ... @@ -61,7 +55,6 @@ public class FeedBackActivity extends FragmentActivity implements View.OnClickLi
61 55 @Override
62 56 protected void onCreate(Bundle savedInstanceState) {
63 57 super.onCreate(savedInstanceState);
64   - Fresco.initialize(this);
65 58 setContentView(R.layout.activity_feedback);
66 59 initView();
67 60 initData();
... ... @@ -70,7 +63,7 @@ public class FeedBackActivity extends FragmentActivity implements View.OnClickLi
70 63  
71 64 private void initView() {
72 65 iv_cance = (ImageView) findViewById(R.id.cancel);
73   - mSimpleDraweeView = (SimpleDraweeView) findViewById(R.id.show_iv);
  66 + mSimpleDraweeView = (ImageView) findViewById(R.id.show_iv);
74 67 iv_take = (ImageView) findViewById(R.id.iv_take);
75 68 content = (EditText) findViewById(R.id.feedback_content);
76 69 phone = (EditText) findViewById(R.id.feedback_phone);
... ... @@ -117,7 +110,7 @@ public class FeedBackActivity extends FragmentActivity implements View.OnClickLi
117 110 String userID = SaveParam.getInstance().getLoginParam(this, "userId");
118 111 try {
119 112 HttpManager.getInstance().feedback(FeedBackActivity.this, userID,
120   - contents,contants,file.getPath(),type);
  113 + contents, contants, file.getPath(), type);
121 114 } catch (Exception e) {
122 115 e.printStackTrace();
123 116 }
... ... @@ -233,22 +226,32 @@ public class FeedBackActivity extends FragmentActivity implements View.OnClickLi
233 226 //HttpManager.getInstance().header(this, fileSrc);
234 227 //photo = MultipartBody.Part.createFormData("portrait", fileName.substring(fileName.lastIndexOf("/") + 1, fileName.length()), requestBody);
235 228 //Fresco设置圆形头像
236   - GenericDraweeHierarchyBuilder builder = new GenericDraweeHierarchyBuilder(getResources());
237   - GenericDraweeHierarchy hierarchy = builder
238   - .setDesiredAspectRatio(1f)
239   - .setFailureImage(R.mipmap.blank)
240   - //圆形头像
241   - .setRoundingParams(RoundingParams.fromCornersRadius(0.7f))
242   - .build();
  229 +// GenericDraweeHierarchyBuilder builder = new GenericDraweeHierarchyBuilder(getResources());
  230 +// GenericDraweeHierarchy hierarchy = builder
  231 +// .setDesiredAspectRatio(1f)
  232 +// .setFailureImage(R.mipmap.blank)
  233 +// //圆形头像
  234 +// .setRoundingParams(RoundingParams.fromCornersRadius(0.7f))
  235 +// .build();
  236 +// //OOM
  237 +// ImageRequest request = ImageRequestBuilder.newBuilderWithSource(uri)
  238 +// //根据View的尺寸放缩图片
  239 +// .setResizeOptions(new ResizeOptions(mSimpleDraweeView.getWidth(), mSimpleDraweeView.getHeight()))
  240 +// .build();
  241 +
243 242  
244 243 //加载本地图片
245   - Uri uri = Uri.fromFile(cover);
246   - DraweeController controller = Fresco.newDraweeControllerBuilder()
247   - .setOldController(mSimpleDraweeView.getController())
248   - .setUri(uri)
249   - .build();
250   - mSimpleDraweeView.setHierarchy(hierarchy);
251   - mSimpleDraweeView.setController(controller);
  244 + mSimpleDraweeView.setImageURI(Uri.fromFile(new File(fileSrc)));
  245 +
  246 + //Picasso.with(FeedBackActivity.this).load(fileSrc).into(mSimpleDraweeView);
  247 +// Uri uri = Uri.fromFile(cover);
  248 +// DraweeController controller = Fresco.newDraweeControllerBuilder()
  249 +// .setOldController(mSimpleDraweeView.getController())
  250 +// .setImageRequest(request)
  251 +// .setUri(uri)
  252 +// .build();
  253 +// mSimpleDraweeView.setHierarchy(hierarchy);
  254 +// mSimpleDraweeView.setController(controller);
252 255  
253 256 }
254 257  
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/MainActivity.java
Diff comments   View file @66c44ff
... ... @@ -23,12 +23,6 @@ import android.widget.LinearLayout;
23 23 import android.widget.TextView;
24 24 import android.widget.Toast;
25 25  
26   -import com.facebook.drawee.backends.pipeline.Fresco;
27   -import com.facebook.drawee.generic.GenericDraweeHierarchy;
28   -import com.facebook.drawee.generic.GenericDraweeHierarchyBuilder;
29   -import com.facebook.drawee.generic.RoundingParams;
30   -import com.facebook.drawee.interfaces.DraweeController;
31   -import com.facebook.drawee.view.SimpleDraweeView;
32 26 import com.google.gson.Gson;
33 27 import com.hjx.personalcenter.R;
34 28 import com.hjx.personalcenter.adapter.MianGridAdapter;
... ... @@ -57,6 +51,7 @@ import com.mylhyl.circledialog.CircleDialog;
57 51 import com.mylhyl.circledialog.callback.ConfigInput;
58 52 import com.mylhyl.circledialog.params.InputParams;
59 53 import com.mylhyl.circledialog.view.listener.OnInputClickListener;
  54 +import com.squareup.picasso.Picasso;
60 55 import com.zaaach.toprightmenu.MenuItem;
61 56 import com.zaaach.toprightmenu.TopRightMenu;
62 57  
... ... @@ -91,9 +86,10 @@ public class MainActivity extends FragmentActivity implements View.OnClickListen
91 86 private static final int REQUEST_CODE_TAKE_PHOTO = 1;
92 87 private static final int REQUEST_CODE_ALBUM = 2;
93 88 private static final int REQUEST_CODE_CROUP_PHOTO = 3;
94   - SimpleDraweeView mSimpleDraweeView;
  89 + private ImageView mSimpleDraweeView;
95 90 private File file;
96 91 private Uri uri;
  92 + String portrait;
97 93 Handler handler = new Handler() {
98 94 @Override
99 95 public void handleMessage(Message msg) {
... ... @@ -116,7 +112,11 @@ public class MainActivity extends FragmentActivity implements View.OnClickListen
116 112 tv_sex.setText("女");
117 113 iv_sex.setImageResource(R.mipmap.women);
118 114 }
119   - mSimpleDraweeView.setImageURI(cardinfoBean.getPortrait());
  115 + portrait = cardinfoBean.getPortrait();
  116 + //mSimpleDraweeView.setImageURI(cardinfoBean.getPortrait());
  117 + if (portrait!=null&&!portrait.isEmpty()) {
  118 + Picasso.with(MainActivity.this).load(portrait).into(mSimpleDraweeView);
  119 + }
120 120 //加载星座
121 121 BrithdayStar brithdayStar = new BrithdayStar();
122 122 if (cardinfoBean.getBirthday() == null || "".equals(cardinfoBean.getBirthday())) {
... ... @@ -212,13 +212,13 @@ public class MainActivity extends FragmentActivity implements View.OnClickListen
212 212 jsonObject = new JSONObject((String) msg.obj);
213 213 status = jsonObject.getString("status");
214 214 if (status.equals("1")) {
215   - sssssssss.setVisibility(View.VISIBLE);
216   - tv_yangji.setVisibility(View.INVISIBLE);
  215 + //sssssssss.setVisibility(View.VISIBLE);
  216 + tv_yangji.setVisibility(View.GONE);
217 217 iv_look_card.setVisibility(View.VISIBLE);
218 218 //客机没有保卡
219 219 } else if (status.equals("2001")) {
220   - sssssssss.setVisibility(View.VISIBLE);
221   - tv_yangji.setVisibility(View.INVISIBLE);
  220 + //sssssssss.setVisibility(View.VISIBLE);
  221 + tv_yangji.setVisibility(View.GONE);
222 222 iv_look_card.setVisibility(View.VISIBLE);
223 223 AlertUtils.showToast(MainActivity.this, "您的机器还没有保卡信息或该机器已置为样机，请重新登录");
224 224 Intent settingintent = new Intent();
... ... @@ -226,7 +226,7 @@ public class MainActivity extends FragmentActivity implements View.OnClickListen
226 226 startActivity(settingintent);
227 227 overridePendingTransition(R.anim.rightin, R.anim.rightout);
228 228 } else if (status.equals("2002")) {//样机
229   - sssssssss.setVisibility(View.INVISIBLE);
  229 + //sssssssss.setVisibility(View.INVISIBLE);
230 230 iv_look_card.setVisibility(View.INVISIBLE);
231 231 tv_yangji.setVisibility(View.VISIBLE);
232 232  
... ... @@ -236,6 +236,15 @@ public class MainActivity extends FragmentActivity implements View.OnClickListen
236 236 } catch (JSONException e) {
237 237 e.printStackTrace();
238 238 }
  239 + case HttpCode.TOUXIANG:
  240 + if (msg.obj.equals("1")){
  241 + String s = SaveParam.getInstance().getLoginParam(MainActivity.this,SaveParam.PORTAIT);
  242 + if (portrait!=null&&!portrait.isEmpty()){
  243 + Picasso.with(MainActivity.this).load(s).into(mSimpleDraweeView);
  244 + }
  245 +
  246 + }
  247 + break;
239 248  
240 249  
241 250 }
... ... @@ -245,7 +254,6 @@ public class MainActivity extends FragmentActivity implements View.OnClickListen
245 254 @Override
246 255 protected void onCreate(Bundle savedInstanceState) {
247 256 super.onCreate(savedInstanceState);
248   - Fresco.initialize(this);
249 257 setContentView(R.layout.activity_main);
250 258 SysApplication.getInstance().addActivity(this);
251 259 initView();
... ... @@ -270,7 +278,7 @@ public class MainActivity extends FragmentActivity implements View.OnClickListen
270 278 iv_sign = (ImageView) findViewById(R.id.iv_sign);
271 279 tv_sign = (TextView) findViewById(R.id.tv_sign);
272 280 //头像
273   - mSimpleDraweeView = (SimpleDraweeView) findViewById(R.id.iv_head);
  281 + mSimpleDraweeView = (ImageView) findViewById(R.id.iv_head);
274 282 //初始化个人信息
275 283 iv_sex = (ImageView) findViewById(R.id.iv_sex);
276 284 tv_username = (TextView) findViewById(R.id.tv_username);
... ... @@ -293,7 +301,7 @@ public class MainActivity extends FragmentActivity implements View.OnClickListen
293 301 mRecyclerViewpublish = (GridView) findViewById(R.id.id_recyclerview_pubish);
294 302 view_novedeo = (LinearLayout) findViewById(R.id.view_novedeo);
295 303  
296   - sssssssss = findViewById(R.id.sssssssss);
  304 + //sssssssss = findViewById(R.id.sssssssss);
297 305  
298 306 }
299 307  
... ... @@ -330,9 +338,9 @@ public class MainActivity extends FragmentActivity implements View.OnClickListen
330 338 //判断保卡信息是否为样机
331 339 String yangji = SaveParam.getInstance().getLoginParam(this, SaveParam.YANGJI);
332 340 String deviceNumber = GetDevicesUtil.getDevicesInfo(MainActivity.this).getDeviceNumber();
333   - Log.d("test","yangji"+yangji);
  341 + Log.d("test", "yangji" + yangji);
334 342 if ("1".equals(yangji)) {
335   - sssssssss.setVisibility(View.INVISIBLE);
  343 + //sssssssss.setVisibility(View.INVISIBLE);
336 344 iv_look_card.setVisibility(View.INVISIBLE);
337 345 tv_yangji.setVisibility(View.VISIBLE);
338 346 } else {
... ... @@ -350,6 +358,7 @@ public class MainActivity extends FragmentActivity implements View.OnClickListen
350 358 tv_edit_presoninfo.setOnClickListener(this);
351 359 iv_setting.setOnClickListener(this);
352 360 iv_sign.setOnClickListener(this);
  361 + tv_sign.setOnClickListener(this);
353 362 mSimpleDraweeView.setOnClickListener(this);
354 363 linel_mycuoti.setOnClickListener(this);
355 364 linel_mynote.setOnClickListener(this);
... ... @@ -420,7 +429,7 @@ public class MainActivity extends FragmentActivity implements View.OnClickListen
420 429 // Log.i("---", "发送完了");
421 430 // }
422 431 //清除数据
423   - SaveParam.getInstance().saveCustomizeParam(MainActivity.this,SaveParam.ACCOUNT,"1");
  432 + SaveParam.getInstance().saveCustomizeParam(MainActivity.this, SaveParam.ACCOUNT, "1");
424 433 SaveParam.getInstance().clearData(MainActivity.this);
425 434 Intent settingintent = new Intent();
426 435 settingintent.setClass(MainActivity.this, LoginAndRegisterActivity.class);
... ... @@ -444,6 +453,7 @@ public class MainActivity extends FragmentActivity implements View.OnClickListen
444 453 .showAsDropDown(iv_setting, -120, 0);
445 454 break;
446 455 case R.id.iv_sign:
  456 + case R.id.tv_sign:
447 457 new CircleDialog.Builder(this)
448 458 .setCanceledOnTouchOutside(false)
449 459 .setCancelable(true)
... ... @@ -476,10 +486,10 @@ public class MainActivity extends FragmentActivity implements View.OnClickListen
476 486 Object id = null;
477 487 long auserID = Long.parseLong(userID);
478 488 int typeaccount1 = Integer.parseInt(typeaccount);
479   - if (typeaccount1 ==2){
480   - id =childsID;
481   - }else {
482   - id =auserID;
  489 + if (typeaccount1 == 2) {
  490 + id = childsID;
  491 + } else {
  492 + id = auserID;
483 493 }
484 494 HttpManager.getInstance().changsignature(MainActivity.this, id, typeaccount1, text);
485 495 RecyclerViewadapterpublish.notifyDataSetChanged();
... ... @@ -498,7 +508,7 @@ public class MainActivity extends FragmentActivity implements View.OnClickListen
498 508 AlertUtils.showToast(this, "未安装该应用 ");
499 509 break;
500 510 case R.id.linel_mynote:
501   - AlertUtils.showToast(this, "未安装该应用 ");
  511 + AlertUtils.showToast(this, "未安装该应用 ");
502 512 break;
503 513 case R.id.linel_mycollege:
504 514 AlertUtils.showToast(this, "未安装该应用 ");
... ... @@ -536,7 +546,7 @@ public class MainActivity extends FragmentActivity implements View.OnClickListen
536 546 } else {
537 547 auserID = id;
538 548 }
539   - Log.e("test","个性签名的ID"+auserID);
  549 + Log.e("test", "个性签名的ID" + auserID);
540 550 HttpManager.getInstance().getsignatures(MainActivity.this, auserID, typeaccount1, handler);
541 551 //获取最近播放视频
542 552 HttpManager.getInstance().getstuyvidioinfo(this, auserID, handler);
... ... @@ -689,27 +699,36 @@ public class MainActivity extends FragmentActivity implements View.OnClickListen
689 699 //上传头像
690 700  
691 701 try {
692   - HttpManager.getInstance().header(this, userID, typeaccount, fileSrc);
  702 + HttpManager.getInstance().header(this, userID, typeaccount, fileSrc,handler);
693 703 } catch (UnsupportedEncodingException e) {
694 704 e.printStackTrace();
695 705 }
696   -
697   - GenericDraweeHierarchyBuilder builder = new GenericDraweeHierarchyBuilder(getResources());
698   - GenericDraweeHierarchy hierarchy = builder
699   - .setDesiredAspectRatio(1f)
700   - .setFailureImage(R.mipmap.header_default)
701   - //圆形头像
702   - .setRoundingParams(RoundingParams.asCircle())
703   - .build();
704   -
705   - //加载本地图片
706   - Uri uri = Uri.fromFile(cover);
707   - DraweeController controller = Fresco.newDraweeControllerBuilder()
708   - .setOldController(mSimpleDraweeView.getController())
709   - .setUri(uri)
710   - .build();
711   - mSimpleDraweeView.setHierarchy(hierarchy);
712   - mSimpleDraweeView.setController(controller);
  706 + //mSimpleDraweeView.setImageURI(Uri.fromFile(new File(fileSrc)));
  707 +
  708 +// GenericDraweeHierarchyBuilder builder = new GenericDraweeHierarchyBuilder(getResources());
  709 +// GenericDraweeHierarchy hierarchy = builder
  710 +// .setDesiredAspectRatio(1f)
  711 +// .setFailureImage(R.mipmap.header_default)
  712 +// //圆形头像
  713 +// .setRoundingParams(RoundingParams.asCircle())
  714 +// .build();
  715 +// //OOM
  716 +// ImageRequest request = ImageRequestBuilder.newBuilderWithSource(uri)
  717 +// //根据View的尺寸放缩图片
  718 +// .setResizeOptions(new ResizeOptions(mSimpleDraweeView.getWidth(), mSimpleDraweeView.getHeight()))
  719 +// .build();
  720 +//
  721 +//
  722 +// //加载本地图片
  723 +// Uri uri = Uri.fromFile(cover);
  724 + //Picasso.with(MainActivity.this).load(uri).placeholder(R.mipmap.header_default).error(R.mipmap.header_default).transform(new RoundTransform(1000)).into(mSimpleDraweeView);
  725 +// DraweeController controller = Fresco.newDraweeControllerBuilder()
  726 +// .setOldController(mSimpleDraweeView.getController())
  727 +// .setImageRequest(request)
  728 +// .setUri(uri)
  729 +// .build();
  730 +// mSimpleDraweeView.setHierarchy(hierarchy);
  731 +// mSimpleDraweeView.setController(controller);
713 732  
714 733 }
715 734  
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/MyApplication.java
Diff comments   View file @66c44ff
... ... @@ -8,7 +8,6 @@ import android.view.Gravity;
8 8 import android.widget.TextView;
9 9 import android.widget.Toast;
10 10  
11   -import com.facebook.drawee.backends.pipeline.Fresco;
12 11 import com.hjx.personalcenter.R;
13 12 import com.hjx.personalcenter.crash.CrashHandler;
14 13 import com.hjx.personalcenter.util.ImageCache;
... ... @@ -29,7 +28,6 @@ public class MyApplication extends Application {
29 28 //c初始化内存检测
30 29 // LeakCanary.install(this);
31 30 //初始化Fresco
32   - Fresco.initialize(this);
33 31 mImageCache = new ImageCache();
34 32 instance = this;
35 33 CrashReport.initCrashReport(getApplicationContext(), "c2170557a0", false);
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/adapter/AccountChildsAdapter.java
Diff comments   View file @66c44ff
... ... @@ -12,7 +12,6 @@ import android.widget.ImageView;
12 12 import android.widget.LinearLayout;
13 13 import android.widget.TextView;
14 14  
15   -import com.facebook.drawee.view.SimpleDraweeView;
16 15 import com.hjx.personalcenter.R;
17 16 import com.hjx.personalcenter.activity.RegisterInfoActivity;
18 17 import com.hjx.personalcenter.db.Content;
... ... @@ -21,6 +20,7 @@ import com.hjx.personalcenter.http.HttpManager;
21 20 import com.hjx.personalcenter.model.ChildsInfo;
22 21 import com.hjx.personalcenter.util.GetDevicesUtil;
23 22 import com.mylhyl.circledialog.CircleDialog;
  23 +import com.squareup.picasso.Picasso;
24 24  
25 25 import java.util.ArrayList;
26 26 import java.util.List;
... ... @@ -105,7 +105,9 @@ public class AccountChildsAdapter extends RecyclerView.Adapter&lt;RecyclerView.View
105 105 if (holder instanceof AccountChildsHolder) {
106 106 final ChildsInfo.DataBean bean = specailList.get(position);
107 107 if (bean != null) {
108   - ((AccountChildsHolder) holder).mSimpleDraweeView.setImageURI(bean.getImage());
  108 + if (bean.getImage()!=null&&!bean.getImage().isEmpty()) {
  109 + Picasso.with(mContext).load(bean.getImage()).into( ((AccountChildsHolder) holder).mSimpleDraweeView);
  110 + }
109 111 ((AccountChildsHolder) holder).iv_child_name.setText(bean.getName());
110 112 ((AccountChildsHolder) holder).iv_child_grade.setText(bean.getGrade());
111 113 ((AccountChildsHolder) holder).iv_child_school.setText(bean.getSchool());
... ... @@ -227,13 +229,13 @@ public class AccountChildsAdapter extends RecyclerView.Adapter&lt;RecyclerView.View
227 229 private static class AccountChildsHolder extends RecyclerView.ViewHolder {
228 230 ImageView iv_using_pic;
229 231 LinearLayout ll_backgrangd;
230   - SimpleDraweeView mSimpleDraweeView;
  232 + ImageView mSimpleDraweeView;
231 233 TextView iv_child_name, iv_child_grade, iv_child_school, iv_child_adress,
232 234 delete_account, chang_account;
233 235  
234 236 public AccountChildsHolder(View itemView) {
235 237 super(itemView);
236   - mSimpleDraweeView = (SimpleDraweeView) itemView.findViewById(R.id.iv_child_head);
  238 + mSimpleDraweeView = (ImageView) itemView.findViewById(R.id.iv_child_head);
237 239 iv_child_name = (TextView) itemView.findViewById(R.id.iv_child_name);
238 240 iv_child_grade = (TextView) itemView.findViewById(R.id.iv_child_grade);
239 241 iv_child_school = (TextView) itemView.findViewById(R.id.iv_child_school);
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/adapter/GalleryAdapter.java
Diff comments   View file @66c44ff
... ... @@ -5,9 +5,9 @@ import android.support.v7.widget.RecyclerView;
5 5 import android.view.LayoutInflater;
6 6 import android.view.View;
7 7 import android.view.ViewGroup;
  8 +import android.widget.ImageView;
8 9 import android.widget.TextView;
9 10  
10   -import com.facebook.drawee.view.SimpleDraweeView;
11 11 import com.hjx.personalcenter.R;
12 12 import com.hjx.personalcenter.model.DefautPublishInfo;
13 13  
... ... @@ -33,7 +33,7 @@ public class GalleryAdapter extends
33 33 super(arg0);
34 34 }
35 35  
36   - SimpleDraweeView simpleDraweeView;
  36 + ImageView simpleDraweeView;
37 37 TextView subject;
38 38 TextView publish;
39 39  
... ... @@ -55,7 +55,7 @@ public class GalleryAdapter extends
55 55 viewGroup, false);
56 56 ViewHolder viewHolder = new ViewHolder(view);
57 57  
58   - viewHolder.simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.image_publish);
  58 + viewHolder.simpleDraweeView = (ImageView) view.findViewById(R.id.image_publish);
59 59 viewHolder.subject = (TextView) view.findViewById(R.id.subject);
60 60 viewHolder.publish = (TextView) view.findViewById(R.id.tv_publish);
61 61 return viewHolder;
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/adapter/GridAdapter.java
Diff comments   View file @66c44ff
... ... @@ -4,9 +4,9 @@ import android.content.Context;
4 4 import android.view.View;
5 5 import android.view.ViewGroup;
6 6 import android.widget.BaseAdapter;
  7 +import android.widget.ImageView;
7 8 import android.widget.TextView;
8 9  
9   -import com.facebook.drawee.view.SimpleDraweeView;
10 10 import com.hjx.personalcenter.R;
11 11 import com.hjx.personalcenter.model.DefautPublishInfo;
12 12  
... ... @@ -50,7 +50,7 @@ public class GridAdapter extends BaseAdapter {
50 50 ViewHolder viewHolder = new ViewHolder();
51 51 if (convertView == null) {
52 52 convertView = View.inflate(context, R.layout.fragment_changge_version_info_itmes3, null);
53   - viewHolder.simpleDraweeView = (SimpleDraweeView) convertView.findViewById(R.id.image_publish);
  53 + viewHolder.simpleDraweeView = (ImageView) convertView.findViewById(R.id.image_publish);
54 54 viewHolder.subject = (TextView) convertView.findViewById(R.id.subject);
55 55 viewHolder.publish = (TextView) convertView.findViewById(R.id.tv_publish);
56 56 convertView.setTag(viewHolder);
... ... @@ -68,7 +68,7 @@ public class GridAdapter extends BaseAdapter {
68 68 }
69 69  
70 70 static class ViewHolder {
71   - SimpleDraweeView simpleDraweeView;
  71 + ImageView simpleDraweeView;
72 72 TextView subject;
73 73 TextView publish;
74 74 }
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/adapter/MianGridAdapter.java
Diff comments   View file @66c44ff
... ... @@ -4,9 +4,9 @@ import android.content.Context;
4 4 import android.view.View;
5 5 import android.view.ViewGroup;
6 6 import android.widget.BaseAdapter;
  7 +import android.widget.ImageView;
7 8 import android.widget.TextView;
8 9  
9   -import com.facebook.drawee.view.SimpleDraweeView;
10 10 import com.hjx.personalcenter.R;
11 11 import com.hjx.personalcenter.model.DefautPublishInfo;
12 12  
... ... @@ -50,7 +50,7 @@ public class MianGridAdapter extends BaseAdapter {
50 50 ViewHolder viewHolder = new ViewHolder();
51 51 if (convertView == null) {
52 52 convertView = View.inflate(context, R.layout.fragment_changge_version_info_itmes4, null);
53   - viewHolder.simpleDraweeView = (SimpleDraweeView) convertView.findViewById(R.id.image_publish);
  53 + viewHolder.simpleDraweeView = (ImageView) convertView.findViewById(R.id.image_publish);
54 54 //viewHolder.subject = (TextView) convertView.findViewById(R.id.subject);
55 55 viewHolder.publish = (TextView) convertView.findViewById(R.id.tv_publish);
56 56 convertView.setTag(viewHolder);
... ... @@ -70,7 +70,7 @@ public class MianGridAdapter extends BaseAdapter {
70 70 }
71 71  
72 72 static class ViewHolder {
73   - SimpleDraweeView simpleDraweeView;
  73 + ImageView simpleDraweeView;
74 74 // TextView subject;
75 75 TextView publish;
76 76 }
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/adapter/VideoAdapter.java
Diff comments   View file @66c44ff
... ... @@ -5,11 +5,12 @@ import android.support.v7.widget.RecyclerView;
5 5 import android.view.LayoutInflater;
6 6 import android.view.View;
7 7 import android.view.ViewGroup;
  8 +import android.widget.ImageView;
8 9 import android.widget.TextView;
9 10  
10   -import com.facebook.drawee.view.SimpleDraweeView;
11 11 import com.hjx.personalcenter.R;
12 12 import com.hjx.personalcenter.model.VideoInfo;
  13 +import com.squareup.picasso.Picasso;
13 14  
14 15 import java.util.ArrayList;
15 16  
... ... @@ -18,12 +19,14 @@ public class VideoAdapter extends
18 19 {
19 20  
20 21 private LayoutInflater mInflater;
  22 + private Context mcontext;
21 23 private ArrayList<VideoInfo.DataBean> defautPublishInfo;
22 24  
23 25 public VideoAdapter(Context context, ArrayList<VideoInfo.DataBean> mDatas)
24 26 {
25 27 mInflater = LayoutInflater.from(context);
26 28 defautPublishInfo = mDatas;
  29 + mcontext =context;
27 30 }
28 31  
29 32 public static class ViewHolder extends RecyclerView.ViewHolder
... ... @@ -33,7 +36,7 @@ public class VideoAdapter extends
33 36 super(arg0);
34 37 }
35 38  
36   - SimpleDraweeView simpleDraweeView;
  39 + ImageView simpleDraweeView;
37 40 TextView subject;
38 41 TextView publish;
39 42  
... ... @@ -55,7 +58,7 @@ public class VideoAdapter extends
55 58 viewGroup, false);
56 59 ViewHolder viewHolder = new ViewHolder(view);
57 60  
58   - viewHolder.simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.image_publish);
  61 + viewHolder.simpleDraweeView = (ImageView) view.findViewById(R.id.image_publish);
59 62 viewHolder.subject = (TextView) view.findViewById(R.id.subject);
60 63 viewHolder.publish = (TextView) view.findViewById(R.id.tv_publish);
61 64 return viewHolder;
... ... @@ -67,7 +70,9 @@ public class VideoAdapter extends
67 70 @Override
68 71 public void onBindViewHolder(final ViewHolder viewHolder, final int i)
69 72 {
70   - viewHolder.simpleDraweeView.setImageURI(defautPublishInfo.get(i).getVideoCover());
  73 + if (defautPublishInfo.get(i).getVideoCover()!=null&&!defautPublishInfo.get(i).getVideoCover().isEmpty()) {
  74 + Picasso.with(mcontext).load(defautPublishInfo.get(i).getVideoCover()).into(viewHolder.simpleDraweeView);
  75 + }
71 76 viewHolder.subject.setText(defautPublishInfo.get(i).getVideoName());
72 77 //viewHolder.publish.setText(defautPublishInfo.get(i).getPress());
73 78 }
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/IllegalDialog.java
Diff comments   View file @66c44ff
... ... @@ -14,6 +14,7 @@ import android.widget.TextView;
14 14 import com.hjx.personalcenter.R;
15 15 import com.hjx.personalcenter.activity.LoginAndRegisterActivity;
16 16 import com.hjx.personalcenter.activity.SysApplication;
  17 +import com.hjx.personalcenter.db.SaveParam;
17 18 import com.mylhyl.circledialog.BaseCircleDialog;
18 19 import com.mylhyl.circledialog.res.values.CircleDimen;
19 20  
... ... @@ -51,6 +52,7 @@ public class IllegalDialog extends BaseCircleDialog {
51 52 i_know.setOnClickListener(new View.OnClickListener() {
52 53 @Override
53 54 public void onClick(View v) {
  55 + SaveParam.getInstance().saveCustomizeParam(getActivity(),SaveParam.CARDPHONE,"");
54 56 Intent intent = new Intent();
55 57 intent.setClass(getActivity(), LoginAndRegisterActivity.class);
56 58 getActivity().startActivity(intent);
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/VerSionDialog.java
Diff comments   View file @66c44ff
... ... @@ -16,7 +16,6 @@ import android.widget.ImageView;
16 16 import android.widget.ListView;
17 17 import android.widget.TextView;
18 18  
19   -import com.facebook.drawee.view.SimpleDraweeView;
20 19 import com.hjx.personalcenter.R;
21 20 import com.hjx.personalcenter.adapter.VersionAdapter;
22 21 import com.hjx.personalcenter.db.SaveParam;
... ... @@ -40,7 +39,7 @@ public class VerSionDialog extends BaseCircleDialog implements AdapterView.OnIte
40 39 private ImageView cance;
41 40 private ListView listView;
42 41 private TextView publish;
43   - private SimpleDraweeView simpleDraweeView;
  42 + private ImageView simpleDraweeView;
44 43 private ArrayList<VersionInfo.DataBean> data = new ArrayList<>();
45 44 private DialogCallBack.VersionCallBack mcallback;
46 45 public VerSionDialog(DialogCallBack.VersionCallBack callBack) {
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/VersionsInfoFragment.java
Diff comments   View file @66c44ff
... ... @@ -16,7 +16,6 @@ import android.widget.ImageView;
16 16 import android.widget.LinearLayout;
17 17 import android.widget.TextView;
18 18  
19   -import com.facebook.drawee.view.SimpleDraweeView;
20 19 import com.hjx.personalcenter.R;
21 20 import com.hjx.personalcenter.activity.ChangePresonalInfoActivity;
22 21 import com.hjx.personalcenter.adapter.GridAdapter;
... ... @@ -27,6 +26,7 @@ import com.hjx.personalcenter.http.HttpManager;
27 26 import com.hjx.personalcenter.interfaces.DialogCallBack;
28 27 import com.hjx.personalcenter.model.DefautPublishInfo;
29 28 import com.hjx.personalcenter.model.VersionInfo;
  29 +import com.squareup.picasso.Picasso;
30 30  
31 31 import java.util.ArrayList;
32 32 import java.util.List;
... ... @@ -44,7 +44,7 @@ public class VersionsInfoFragment extends Fragment implements AdapterView.OnItem
44 44 private ImageView cances;
45 45 private LinearLayout tv_presons;
46 46 private TextView publish, sub;
47   - private SimpleDraweeView simpleDraweeView;
  47 + private ImageView simpleDraweeView;
48 48 public static String TABLAYOUT_FRAGMENT = "versionfragment";
49 49  
50 50 private String chinese, math,english,physics,chemistry,history,geography,political,biology,science;
... ... @@ -159,7 +159,7 @@ public class VersionsInfoFragment extends Fragment implements AdapterView.OnItem
159 159 public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
160 160 SaveParam.getInstance().saveLoginParam(getActivity(), SaveParam.SUBJECT, defautPublishInfos.get(position).getSubject());
161 161 VerSionDialog.getInstance(this).show(getChildFragmentManager(), "VerSionDialog");
162   - simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.image_publish);
  162 + simpleDraweeView = (ImageView) view.findViewById(R.id.image_publish);
163 163 publish = (TextView) view.findViewById(R.id.tv_publish);
164 164  
165 165 }
... ... @@ -278,7 +278,9 @@ public class VersionsInfoFragment extends Fragment implements AdapterView.OnItem
278 278 String imageurl = data.get(position).getPressCover();
279 279 String publishs = data.get(position).getPressName();
280 280  
281   - simpleDraweeView.setImageURI(imageurl);
  281 + if (imageurl!=null&&!imageurl.isEmpty()) {
  282 + Picasso.with(getActivity()).load(imageurl).into(simpleDraweeView);
  283 + }
282 284 publish.setText(publishs);
283 285 String subject = SaveParam.getInstance().getLoginParam(getActivity(), SaveParam.SUBJECT);
284 286 Log.e("test", "选择的科目" + subject);
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpCode.java
Diff comments   View file @66c44ff
... ... @@ -13,7 +13,7 @@ public class HttpCode {
13 13 public static final int REGISTERED_SUCESS = 2;
14 14 public static final int REGISTERED_FAIL = 3;
15 15 //注册验证码
16   - public static final int AUTHCODE_SUCESS = 4;
  16 + public static final int AUTHCODE_SUCESS = 4;
17 17 public static final int AUTHCODE_FAIL = 5;
18 18 //忘记密码验证码
19 19 public static final int AUTHCODE_SUCESS1 = 6;
... ... @@ -51,15 +51,14 @@ public class HttpCode {
51 51 public static final int PUBLISH_SUCESS = 24;
52 52 //注册信息提交
53 53 public static final int REGISTERINFO_SUCESS = 25;
54   - //获取视频信息
  54 + //获取视频信息
55 55 public static final int GETVIDIO_SUCESS = 26;
56 56 //查询保卡信息1
57 57 public static final int SUCHCARDINFOONE = 27;
58 58 //个人信息
59 59 public static final int PESERNAOL = 28;
60   -
61   -
62   -
  60 + //touxan
  61 + public static final int TOUXIANG = 29;
63 62  
64 63  
65 64 }
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpManager.java
Diff comments   View file @66c44ff
... ... @@ -325,6 +325,7 @@ public class HttpManager {
325 325 IllegalDialog.getInstance().show(((FragmentActivity) context).getSupportFragmentManager(),"feifa");
326 326  
327 327 }else {
  328 + SaveParam.getInstance().saveCustomizeParam((FragmentActivity) context,SaveParam.CARDPHONE,"");
328 329 Toast.makeText(context, "保卡绑定失败！", Toast.LENGTH_LONG).show();
329 330 }
330 331 } catch (JSONException e) {
... ... @@ -1213,7 +1214,8 @@ public class HttpManager {
1213 1214 * @param img
1214 1215 * @throws UnsupportedEncodingException
1215 1216 */
1216   - public void header(final Context mContext, String userId, String type, String img) throws UnsupportedEncodingException {
  1217 + public void header(final Context mContext, String userId, String type, String img, final Handler handler) throws UnsupportedEncodingException {
  1218 +
1217 1219 File file = new File(img);
1218 1220 if (file.exists() && file.length() > 0) {
1219 1221 RequestParams params = new RequestParams();
... ... @@ -1239,6 +1241,10 @@ public class HttpManager {
1239 1241 if (status.equals("1")) {
1240 1242 Toast.makeText(mContext, "头像上传成功。", Toast.LENGTH_LONG).show();
1241 1243 SaveParam.getInstance().saveLoginParam(mContext,SaveParam.PORTAIT,imagUrl);
  1244 + Message msg = Message.obtain();
  1245 + msg.what = HttpCode.TOUXIANG;
  1246 + msg.obj = status;
  1247 + handler.sendMessage(msg);
1242 1248 } else {
1243 1249 AlertUtils.showToast(mContext, "你好，服务器异常，请稍后重试");
1244 1250 }
... ...
PersonalCenter/app/src/main/res/layout/activity_account_management.xml
Diff comments   View file @66c44ff
... ... @@ -87,10 +87,10 @@
87 87 android:layout_width="0dp"
88 88 android:layout_height="wrap_content"
89 89 android:layout_weight="1"
90   - android:text="更换绑定"
  90 + android:background="@drawable/blue_btn_bg_pressed"
91 91 android:gravity="center"
  92 + android:text="更换绑定"
92 93 android:textColor="@color/white"
93   - android:background="@drawable/blue_btn_bg_pressed"
94 94 android:textSize="22sp" />
95 95  
96 96 <ImageView
... ... @@ -127,10 +127,10 @@
127 127 android:layout_width="0dp"
128 128 android:layout_height="wrap_content"
129 129 android:layout_weight="1"
130   - android:text="修改密码"
  130 + android:background="@drawable/blue_btn_bg_pressed"
131 131 android:gravity="center"
  132 + android:text="修改密码"
132 133 android:textColor="@color/white"
133   - android:background="@drawable/blue_btn_bg_pressed"
134 134 android:textSize="22sp" />
135 135  
136 136 <ImageView
... ... @@ -201,14 +201,14 @@
201 201 android:background="@mipmap/bg_zhuzhanghu"
202 202 android:orientation="horizontal">
203 203  
204   - <com.facebook.drawee.view.SimpleDraweeView
  204 + <com.hjx.personalcenter.View.RoundImageView60dip
205 205 android:id="@+id/tv_account_head"
206 206 android:layout_width="60dp"
207 207 android:layout_height="60dp"
208 208 android:layout_margin="10dp"
209   - fresco:placeholderImage="@mipmap/header_default"
210   - fresco:placeholderImageScaleType="fitCenter"
211   - fresco:roundAsCircle="true" />
  209 + android:background="@mipmap/header_default"
  210 + android:scaleType="centerCrop" />
  211 +
212 212  
213 213 <LinearLayout
214 214 android:layout_width="0dp"
... ... @@ -322,7 +322,6 @@
322 322 </android.support.v7.widget.RecyclerView>
323 323  
324 324  
325   -
326 325 </RelativeLayout>
327 326  
328 327 </LinearLayout>
... ...
PersonalCenter/app/src/main/res/layout/activity_feedback.xml
Diff comments   View file @66c44ff
... ... @@ -65,14 +65,13 @@
65 65 android:layout_height="wrap_content"
66 66 android:src="@mipmap/feedback_take_phone"/>
67 67  
68   - <com.facebook.drawee.view.SimpleDraweeView
  68 +
  69 + <ImageView
69 70 android:id="@+id/show_iv"
70   - android:layout_width="54dp"
71   - android:layout_height="54dp"
72   - android:layout_gravity="center"
73   - fresco:placeholderImage="@mipmap/title_back"
74   - fresco:roundAsCircle="true"
75   - fresco:placeholderImageScaleType="fitCenter" />
  71 + android:layout_width="60dp"
  72 + android:layout_height="60dp"
  73 + android:layout_margin="10dp"
  74 + />
76 75  
77 76 </LinearLayout>
78 77 <EditText
... ...
PersonalCenter/app/src/main/res/layout/activity_main.xml
Diff comments   View file @66c44ff
... ... @@ -78,12 +78,13 @@
78 78 <LinearLayout
79 79 android:layout_width="0dp"
80 80 android:layout_height="match_parent"
81   - android:layout_weight="1.5"
82   - android:orientation="vertical">
  81 + android:layout_weight="1.2"
  82 + android:orientation="vertical"
  83 + android:background="@mipmap/head_bg">
83 84 <RelativeLayout
84 85 android:layout_width="wrap_content"
85   - android:layout_height="250sp"
86   - android:background="@mipmap/head_bg">
  86 + android:layout_marginTop="118dp"
  87 + android:layout_height="250sp">
87 88  
88 89 <LinearLayout
89 90 android:id="@+id/ssss"
... ... @@ -92,13 +93,13 @@
92 93 android:layout_marginTop="28dp"
93 94 android:gravity="center"
94 95 android:orientation="horizontal">
95   - <com.facebook.drawee.view.SimpleDraweeView
  96 + <com.hjx.personalcenter.View.RoundImageView60dip
96 97 android:id="@+id/iv_head"
97   - android:layout_width="65dp"
98   - android:layout_height="65dp"
99   - fresco:placeholderImage="@mipmap/header_default"
100   - fresco:roundAsCircle="true"
101   - fresco:placeholderImageScaleType="fitCenter" />
  98 + android:layout_width="70dp"
  99 + android:layout_height="70dp"
  100 + android:scaleType="centerCrop"
  101 + android:background="@mipmap/header_default"
  102 + />
102 103  
103 104 <TextView
104 105 android:layout_width="wrap_content"
... ... @@ -122,7 +123,7 @@
122 123 android:layout_height="wrap_content"
123 124 android:layout_marginLeft="20dp"
124 125 android:layout_below="@id/ssss"
125   - android:layout_marginTop="20dp"
  126 + android:layout_marginTop="25dp"
126 127 android:gravity="center"
127 128 android:orientation="horizontal">
128 129  
... ... @@ -131,7 +132,8 @@
131 132 android:layout_width="wrap_content"
132 133 android:layout_height="wrap_content"
133 134 android:text=""
134   - android:textSize="20sp" />
  135 + android:gravity="center"
  136 + android:textSize="22sp" />
135 137 <TextView
136 138 android:id="@+id/tv_yangji"
137 139 android:layout_marginLeft="5dp"
... ... @@ -166,16 +168,21 @@
166 168 android:layout_width="wrap_content"
167 169 android:hint="请输入个性签名"
168 170 android:maxLines="3"
  171 + android:padding="10dp"
  172 + android:gravity="center"
169 173 android:maxLength="40"
170 174 android:ellipsize="end"
171   - android:textSize="16sp" />
  175 + android:textSize="16sp"
  176 + android:drawableRight="@mipmap/gerenxinxibianji"/>
172 177  
173 178 <ImageView
174 179 android:id="@+id/iv_sign"
175 180 android:layout_width="wrap_content"
176 181 android:layout_height="wrap_content"
  182 + android:scaleType="center"
177 183 android:padding="10dp"
178   - android:src="@mipmap/qianming" />
  184 + android:visibility="gone"
  185 + android:src="@mipmap/gerenxinxibianji" />
179 186  
180 187  
181 188 </LinearLayout>
... ... @@ -183,14 +190,16 @@
183 190 <View
184 191 android:layout_width="match_parent"
185 192 android:layout_height="0.7dp"
186   - android:background="@color/cutoff_line">
  193 + android:background="@color/cutoff_line"
  194 + android:visibility="gone">
187 195  
188 196 </View>
189 197  
190 198 <LinearLayout
191 199 android:layout_width="match_parent"
192   - android:layout_height="wrap_content"
193   - android:orientation="vertical">
  200 + android:layout_height="50dp"
  201 + android:orientation="vertical"
  202 + android:visibility="invisible">
194 203  
195 204 <LinearLayout
196 205 android:layout_width="match_parent"
... ... @@ -303,27 +312,28 @@
303 312 </View>
304 313  
305 314 </LinearLayout>
306   - <TextView
307   - android:id="@+id/iv_look_card"
  315 + <LinearLayout
308 316 android:layout_width="wrap_content"
309 317 android:layout_height="wrap_content"
310 318 android:paddingTop="10dp"
311 319 android:paddingLeft="10dp"
312 320 android:paddingRight="10dp"
313 321 android:layout_gravity="center"
314   - android:layout_marginTop="120dp"
315   - android:textColor="@color/login_text_blue"
316   - android:text="好记星电子产品保修卡" />
317   - <View
318   - android:id="@+id/sssssssss"
319   - android:layout_width="135dp"
320   - android:layout_marginTop="2dp"
321   - android:layout_gravity="center"
322   - android:background="@color/login_text_blue"
323   - android:layout_height="0.7dp">
324   -
325   - </View>
  322 + android:layout_marginTop="150dp">
  323 + <TextView
  324 + android:id="@+id/iv_look_card"
  325 + android:layout_width="wrap_content"
  326 + android:layout_height="wrap_content"
  327 + android:textColor="@color/bgstudy_baoka"
  328 + android:text="好记星电子产品保修卡" />
  329 + <ImageView
  330 + android:layout_width="wrap_content"
  331 + android:layout_height="wrap_content"
  332 + android:layout_gravity="center_vertical"
  333 + android:src="@mipmap/ahah" />
  334 + </LinearLayout>
326 335  
  336 +<!--
327 337 <LinearLayout
328 338 android:layout_marginTop="10dp"
329 339 android:layout_width="match_parent"
... ... @@ -331,7 +341,7 @@
331 341 android:gravity="bottom"
332 342 android:background="@mipmap/xiaoguanggao">
333 343  
334   - </LinearLayout>
  344 + </LinearLayout>-->
335 345  
336 346  
337 347 </LinearLayout>
... ... @@ -347,7 +357,7 @@
347 357 <LinearLayout
348 358 android:layout_width="0dp"
349 359 android:layout_height="match_parent"
350   - android:layout_weight="2.5"
  360 + android:layout_weight="2.8"
351 361 android:orientation="vertical">
352 362  
353 363 <LinearLayout
... ... @@ -679,6 +689,7 @@
679 689 android:id="@+id/id_recyclerview_horizontal"
680 690 android:layout_width="wrap_content"
681 691 android:layout_height="wrap_content"
  692 + android:layout_marginLeft="20dp"
682 693 android:layout_gravity="top"
683 694 android:scrollbars="none" />
684 695 </LinearLayout>
... ...
PersonalCenter/app/src/main/res/layout/fragment_changge_version_info_itmes.xml
Diff comments   View file @66c44ff
... ... @@ -8,14 +8,13 @@
8 8 android:gravity="center">
9 9  
10 10  
11   - <com.facebook.drawee.view.SimpleDraweeView
  11 + <ImageView
12 12 android:id="@+id/image_publish"
13 13 android:layout_width="180dp"
14 14 android:layout_height="120dp"
15 15 android:layout_gravity="center"
16   - android:background="@drawable/corcle_black_bg"
17   - fresco:placeholderImage="@mipmap/header_default"
18   - fresco:placeholderImageScaleType="fitCenter" />
  16 + android:scaleType="centerCrop"
  17 + android:background="@drawable/corcle_black_bg" />
19 18  
20 19 <!-- <TextView
21 20  
... ...
PersonalCenter/app/src/main/res/layout/fragment_changge_version_info_itmes2.xml
Diff comments   View file @66c44ff
... ... @@ -8,13 +8,12 @@
8 8 android:gravity="center">
9 9  
10 10  
11   - <com.facebook.drawee.view.SimpleDraweeView
  11 + <ImageView
12 12 android:id="@+id/image_publish"
13 13 android:layout_width="80dp"
14 14 android:layout_height="100dp"
15 15 android:layout_gravity="center"
16   - fresco:placeholderImage="@mipmap/bgsubject"
17   - fresco:placeholderImageScaleType="fitCenter" />
  16 + android:scaleType="centerCrop" />
18 17  
19 18 <TextView
20 19 android:id="@+id/subject"
... ...
PersonalCenter/app/src/main/res/layout/fragment_changge_version_info_itmes3.xml
Diff comments   View file @66c44ff
... ... @@ -7,12 +7,12 @@
7 7 android:gravity="center">
8 8  
9 9  
10   - <com.facebook.drawee.view.SimpleDraweeView
  10 + <ImageView
11 11 android:id="@+id/image_publish"
12 12 android:layout_width="100dp"
13 13 android:layout_height="150dp"
14 14 android:layout_gravity="center"
15   - fresco:placeholderImageScaleType="fitCenter" />
  15 + android:scaleType="centerCrop"/>
16 16  
17 17 <TextView
18 18 android:id="@+id/subject"
... ...
PersonalCenter/app/src/main/res/layout/fragment_changge_version_info_itmes4.xml
Diff comments   View file @66c44ff
... ... @@ -7,12 +7,12 @@
7 7 android:orientation="vertical">
8 8  
9 9  
10   - <com.facebook.drawee.view.SimpleDraweeView
  10 + <ImageView
11 11 android:id="@+id/image_publish"
12 12 android:layout_width="100dp"
13 13 android:layout_height="140dp"
14 14 android:layout_gravity="center"
15   - fresco:placeholderImageScaleType="fitCenter" />
  15 + />
16 16  
17 17  
18 18 <TextView
... ...
PersonalCenter/app/src/main/res/layout/recycler_childaccunt_item_view.xml
Diff comments   View file @66c44ff
... ... @@ -16,14 +16,14 @@
16 16 android:layout_height="wrap_content"
17 17 android:background="@mipmap/zizhanghu"
18 18 android:orientation="horizontal">
19   - <com.facebook.drawee.view.SimpleDraweeView
  19 + <com.hjx.personalcenter.View.RoundImageView60dip
20 20 android:id="@+id/iv_child_head"
21 21 android:layout_width="60dp"
22 22 android:layout_height="60dp"
23 23 android:layout_margin="10dp"
24   - fresco:placeholderImage="@mipmap/header_default"
25   - fresco:roundAsCircle="true"
26   - fresco:placeholderImageScaleType="fitCenter" />
  24 + android:scaleType="centerCrop"
  25 + android:background="@mipmap/header_default"
  26 + />
27 27  
28 28  
29 29 <LinearLayout
... ...
PersonalCenter/app/src/main/res/layout/recycler_study_tem_view.xml
Diff comments   View file @66c44ff
... ... @@ -3,16 +3,14 @@
3 3 android:layout_width="120dp"
4 4 android:layout_height="120dp"
5 5 xmlns:fresco="http://schemas.android.com/apk/res-auto">
6   - <com.facebook.drawee.view.SimpleDraweeView
  6 + <ImageView
7 7 android:id="@+id/id_index_gallery_item_image"
8 8 android:layout_width="60dp"
9 9 android:layout_height="60dp"
10   - android:scaleType="centerCrop"
11 10 android:layout_alignParentTop="true"
12 11 android:layout_centerHorizontal="true"
13   - fresco:placeholderImage="@mipmap/header_default"
14   - fresco:roundAsCircle="true"
15   - fresco:placeholderImageScaleType="fitCenter" />
  12 + android:scaleType="centerCrop"
  13 + android:background="@mipmap/header_default" />
16 14 <TextView
17 15 android:id="@+id/id_index_gallery_item_text"
18 16 android:layout_width="wrap_content"
... ...
PersonalCenter/app/src/main/res/mipmap-hdpi/ahah.png
Diff comments   View file @66c44ff

1.19 KB
PersonalCenter/app/src/main/res/mipmap-hdpi/head_bg.png
Diff comments   View file @66c44ff

151 KB
PersonalCenter/app/src/main/res/mipmap-hdpi/vidio_bg.png
Diff comments   View file @66c44ff

3.23 KB
PersonalCenter/app/src/main/res/mipmap-xhdpi/head_bg.png
View file @5f17f7d

93.7 KB
PersonalCenter/app/src/main/res/values/colors.xml
Diff comments   View file @66c44ff
... ... @@ -15,5 +15,8 @@
15 15 <color name="electronic_text">#afafaf</color>
16 16 <color name="backgerangde_laout">#eeeeee</color>
17 17 <color name="bgstudy_laout">#F0F0F0</color>
  18 + <color name="bgstudy_baoka">#0088c6</color>
  19 +
  20 +
18 21  
19 22 </resources>
... ...