Commit f6c9454a5ef44f68879e5bd1b7c3ffa499195eac
1 parent
8afee2bd
Exists in
yxb_dev
and in
2 other branches
no message
Showing
5 changed files
with
6 additions
and
9 deletions
Show diff stats
app/src/main/java/com/shunzhi/parent/adapter/SchoolListAdapter.java
| @@ -93,8 +93,8 @@ public class SchoolListAdapter extends BaseRecyclerViewAdapter<SortBean> { | @@ -93,8 +93,8 @@ public class SchoolListAdapter extends BaseRecyclerViewAdapter<SortBean> { | ||
| 93 | @Override | 93 | @Override |
| 94 | public void onClick(View v) { | 94 | public void onClick(View v) { |
| 95 | if(ischeck[position]){ | 95 | if(ischeck[position]){ |
| 96 | - currentPosition=-1; | ||
| 97 | ischeck[currentPosition] = false; | 96 | ischeck[currentPosition] = false; |
| 97 | + currentPosition=-1; | ||
| 98 | currentSortBean = null; | 98 | currentSortBean = null; |
| 99 | }else { | 99 | }else { |
| 100 | ischeck[position] = true; | 100 | ischeck[position] = true; |
app/src/main/java/com/shunzhi/parent/ui/activity/PersonInfoActivity.java
| @@ -18,7 +18,6 @@ import com.shunzhi.parent.AppContext; | @@ -18,7 +18,6 @@ import com.shunzhi.parent.AppContext; | ||
| 18 | import com.shunzhi.parent.R; | 18 | import com.shunzhi.parent.R; |
| 19 | import com.shunzhi.parent.contract.mine.PersonInfoContract; | 19 | import com.shunzhi.parent.contract.mine.PersonInfoContract; |
| 20 | import com.shunzhi.parent.presenter.mine.PersonInfoPrasenter; | 20 | import com.shunzhi.parent.presenter.mine.PersonInfoPrasenter; |
| 21 | -import com.shunzhi.parent.util.GlideUtils; | ||
| 22 | 21 | ||
| 23 | /** | 22 | /** |
| 24 | * Created by Administrator on 2018/3/10 0010. | 23 | * Created by Administrator on 2018/3/10 0010. |
| @@ -57,7 +56,7 @@ public class PersonInfoActivity extends BaseMVPCompatActivity<PersonInfoContract | @@ -57,7 +56,7 @@ public class PersonInfoActivity extends BaseMVPCompatActivity<PersonInfoContract | ||
| 57 | private void initInfo() { | 56 | private void initInfo() { |
| 58 | String url = AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_IMAGE); | 57 | String url = AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_IMAGE); |
| 59 | if (!TextUtils.isEmpty(url)) { | 58 | if (!TextUtils.isEmpty(url)) { |
| 60 | - GlideUtils.showImg(this,user_image,url); | 59 | + Glide.with(this).load(url).asBitmap().centerCrop().into(user_image); |
| 61 | // Glide.with(this).load(url).asBitmap().error(R.drawable.test).centerCrop().into(user_image); | 60 | // Glide.with(this).load(url).asBitmap().error(R.drawable.test).centerCrop().into(user_image); |
| 62 | } else { | 61 | } else { |
| 63 | Glide.with(this).load(R.drawable.defphoto).centerCrop().into(user_image); | 62 | Glide.with(this).load(R.drawable.defphoto).centerCrop().into(user_image); |
app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
| @@ -27,7 +27,6 @@ import com.shunzhi.parent.ui.activity.MyChildActivity; | @@ -27,7 +27,6 @@ import com.shunzhi.parent.ui.activity.MyChildActivity; | ||
| 27 | import com.shunzhi.parent.ui.activity.PersonInfoActivity; | 27 | import com.shunzhi.parent.ui.activity.PersonInfoActivity; |
| 28 | import com.shunzhi.parent.ui.activity.mywebview.WebViewActivity; | 28 | import com.shunzhi.parent.ui.activity.mywebview.WebViewActivity; |
| 29 | import com.shunzhi.parent.ui.activity.orderdetail.OrderDetailActivity; | 29 | import com.shunzhi.parent.ui.activity.orderdetail.OrderDetailActivity; |
| 30 | -import com.shunzhi.parent.util.GlideUtils; | ||
| 31 | 30 | ||
| 32 | public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract.LoginPresenter, LoginAndRegisterContract.ILoginModel> | 31 | public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract.LoginPresenter, LoginAndRegisterContract.ILoginModel> |
| 33 | implements MineContract.IMineView, View.OnClickListener { | 32 | implements MineContract.IMineView, View.OnClickListener { |
| @@ -85,7 +84,7 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract | @@ -85,7 +84,7 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract | ||
| 85 | if (AppConfig.ISLOGIN) { | 84 | if (AppConfig.ISLOGIN) { |
| 86 | String url = AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_IMAGE); | 85 | String url = AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_IMAGE); |
| 87 | if (!TextUtils.isEmpty(url)) { | 86 | if (!TextUtils.isEmpty(url)) { |
| 88 | - GlideUtils.showImg(getContext(), user_photo, url); | 87 | + Glide.with(this).load(url).asBitmap().centerCrop().into(user_photo); |
| 89 | } else { | 88 | } else { |
| 90 | Glide.with(getActivity()).load(R.drawable.defphoto).into(user_photo); | 89 | Glide.with(getActivity()).load(R.drawable.defphoto).into(user_photo); |
| 91 | user_photo.setCornerRadius(20); | 90 | user_photo.setCornerRadius(20); |
app/src/main/res/layout/activity_personinfo.xml
| @@ -52,9 +52,8 @@ | @@ -52,9 +52,8 @@ | ||
| 52 | android:layout_width="100dp" | 52 | android:layout_width="100dp" |
| 53 | android:layout_height="100dp" | 53 | android:layout_height="100dp" |
| 54 | android:src="@color/white" | 54 | android:src="@color/white" |
| 55 | - app:riv_corner_radius="20dp" | ||
| 56 | - app:riv_oval="false" | ||
| 57 | - /> | 55 | + app:riv_corner_radius="60dp" |
| 56 | + app:riv_oval="false" /> | ||
| 58 | </FrameLayout> | 57 | </FrameLayout> |
| 59 | 58 | ||
| 60 | <LinearLayout | 59 | <LinearLayout |
app/src/main/res/layout/fragment_mine.xml
| @@ -41,7 +41,7 @@ | @@ -41,7 +41,7 @@ | ||
| 41 | android:layout_height="60dp" | 41 | android:layout_height="60dp" |
| 42 | android:layout_margin="20dp" | 42 | android:layout_margin="20dp" |
| 43 | android:src="@drawable/user_imge_defult" | 43 | android:src="@drawable/user_imge_defult" |
| 44 | - app:riv_corner_radius="10dp" /> | 44 | + app:riv_corner_radius="60dp" /> |
| 45 | 45 | ||
| 46 | <LinearLayout | 46 | <LinearLayout |
| 47 | android:layout_width="wrap_content" | 47 | android:layout_width="wrap_content" |