diff --git a/app/src/main/java/com/shunzhi/parent/manager/MessageManager.java b/app/src/main/java/com/shunzhi/parent/manager/MessageManager.java index 00f4f3d..e6d575d 100644 --- a/app/src/main/java/com/shunzhi/parent/manager/MessageManager.java +++ b/app/src/main/java/com/shunzhi/parent/manager/MessageManager.java @@ -113,7 +113,6 @@ public class MessageManager { notifyNotification(uuid, id, "收到一条作业通知"); } - } catch (JSONException e) { e.printStackTrace(); } diff --git a/app/src/main/java/com/shunzhi/parent/ui/MainActivity.java b/app/src/main/java/com/shunzhi/parent/ui/MainActivity.java index d2949dc..38ca2d6 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/MainActivity.java +++ b/app/src/main/java/com/shunzhi/parent/ui/MainActivity.java @@ -104,6 +104,7 @@ public class MainActivity extends BaseCompatActivity implements PermissionUtils. else fragmentTransaction.hide(fragments[i]); } if (index==CONSULT_INDEX)consultFragment.refresh(); + else if (index==CEPING_INDEX)cePingFragment.refresh(); fragmentTransaction.commit(); } 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 af7cd8b..19c5686 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 @@ -207,4 +207,8 @@ public class CePingFragment extends BaseMVPCompatFragment implements ConsultContract.IConsultView { 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 b827c28..367f668 100644 --- a/app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java +++ b/app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java @@ -76,7 +76,7 @@ public class TextAndImgShowView extends LinearLayout { } public void setTextColor(int color) { - text.setTextColor(color); + text.setTextColor(getContext().getResources().getColor(color)); } public void setWidth(Activity activity, View layout_control) { @@ -86,7 +86,7 @@ public class TextAndImgShowView extends LinearLayout { DisplayUtils.dp2px(layout_control.getPaddingLeft() + layout_control.getPaddingRight() )) / 4; layout.setLayoutParams(params); - LayoutParams params1 = new LayoutParams(52,52); + LayoutParams params1 = new LayoutParams(DisplayUtils.px2dp(110),DisplayUtils.px2dp(110)); image.setLayoutParams(params1); } } diff --git a/app/src/main/res/drawable/shape_xueqing_radius25.xml b/app/src/main/res/drawable/shape_xueqing_radius25.xml new file mode 100644 index 0000000..ffa35b4 --- /dev/null +++ b/app/src/main/res/drawable/shape_xueqing_radius25.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_start.xml b/app/src/main/res/layout/fragment_start.xml index fdee68e..e0e5d30 100644 --- a/app/src/main/res/layout/fragment_start.xml +++ b/app/src/main/res/layout/fragment_start.xml @@ -3,6 +3,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@color/bgColor" + xmlns:app="http://schemas.android.com/apk/res-auto" tools:context="com.shunzhi.parent.ui.fragment.StartFragment"> diff --git a/app/src/main/res/layout/text_and_img_show.xml b/app/src/main/res/layout/text_and_img_show.xml index be7f4cb..4b79486 100644 --- a/app/src/main/res/layout/text_and_img_show.xml +++ b/app/src/main/res/layout/text_and_img_show.xml @@ -28,7 +28,7 @@ android:layout_height="wrap_content" android:layout_marginTop="5dp" android:gravity="center" - android:textColor="@color/white" + android:textColor="@color/textColor" android:textSize="14dp"/> -- libgit2 0.21.0