From 4b52df2364043d395fd6941899a0153ade052f08 Mon Sep 17 00:00:00 2001
From: 陶汉栋 <2821744554@qq.com>
Date: Sat, 24 Mar 2018 10:25:56 +0800
Subject: [PATCH] no message

---
 app/src/main/java/com/shunzhi/parent/manager/MessageManager.java      |  1 -
 app/src/main/java/com/shunzhi/parent/ui/MainActivity.java             |  1 +
 app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java  |  4 ++++
 app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java |  1 -
 app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java   |  3 +++
 app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java    |  4 ++--
 app/src/main/res/drawable/shape_xueqing_radius25.xml                  |  5 +++++
 app/src/main/res/layout/fragment_start.xml                            | 11 ++++++-----
 app/src/main/res/layout/text_and_img_show.xml                         |  2 +-
 9 files changed, 22 insertions(+), 10 deletions(-)
 create mode 100644 app/src/main/res/drawable/shape_xueqing_radius25.xml

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<CepingContract.CePingP
             tvCourse3.setTag(toolBeanList.get(2).toolUrl);
         }
     }
+
+    public void refresh(){
+        addTools(AppContext.getInstance().district);
+    }
 }
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java
index 38f4507..0e0b2c3 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java
@@ -71,7 +71,6 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu
     int pageIndex = 1;
     boolean first = true;
 
-
     @Override
     public int getLayoutId() {
         return R.layout.fragment_zi_xun;
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java
index 25b15ac..6a4a5c3 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java
@@ -1,6 +1,8 @@
 package com.shunzhi.parent.ui.fragment;
 
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
@@ -26,6 +28,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import cn.jzvd.JZVideoPlayerStandard;
+import timber.log.Timber;
 
 public class StartFragment extends BaseMVPCompatFragment<ConsultContract.ConsultPresenter, ConsultContract.IConsultModel>
         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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="@dimen/size_dp_25"/>
+    <solid android:color="@color/xueqing_blue"/>
+</shape>
\ 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">
 
     <com.stx.xhb.xbanner.XBanner
@@ -18,14 +19,14 @@
 
     <TextView
         android:id="@+id/tvJump"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/size_dp_50"
+        android:layout_height="@dimen/size_dp_50"
         android:text="跳过"
+        android:gravity="center"
         android:textColor="@color/white"
-        android:textSize="@dimen/size_dp_16"
-        android:padding="@dimen/size_dp_10"
+        android:textSize="@dimen/size_dp_12"
         android:layout_gravity="right"
         android:layout_margin="@dimen/size_dp_10"
-        android:background="@drawable/shape_xueqing_radius8"
+        android:background="@drawable/shape_xueqing_radius25"
         />
 </FrameLayout>
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"/>
     </LinearLayout>
 
--
libgit2 0.21.0