diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java index 98c2af0..7e9ada1 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java +++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java @@ -193,7 +193,7 @@ public class CePingFragment extends BaseMVPCompatFragment toolBeanList) { if (toolBeanList.size() > 0) { tvCourse1.setText(toolBeanList.get(0).toolName); - GlideUtils.showImg(getActivity(), ivCourse1, toolBeanList.get(0).toolImage); + GlideUtils.showImgWithDefaule(getActivity(), ivCourse1, toolBeanList.get(0).toolImage,R.drawable.activite1); if (TextUtils.isEmpty(toolBeanList.get(0).toolUrl)) { tvCourse1.setTag(AppConfig.BASE_URL_ORDER + "InformationDetail.aspx?id=" + toolBeanList.get(0).toolId + "&areaname=" + AppContext.getInstance().district); @@ -204,7 +204,7 @@ public class CePingFragment extends BaseMVPCompatFragment 1) { tvCourse2.setText(toolBeanList.get(1).toolName); - GlideUtils.showImg(getActivity(), ivCourse2, toolBeanList.get(1).toolImage); + GlideUtils.showImgWithDefaule(getActivity(), ivCourse2, toolBeanList.get(1).toolImage,R.drawable.activite2); if (TextUtils.isEmpty(toolBeanList.get(1).toolUrl)) { tvCourse1.setTag(AppConfig.BASE_URL_ORDER + "InformationDetail.aspx?id=" + toolBeanList.get(1).toolId + "&areaname=" + AppContext.getInstance().district); @@ -215,7 +215,7 @@ public class CePingFragment extends BaseMVPCompatFragment 2) { tvCourse3.setText(toolBeanList.get(2).toolName); - GlideUtils.showImg(getActivity(), ivCourse3, toolBeanList.get(2).toolImage); + GlideUtils.showImgWithDefaule(getActivity(), ivCourse3, toolBeanList.get(2).toolImage,R.drawable.activite3); if (TextUtils.isEmpty(toolBeanList.get(2).toolUrl)) { tvCourse1.setTag(AppConfig.BASE_URL_ORDER + "InformationDetail.aspx?id=" + toolBeanList.get(2).toolId + "&areaname=" + AppContext.getInstance().district); diff --git a/app/src/main/java/com/shunzhi/parent/util/GlideUtils.java b/app/src/main/java/com/shunzhi/parent/util/GlideUtils.java index 2b580ce..a3462a1 100644 --- a/app/src/main/java/com/shunzhi/parent/util/GlideUtils.java +++ b/app/src/main/java/com/shunzhi/parent/util/GlideUtils.java @@ -26,4 +26,17 @@ public class GlideUtils { } } + + public static void showImgWithDefaule(Context context,ImageView imageView,String url,int defaultImg){ + if (!TextUtils.isEmpty(url)){ + if (url.startsWith("http")) + Glide.with(context).load(url).placeholder(defaultImg) + .into(imageView); + else Glide.with(context).load(AppConfig.BASE_URL_FILE+url).placeholder(defaultImg) + .into(imageView); + }else { + Glide.with(context).load(url).placeholder(defaultImg).centerCrop().into(imageView); + } + } + } diff --git a/app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java b/app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java index 367f668..c3f268a 100644 --- a/app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java +++ b/app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java @@ -54,9 +54,9 @@ public class TextAndImgShowView extends LinearLayout { imgs = new int[]{normalDrawable, selectDrawable}; } - public void addImgs(String imgUrl){ + public void addImgs(String imgUrl) { // Log.d("66666","imgUrl="+imgUrl); - if (!imgUrl.startsWith("http"))imgUrl= AppConfig.BASE_URL_FILE+imgUrl; + if (!imgUrl.startsWith("http")) imgUrl = AppConfig.BASE_URL_FILE + imgUrl; Glide.with(getContext()).load(imgUrl).error(R.drawable.gxzt).into(image); } @@ -80,13 +80,12 @@ public class TextAndImgShowView extends LinearLayout { } public void setWidth(Activity activity, View layout_control) { -// Log.d("66666", "layout_control=" + layout_control.getMeasuredWidth()); - LayoutParams params = new LayoutParams(LayoutParams.MATCH_PARENT,LayoutParams.MATCH_PARENT); + LayoutParams params = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT); params.width = (DisplayUtils.getScreenWidthPixels(activity) - DisplayUtils.dp2px(layout_control.getPaddingLeft() + layout_control.getPaddingRight() - )) / 4; + )) / 4; layout.setLayoutParams(params); - LayoutParams params1 = new LayoutParams(DisplayUtils.px2dp(110),DisplayUtils.px2dp(110)); + LayoutParams params1 = new LayoutParams(DisplayUtils.px2dp(110), DisplayUtils.px2dp(110)); image.setLayoutParams(params1); } } diff --git a/app/src/main/res/drawable-hdpi/activite1.png b/app/src/main/res/drawable-hdpi/activite1.png new file mode 100644 index 0000000..acda5d4 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/activite1.png differ diff --git a/app/src/main/res/drawable-hdpi/activite2.png b/app/src/main/res/drawable-hdpi/activite2.png new file mode 100644 index 0000000..f062ec9 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/activite2.png differ diff --git a/app/src/main/res/drawable-hdpi/activite3.png b/app/src/main/res/drawable-hdpi/activite3.png new file mode 100644 index 0000000..247d583 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/activite3.png differ diff --git a/app/src/main/res/drawable-hdpi/xqjc.png b/app/src/main/res/drawable-hdpi/xqjc.png new file mode 100644 index 0000000..5db4b4c Binary files /dev/null and b/app/src/main/res/drawable-hdpi/xqjc.png differ diff --git a/app/src/main/res/drawable-hdpi/zxlx.png b/app/src/main/res/drawable-hdpi/zxlx.png new file mode 100644 index 0000000..c9c8dc0 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/zxlx.png differ diff --git a/app/src/main/res/drawable-xhdpi/activite1.png b/app/src/main/res/drawable-xhdpi/activite1.png new file mode 100644 index 0000000..ab0cc4c Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/activite1.png differ diff --git a/app/src/main/res/drawable-xhdpi/activite2.png b/app/src/main/res/drawable-xhdpi/activite2.png new file mode 100644 index 0000000..c5d71f9 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/activite2.png differ diff --git a/app/src/main/res/drawable-xhdpi/activite3.png b/app/src/main/res/drawable-xhdpi/activite3.png new file mode 100644 index 0000000..72cf698 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/activite3.png differ diff --git a/app/src/main/res/drawable-xhdpi/xqjc.png b/app/src/main/res/drawable-xhdpi/xqjc.png index 161d0ad..b0d1e73 100644 Binary files a/app/src/main/res/drawable-xhdpi/xqjc.png and b/app/src/main/res/drawable-xhdpi/xqjc.png differ diff --git a/app/src/main/res/drawable-xhdpi/zxlx.png b/app/src/main/res/drawable-xhdpi/zxlx.png index b4f2537..97c0dbd 100644 Binary files a/app/src/main/res/drawable-xhdpi/zxlx.png and b/app/src/main/res/drawable-xhdpi/zxlx.png differ diff --git a/app/src/main/res/drwable-xxhdpi/activite1.png b/app/src/main/res/drwable-xxhdpi/activite1.png new file mode 100644 index 0000000..0f0e654 Binary files /dev/null and b/app/src/main/res/drwable-xxhdpi/activite1.png differ diff --git a/app/src/main/res/drwable-xxhdpi/activite2.png b/app/src/main/res/drwable-xxhdpi/activite2.png new file mode 100644 index 0000000..8c11655 Binary files /dev/null and b/app/src/main/res/drwable-xxhdpi/activite2.png differ diff --git a/app/src/main/res/drwable-xxhdpi/activite3.png b/app/src/main/res/drwable-xxhdpi/activite3.png new file mode 100644 index 0000000..d49384f Binary files /dev/null and b/app/src/main/res/drwable-xxhdpi/activite3.png differ diff --git a/app/src/main/res/drwable-xxhdpi/xqjc.png b/app/src/main/res/drwable-xxhdpi/xqjc.png new file mode 100644 index 0000000..906d83b Binary files /dev/null and b/app/src/main/res/drwable-xxhdpi/xqjc.png differ diff --git a/app/src/main/res/drwable-xxhdpi/zxlx.png b/app/src/main/res/drwable-xxhdpi/zxlx.png new file mode 100644 index 0000000..d89dba4 Binary files /dev/null and b/app/src/main/res/drwable-xxhdpi/zxlx.png differ diff --git a/app/src/main/res/layout/fragment_ce_ping.xml b/app/src/main/res/layout/fragment_ce_ping.xml index d53615d..6a2bbb8 100644 --- a/app/src/main/res/layout/fragment_ce_ping.xml +++ b/app/src/main/res/layout/fragment_ce_ping.xml @@ -83,13 +83,14 @@ android:layout_marginRight="@dimen/size_dp_5" android:layout_marginTop="@dimen/size_dp_20" android:layout_weight="1" - android:background="@drawable/shape_xueqing_radius8" - android:padding="@dimen/size_dp_5"> + android:background="@drawable/xqjc" + > @@ -104,13 +105,14 @@ android:layout_marginRight="@dimen/size_dp_10" android:layout_marginTop="@dimen/size_dp_20" android:layout_weight="1" - android:background="@drawable/shape_zxlx_radius8" - android:padding="@dimen/size_dp_5"> + android:background="@drawable/zxlx" + > @@ -167,7 +169,6 @@ android:onClick="onClick" android:background="@drawable/shape_xueqing_radius8"> @@ -220,10 +221,10 @@ android:onClick="onClick" android:background="@drawable/shape_xueqing_radius8"> @@ -266,10 +267,10 @@ android:onClick="onClick" android:background="@drawable/shape_xueqing_radius8"> diff --git a/app/src/main/res/layout/fragment_consult_one_level.xml b/app/src/main/res/layout/fragment_consult_one_level.xml index 8634969..86772ae 100644 --- a/app/src/main/res/layout/fragment_consult_one_level.xml +++ b/app/src/main/res/layout/fragment_consult_one_level.xml @@ -9,7 +9,7 @@ diff --git a/app/src/main/res/layout/fragment_zi_xun.xml b/app/src/main/res/layout/fragment_zi_xun.xml index 59b8a7e..4fa9628 100644 --- a/app/src/main/res/layout/fragment_zi_xun.xml +++ b/app/src/main/res/layout/fragment_zi_xun.xml @@ -22,7 +22,7 @@ diff --git a/app/src/main/res/layout/layout_textandimgshow.xml b/app/src/main/res/layout/layout_textandimgshow.xml index c45e7db..14983d5 100644 --- a/app/src/main/res/layout/layout_textandimgshow.xml +++ b/app/src/main/res/layout/layout_textandimgshow.xml @@ -2,9 +2,9 @@ - - - + \ No newline at end of file -- libgit2 0.21.0