From 2a83582a6559c1f30c0d46d37e6f074c67698967 Mon Sep 17 00:00:00 2001
From: 姚旭斌 <15805828761@163.com>
Date: Thu, 22 Mar 2018 11:37:04 +0800
Subject: [PATCH] no message

---
 app/src/main/java/com/shunzhi/parent/ui/activity/LoginAndRegistActivity.java |  8 ++++----
 app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java         | 14 +++++++++++++-
 app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java           | 11 ++++++++++-
 app/src/main/res/drawable-xhdpi/xiaoxi.png                                   | Bin 0 -> 516 bytes
 app/src/main/res/layout/fragment_mine.xml                                    |  9 +++++----
 app/src/main/res/layout/fragment_report.xml                                  |  7 +++++--
 6 files changed, 37 insertions(+), 12 deletions(-)
 create mode 100644 app/src/main/res/drawable-xhdpi/xiaoxi.png

diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/LoginAndRegistActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/LoginAndRegistActivity.java
index 5a436da..c03b3c7 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/LoginAndRegistActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/LoginAndRegistActivity.java
@@ -1,7 +1,6 @@
 package com.shunzhi.parent.ui.activity;
 
 import android.os.Bundle;
-import android.util.Log;
 
 import com.share.mvpsdk.base.activity.BaseCompatActivity;
 import com.shunzhi.parent.R;
@@ -19,9 +18,10 @@ public class LoginAndRegistActivity extends BaseCompatActivity {
     protected void initView(Bundle savedInstanceState) {
         if (savedInstanceState == null) {
             type = getIntent().getStringExtra("type");
-            Log.e("aaa--==",type);
-            mFragments[0] = LoginAndRegistFragment.getInstance(type);
-            loadRootFragment(R.id.frame, mFragments[0]);
+            if(type!=null) {
+                mFragments[0] = LoginAndRegistFragment.getInstance(type);
+                loadRootFragment(R.id.frame, mFragments[0]);
+            }
         } else {
             mFragments[0] = findFragment(LoginAndRegistFragment.class);
         }
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 4727120..9af4301 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
@@ -13,7 +13,6 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.bumptech.glide.Glide;
 import com.share.mvpsdk.base.BasePresenter;
 import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;
 import com.share.mvpsdk.utils.ToastUtils;
@@ -74,11 +73,13 @@ public class CePingFragment extends BaseMVPCompatFragment<CepingContract.CePingP
         textAndImg_xqjc.setTextColor(R.color.white);
         textAndImg_xqjc.setText("学情检测");
         textAndImg_xqjc.setImgs(R.drawable.xqjc, R.drawable.xqjc);
+        textAndImg_xqjc.setOnClickListener(this);
         textAndImg_xqjc.setSelect(true);
 
         textAndImg_zxlx.setText("专项训练");
         textAndImg_zxlx.setTextColor(R.color.white);
         textAndImg_zxlx.setImgs(R.drawable.zxlx, R.drawable.zxlx);
+        textAndImg_zxlx.setOnClickListener(this);
         textAndImg_zxlx.setSelect(true);
 
         initListeners(view);
@@ -153,6 +154,14 @@ public class CePingFragment extends BaseMVPCompatFragment<CepingContract.CePingP
             case R.id.ivCamera:
                 ToastUtils.showToast("功能暂未上线");
                 break;
+            case R.id.textAndImg_xqjc:
+                ToastUtils.showToast("功能暂未上线");
+                break;
+            case R.id.textAndImg_zxlx:
+                ToastUtils.showToast("功能暂未上线");
+                break;
+            default:
+                break;
         }
     }
 
@@ -182,14 +191,17 @@ public class CePingFragment extends BaseMVPCompatFragment<CepingContract.CePingP
 
     @Override
     public void showTools(List<ToolBean> toolBeanList) {
+
         if (toolBeanList.size() > 0) {
             tvCourse1.setText(toolBeanList.get(0).toolName);
             GlideUtils.showImg(getActivity(),ivCourse1,toolBeanList.get(0).toolImage);
+
             tvCourse1.setTag(toolBeanList.get(0).toolUrl);
         }
 
         if (toolBeanList.size() > 1) {
             tvCourse2.setText(toolBeanList.get(1).toolName);
+
             GlideUtils.showImg(getActivity(),ivCourse2,toolBeanList.get(1).toolImage);
             tvCourse2.setTag(toolBeanList.get(1).toolUrl);
         }
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
index aaf054c..8583b93 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
@@ -30,7 +30,7 @@ import com.shunzhi.parent.util.GlideUtils;
 
 public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract.LoginPresenter, LoginAndRegisterContract.ILoginModel>
         implements MineContract.IMineView, View.OnClickListener {
-    LinearLayout childlayout, personinfo, layout_orderDetail, layout_order, layout_cache, layout_about, layout_feedback;
+    LinearLayout childlayout, personinfo, layout_orderDetail, layout_order, layout_cache, layout_about, layout_feedback,top_layout,layout_afterLogin;
     RoundedImageView user_photo;
     TextView user_name, user_mobile, tvExit, binding_state;
 
@@ -48,6 +48,8 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract
     @Override
     public void initUI(View view, @Nullable Bundle savedInstanceState) {
         childlayout = view.findViewById(R.id.childlayout);
+        layout_afterLogin = view.findViewById(R.id.layout_afterLogin);
+        top_layout = view.findViewById(R.id.top_layout);
         personinfo = view.findViewById(R.id.personinfo);
         layout_order = view.findViewById(R.id.layout_order);
         layout_orderDetail = view.findViewById(R.id.layout_orderDetail);
@@ -65,8 +67,10 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract
         user_name = view.findViewById(R.id.user_name);
         user_mobile = view.findViewById(R.id.user_mobile);
         tvExit = view.findViewById(R.id.tvExit);
+        tvExit.setVisibility(View.GONE);
         tvExit.setOnClickListener(this);
         binding_state = view.findViewById(R.id.binding_state);
+        layout_afterLogin.setVisibility(View.GONE);
         if (AppConfig.ISBINDING) {
             binding_state.setText("");
         }
@@ -86,10 +90,15 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract
             user_photo.setOval(true);
             user_name.setText(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_NAME));
             user_mobile.setText(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.LOGIN_NAME));
+            top_layout.setBackgroundResource(R.drawable.backgroud_top);
             user_mobile.setVisibility(View.VISIBLE);
+            layout_afterLogin.setVisibility(View.VISIBLE);
+            tvExit.setVisibility(View.VISIBLE);
         } else {
             user_name.setVisibility(View.VISIBLE);
             user_mobile.setVisibility(View.GONE);
+            layout_afterLogin.setVisibility(View.GONE);
+            tvExit.setVisibility(View.GONE);
         }
     }
 
diff --git a/app/src/main/res/drawable-xhdpi/xiaoxi.png b/app/src/main/res/drawable-xhdpi/xiaoxi.png
new file mode 100644
index 0000000..539174e
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/xiaoxi.png differ
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index e6f9c15..9256403 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -17,7 +17,7 @@
             android:paddingTop="20dp"
             android:layout_width="match_parent"
             android:layout_height="180dp"
-            android:background="@drawable/backgroud_top"
+            android:background="@color/back_top"
             android:orientation="vertical">
 
             <TextView
@@ -91,6 +91,7 @@
             android:orientation="vertical">
 
             <LinearLayout
+                android:id="@+id/layout_afterLogin"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@color/white"
@@ -103,17 +104,17 @@
 
                     <TextView
                         android:layout_width="25dp"
-                        android:layout_height="20dp"
+                        android:layout_height="30dp"
                         android:layout_marginLeft="15dp"
                         android:layout_marginRight="30dp"
-                        android:background="@drawable/tiaoxing" />
+                        android:background="@drawable/xiaoxi" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
                         android:layout_weight="1"
-                        android:text="我的订阅消息"
+                        android:text="消息"
                         android:textSize="@dimen/txtsize_title" />
 
                     <TextView
diff --git a/app/src/main/res/layout/fragment_report.xml b/app/src/main/res/layout/fragment_report.xml
index 5ae7459..e7d5a69 100644
--- a/app/src/main/res/layout/fragment_report.xml
+++ b/app/src/main/res/layout/fragment_report.xml
@@ -22,6 +22,7 @@
             android:drawablePadding="10dp"
             android:drawableRight="@drawable/pull"
             android:text=""
+            android:visibility="gone"
             android:textColor="@color/textColor"
             android:textSize="@dimen/textSize16" />
 
@@ -32,7 +33,7 @@
             android:layout_weight="1"
             android:gravity="center_horizontal"
             android:id="@+id/tvDate"
-            android:text="2018年3月"
+            android:text="报告"
             android:textColor="@color/white"
             android:textSize="@dimen/textSize18" />
 
@@ -42,6 +43,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:drawableRight="@drawable/screen"
+            android:visibility="gone"
             android:text="筛选"
             android:textColor="@color/textColor"
             android:textSize="@dimen/textSize16" />
@@ -52,7 +54,7 @@
         android:layout_height="match_parent"
         android:textSize="@dimen/size_dp_16"
         android:textColor="@color/xueqing_blue"
-        android:text="没有绑定孩子，\n请去个人中心绑定孩子"
+        android:text="功能暂不开放"
         android:gravity="center"
         android:lineSpacingExtra="@dimen/size_dp_5"
         android:id="@+id/tvNoData"
@@ -61,6 +63,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:visibility="gone"
         android:orientation="vertical">
 
         <!--<include layout="@layout/layout_week" /> android:layout_below="@+id/linearlayout"-->
--
libgit2 0.21.0