From f62d7dcc7b3e383cd1faebcbac48aca2709b65da Mon Sep 17 00:00:00 2001
From: taohd <2821744554@qq.com>
Date: Sat, 5 May 2018 08:03:28 +0800
Subject: [PATCH] no message

---
 .idea/misc.xml                                                                                      |  2 +-
 app/build.gradle                                                                                    |  4 ++--
 app/src/main/java/com/shunzhi/parent/contract/loginandregister/LoginAndRegisterContract.java        |  2 +-
 app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java      | 20 ++++++++++++--------
 app/src/main/java/com/shunzhi/parent/ui/MainActivity.java                                           |  4 +++-
 app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java                     |  2 +-
 app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java                               |  6 +++---
 app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java                                | 36 +++++++++++++-----------------------
 app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java |  4 ++--
 app/src/main/java/com/shunzhi/parent/ui/fragment/report/ChengZhangFragment.java                     | 62 +++++++++++++++++++++++++++++++++++++++++++++-----------------
 app/src/main/res/layout/activity_apply_signin.xml                                                   |  1 +
 app/src/main/res/layout/dialog_view.xml                                                             | 16 ++++++++++------
 app/src/main/res/layout/fragment_cheng_zhang.xml                                                    |  8 ++++----
 app/src/main/res/layout/fragment_mine.xml                                                           | 25 ++++++++++++-------------
 app/src/main/res/layout/fragment_report.xml                                                         | 17 -----------------
 15 files changed, 110 insertions(+), 99 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3963879..75dac50 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -24,7 +24,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index 7fc934c..88c8b4a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,8 +16,8 @@ android {
         applicationId "com.shunzhi.parent"
         minSdkVersion 16
         targetSdkVersion 26
-        versionCode 102
-        versionName "1.0.2"
+        versionCode 104
+        versionName "1.0.4"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         javaCompileOptions {
             annotationProcessorOptions {
diff --git a/app/src/main/java/com/shunzhi/parent/contract/loginandregister/LoginAndRegisterContract.java b/app/src/main/java/com/shunzhi/parent/contract/loginandregister/LoginAndRegisterContract.java
index d9ff489..809721e 100644
--- a/app/src/main/java/com/shunzhi/parent/contract/loginandregister/LoginAndRegisterContract.java
+++ b/app/src/main/java/com/shunzhi/parent/contract/loginandregister/LoginAndRegisterContract.java
@@ -44,7 +44,7 @@ public interface LoginAndRegisterContract {
     interface ILoginView extends IBaseFragment {
 
         //更新用户信息
-        void getUserInfo(int type);
+        void getUserInfo(int type,String message);
         void showerror(String error);
 
     }
diff --git a/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
index 050b9ca..084e7f6 100644
--- a/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
+++ b/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
@@ -50,7 +50,7 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
             @Override
             public void accept(JsonObject jsonObject) throws Exception {
                 try {
-//                    Log.d("66666","jsonObject="+jsonObject);
+//                    Log.d("66666","getLoginResult="+jsonObject);
                     if (jsonObject != null && !TextUtils.isEmpty(jsonObject.get("access_token").getAsString())) {
                         AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.ACCESS_TOKEN, jsonObject.get("access_token").getAsString());
                         AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_NAME, loginName);
@@ -62,6 +62,7 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
                     }
                 } catch (Exception e) {
                     e.printStackTrace();
+                    getUserInfo(loginName, -1, "登录失败");
                     ToastUtils.showToast("登录失败:" + e.toString());
                 }
             }
@@ -106,7 +107,7 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
                 //TODO 注册成功返回
                 AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_NAME, adminName);
                 AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_PWD, password);
-                mIView.getUserInfo(1);
+                mIView.getUserInfo(1,"");
             }
         }, new Consumer<Throwable>() {
             @Override
@@ -157,7 +158,7 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
         mRxManager.register(mIModel.getUserInfo(mobile, school_id, captcha).subscribe(new Consumer<UserInfo>() {
             @Override
             public void accept(UserInfo userInfo) throws Exception {
-                Log.d("77777","userInfo="+userInfo);
+//                Log.d("77777","userInfo="+userInfo);
                 if (userInfo != null) {
                     CurrentBean currentBean = userInfo.getData();
                     AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_NAME, currentBean.getMobile());
@@ -180,7 +181,7 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
 
                 } else {
                     LoginAndRegistFragment.progressDialog.dismiss();
-                    ToastUtils.showToast("错误");
+                    ToastUtils.showToast(userInfo.getMessage());
                 }
             }
         }, new Consumer<Throwable>() {
@@ -208,10 +209,12 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
         mRxManager.register(mIModel.nimLoginResult(account, password).subscribe(new Consumer<NIMLoginResultBean>() {
             @Override
             public void accept(NIMLoginResultBean bean) throws Exception {
-                Log.d("77777","NIMLoginResultBean="+bean);
+//                Log.d("77777","NIMLoginResultBean="+bean);
                 if (bean.isSuccess()) {
                     AppConfig.ISLOGIN = true;
-                    mIView.getUserInfo(0);
+                    mIView.getUserInfo(0,"");
+                }else {
+                    mIView.getUserInfo(-1,"通讯登录失败:"+bean.getResultCode());
                 }
             }
         }));
@@ -222,12 +225,13 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
             @Override
             public void accept(JsonObject jsonObject) throws Exception {
                 AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_NAME, adminName);
-                mIView.getUserInfo(2);
+                mIView.getUserInfo(2,"");
             }
         }, new Consumer<Throwable>() {
             @Override
             public void accept(Throwable throwable) throws Exception {
-                OkHttpExceptionUtil.handOkHttpException((HttpException) throwable);
+                mIView.getUserInfo(-1,throwable.getMessage());
+//                OkHttpExceptionUtil.handOkHttpException((HttpException) throwable);
             }
         }));
 
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 1b7f3df..a022559 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/MainActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/MainActivity.java
@@ -16,6 +16,7 @@ import com.shunzhi.parent.R;
 import com.shunzhi.parent.bean.message.PHMessage;
 import com.shunzhi.parent.bean.message.PHMessageDao;
 import com.shunzhi.parent.manager.MessageManager;
+import com.shunzhi.parent.manager.UpdateManager;
 import com.shunzhi.parent.ui.fragment.ConsultFragment;
 import com.shunzhi.parent.ui.fragment.MineFragment;
 import com.shunzhi.parent.ui.fragment.ReportFragment;
@@ -45,7 +46,7 @@ public class MainActivity extends BaseCompatActivity implements PermissionUtils.
         PermissionUtils.requestMultiPermissions(this, this);
         bottom_navigationView = findViewById(R.id.bottom_navigationView);
         BottomNavigationViewHelper.disableShiftMode(bottom_navigationView);
-
+        UpdateManager.getInstance().setContext(this).isUpdate(false);
         bottom_navigationView.setSelectedItemId(R.id.bottom_navigationView);
         bottom_navigationView.setOnNavigationItemSelectedListener(new BottomNavigationView.OnNavigationItemSelectedListener() {
             @Override
@@ -105,6 +106,7 @@ public class MainActivity extends BaseCompatActivity implements PermissionUtils.
             else fragmentTransaction.hide(fragments[i]);
         }
         if (index == CONSULT_INDEX) consultFragment.refresh();
+        if (index==REPORT_INDEX)reportFragment.refreshChild();
 //        else if (index == CEPING_INDEX) cePingFragment.refresh();
         fragmentTransaction.commit();
     }
diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java
index bb9e505..2acbda4 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java
@@ -101,7 +101,7 @@ public class WebViewActivity extends BaseCompatActivity {
         if (token != null && !"".equals(token) && !TextUtils.isEmpty(token)) {
             url = url + "&Token=" + token;
         }
-        Log.d("66666","url="+url);
+//        Log.d("66666","url="+url);
         if (type == AppConfig.BINDING_SUCCESS_HEZUO) {
             binding_success.setVisibility(View.VISIBLE);
             binding_success2.setVisibility(View.GONE);
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 812c3d1..2a666f1 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
@@ -101,8 +101,6 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu
         videoplayer.replayTextView.setVisibility(View.GONE);
         videoplayer.backButton.setVisibility(View.GONE);
 
-        mPresenter.getBanners("2", AppContext.getInstance().district);
-
         initBroadCast();
 
         initListeners();
@@ -114,6 +112,9 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu
 //                ToastUtils.showToast("scrollX="+nesteScrollView.getMeasuredHeight()+"scrollY="+scrollY+"oldScrollX="+oldScrollX+"oldScrollY="+oldScrollY+"layout_consult="+layout_consult.getMeasuredHeight());
             }
         });
+
+        mPresenter.getBanners("2", AppContext.getInstance().district);
+
     }
 
     private void initRecycler() {
@@ -213,7 +214,6 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu
 
     }
 
-
     private BroadcastReceiver broadcastReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java
index 0199cee..83fd666 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java
@@ -15,6 +15,7 @@ import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.TextUtils;
 import android.text.style.ForegroundColorSpan;
+import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -43,14 +44,12 @@ public class ReportFragment extends BaseMVPCompatFragment<MyChildContract.MyChil
         implements MyChildContract.IMyChildView, View.OnClickListener {
     ViewPager viewPager;
 
-    TextView tvDate, tvShaiXuan, tvNoData, tvName;
+    TextView tvDate, tvShaiXuan, tvName;
 
     MyFragmentAdapter myFragmentAdapter = null;
 
     TabLayout tabLayout;
 
-    RelativeLayout rl_noData;
-
     ChengZhangFragment chengZhangFragment1 = null, chengZhangFragment2 = null;//成长、报告页面
 
     ShaiXuanPop shaiXuanPop = null;
@@ -70,10 +69,7 @@ public class ReportFragment extends BaseMVPCompatFragment<MyChildContract.MyChil
         tvDate = view.findViewById(R.id.tvDate);
         tvName = view.findViewById(R.id.tvName);
         tvShaiXuan = view.findViewById(R.id.tvShaiXuan);
-        tvNoData = view.findViewById(R.id.tvNoData);
-        setTextColor();
         tabLayout = view.findViewById(R.id.tabLayout);
-        rl_noData = view.findViewById(R.id.rl_noData);
         tvName.setOnClickListener(this);
         tvName.setEllipsize(TextUtils.TruncateAt.END);
         tvShaiXuan.setOnClickListener(this);
@@ -100,21 +96,14 @@ public class ReportFragment extends BaseMVPCompatFragment<MyChildContract.MyChil
 
             }
         });
-
-    }
-
-    private void setTextColor() {
-        String text="如需使用该模块，请先前往\n个人中心—我的孩子\n绑定孩子账号";
-        Spannable span = new SpannableString(text);
-        span.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.xueqing_blue)),13,22,Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-        tvNoData.setText(span);
+        //在viewpager初始化之后加载
+        mPresenter.loadChildList(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.LOGIN_NAME), 0, "");
     }
 
 
     @Override
     public void onResume() {
         super.onResume();
-        mPresenter.loadChildList(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.LOGIN_NAME), 0, "");
     }
 
     @Override
@@ -122,7 +111,7 @@ public class ReportFragment extends BaseMVPCompatFragment<MyChildContract.MyChil
         switch (view.getId()) {
             case R.id.tvShaiXuan:
                 if (null == shaiXuanPop) shaiXuanPop = new ShaiXuanPop(getActivity());
-                chengZhangFragment2.showShaixuan(handler);
+                if (null!=chengZhangFragment2)chengZhangFragment2.showShaixuan(handler);
                 break;
             case R.id.tvName:
                 showChildName();
@@ -130,6 +119,10 @@ public class ReportFragment extends BaseMVPCompatFragment<MyChildContract.MyChil
         }
     }
 
+    public void refreshChild(){
+        mPresenter.loadChildList(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.LOGIN_NAME), 0, "");
+    }
+
     private void showChildName() {
         childMenu.show();
     }
@@ -188,11 +181,8 @@ public class ReportFragment extends BaseMVPCompatFragment<MyChildContract.MyChil
             childlist.addAll(list);
 
             if (childlist == null || childlist.size() == 0) {
-                rl_noData.setVisibility(View.VISIBLE);
-                viewPager.setVisibility(View.GONE);
-            }else{
-                rl_noData.setVisibility(View.GONE);
-                viewPager.setVisibility(View.VISIBLE);
+                if(null!=chengZhangFragment1)chengZhangFragment1.showNoData();
+                if(null!=chengZhangFragment2)chengZhangFragment2.showNoData();
             }
             if (TextUtils.isEmpty(currChildStr)) {
                 if (childlist != null && childlist.size() > 0) {
@@ -229,8 +219,8 @@ public class ReportFragment extends BaseMVPCompatFragment<MyChildContract.MyChil
     @Override
     public void showError(String error) {
         if (error.equals("访问的接口要求登录")) {
-            rl_noData.setVisibility(View.VISIBLE);
-            viewPager.setVisibility(View.GONE);
+            if(null!=chengZhangFragment1)chengZhangFragment1.showNoData();
+            if(null!=chengZhangFragment2)chengZhangFragment2.showNoData();
         }
     }
 
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java
index 30d018e..5c33704 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java
@@ -139,7 +139,7 @@ public class LoginAndRegistFragment extends BaseMVPCompatFragment<LoginAndRegist
 
 
     @Override
-    public void getUserInfo(int type) {
+    public void getUserInfo(int type,String message) {
         progressDialog.dismiss();
         if (type == 0) {
             startActivity(new Intent().setClass(getActivity(), MainActivity.class));
@@ -177,7 +177,7 @@ public class LoginAndRegistFragment extends BaseMVPCompatFragment<LoginAndRegist
             startActivity(new Intent().putExtra("type", "登录").setClass(getActivity(), LoginAndRegistActivity.class));
             phoneNumber.setText(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.LOGIN_NAME));
             password.setFocusable(true);
-        }
+        }else ToastUtils.showToast(message);
 
 
     }
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ChengZhangFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ChengZhangFragment.java
index b077a89..d4b3385 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ChengZhangFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ChengZhangFragment.java
@@ -22,6 +22,8 @@ import android.widget.TextView;
 
 import com.amy.monthweek.materialcalendarview.MonthWeekMaterialCalendarView;
 import com.google.gson.Gson;
+import com.netease.nimlib.sdk.NIMClient;
+import com.netease.nimlib.sdk.mixpush.NIMPushClient;
 import com.prolificinteractive.materialcalendarview.CalendarDay;
 import com.prolificinteractive.materialcalendarview.MaterialCalendarView;
 import com.share.mvpsdk.base.BasePresenter;
@@ -83,6 +85,8 @@ public class ChengZhangFragment extends BaseMVPCompatFragment<ReportContract.Rep
 
     RelativeLayout rl_noData;
 
+    TextView tvNoData;
+
     @Override
     public int getLayoutId() {
         return R.layout.fragment_cheng_zhang;
@@ -96,10 +100,10 @@ public class ChengZhangFragment extends BaseMVPCompatFragment<ReportContract.Rep
         layout_kaoqin = view.findViewById(R.id.layout_kaoqin);
         layout_buka = view.findViewById(R.id.layout_buka);
         layout_qingjia = view.findViewById(R.id.layout_qingjia);
+        tvNoData=view.findViewById(R.id.tvNoData);
         calendarView_month_mode = view.findViewById(R.id.calendarView_month_mode);
         monthWeekMaterialCalendarView = view.findViewById(R.id.slidelayout);
         layout_chengzhang = view.findViewById(R.id.layout_chengzhang);
-
         layout_kaoqin.setOnClickListener(this);
         layout_buka.setOnClickListener(this);
         layout_qingjia.setOnClickListener(this);
@@ -180,10 +184,28 @@ public class ChengZhangFragment extends BaseMVPCompatFragment<ReportContract.Rep
 
     @Override
     public void onClick(View view) {
+
+        switch (view.getId()) {
+
+            case R.id.layout_kaoqin:
+//                ApplySigninActivity.getInstance(getActivity(), jsonStr);
+                showOrderPopu();
+                break;
+            case R.id.layout_buka:
+//                ApplyReplaceCardActivity.getInstance(getActivity(), jsonStr);
+                showOrderPopu();
+                break;
+            case R.id.layout_qingjia:
+                ToastUtils.showToast("正在努力开发中，敬请期待");
+                break;
+        }
+    }
+
+    private void showOrderPopu(){
         if (childBean.getCount() == 0) {
             final PopupWindow popupWindow = new PopupWindow();
-            popupWindow.setWidth(ViewGroup.LayoutParams.WRAP_CONTENT);
-            popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
+            popupWindow.setWidth(ViewGroup.LayoutParams.MATCH_PARENT);
+            popupWindow.setHeight(ViewGroup.LayoutParams.MATCH_PARENT);
             backgroundAlpha(0.5f);
             View view1 = LayoutInflater.from(getActivity()).inflate(R.layout.dialog_view, null);
             TextView dialog_info = view1.findViewById(R.id.dialog_info);
@@ -226,21 +248,7 @@ public class ChengZhangFragment extends BaseMVPCompatFragment<ReportContract.Rep
             return;
 
         }
-
-        switch (view.getId()) {
-
-            case R.id.layout_kaoqin:
-                ApplySigninActivity.getInstance(getActivity(), jsonStr);
-                break;
-            case R.id.layout_buka:
-                ApplyReplaceCardActivity.getInstance(getActivity(), jsonStr);
-                break;
-            case R.id.layout_qingjia:
-                ToastUtils.showToast("正在努力开发中，敬请期待");
-                break;
-        }
     }
-
     @NonNull
     @Override
     public BasePresenter initPresenter() {
@@ -264,4 +272,24 @@ public class ChengZhangFragment extends BaseMVPCompatFragment<ReportContract.Rep
         this.jsonStr = jsonStr;
         show();
     }
+
+    /**
+     * 显示没有数据
+     */
+    public void showNoData() {
+        if (type.equals(TYPE_REPORT)){
+            tvNoData.setBackgroundDrawable(getResources().getDrawable(R.drawable.baogao_back));
+            tvNoData.setText("");
+        }else
+        setTextColor();
+
+    }
+
+    private void setTextColor() {
+        String text="如需使用该模块，请先前往\n个人中心—我的孩子\n绑定孩子账号";
+        Spannable span = new SpannableString(text);
+        span.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.xueqing_blue)),13,22,Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        tvNoData.setText(span);
+    }
+
 }
diff --git a/app/src/main/res/layout/activity_apply_signin.xml b/app/src/main/res/layout/activity_apply_signin.xml
index 5b9ecec..dc478b4 100644
--- a/app/src/main/res/layout/activity_apply_signin.xml
+++ b/app/src/main/res/layout/activity_apply_signin.xml
@@ -5,6 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
+    android:background="@color/bg_gray"
     tools:context="com.shunzhi.parent.ui.activity.apply.ApplySigninActivity">
 
     <include layout="@layout/top"/>
diff --git a/app/src/main/res/layout/dialog_view.xml b/app/src/main/res/layout/dialog_view.xml
index 6cc9cef..7aebbbc 100644
--- a/app/src/main/res/layout/dialog_view.xml
+++ b/app/src/main/res/layout/dialog_view.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="260dp"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_gravity="center"
+    android:layout_height="match_parent"
+    android:background="#55555555"
+    android:orientation="vertical">
+<LinearLayout
     android:layout_gravity="center"
+    android:layout_width="260dp"
     android:layout_height="wrap_content"
-    android:background="#00000000"
     android:orientation="vertical">
-
     <TextView
         android:id="@+id/dialog_info"
         android:layout_width="260dp"
@@ -42,6 +46,6 @@
             android:background="@drawable/rudiobtn"
             android:text="确定" />
     </LinearLayout>
-
-
 </LinearLayout>
+
+</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_cheng_zhang.xml b/app/src/main/res/layout/fragment_cheng_zhang.xml
index b3c35dd..e3c7ec8 100644
--- a/app/src/main/res/layout/fragment_cheng_zhang.xml
+++ b/app/src/main/res/layout/fragment_cheng_zhang.xml
@@ -129,12 +129,12 @@
 
         <TextView
             android:id="@+id/tvNoData"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
+            android:layout_marginTop="30px"
+            android:gravity="center"
             android:lineSpacingExtra="@dimen/size_dp_5"
-            android:background="@drawable/baogao_back"
-            android:textColor="@color/xueqing_blue"
+            android:text="如需使用该模块，请先前往\n个人中心—我的孩子\n绑定孩子账号"
             android:textSize="@dimen/size_dp_16" />
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index 4f5efbf..88c05b0 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -57,7 +57,7 @@
                         android:layout_height="wrap_content"
                         android:text="登录/注册"
                         android:textColor="@color/white"
-                        android:textSize="@dimen/txtsize_headline" />
+                        android:textSize="@dimen/txtsize_title" />
 
                     <TextView
                         android:id="@+id/user_mobile"
@@ -81,13 +81,13 @@
             </LinearLayout>
         </LinearLayout>
 <ScrollView
+    android:layout_margin="@dimen/dp_10"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
         <LinearLayout
             android:id="@+id/center_layout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_margin="20dp"
             android:orientation="vertical">
 
             <LinearLayout
@@ -116,7 +116,7 @@
                         android:layout_gravity="center_vertical"
                         android:layout_weight="1"
                         android:text="消息"
-                        android:textSize="@dimen/txtsize_title" />
+                        android:textSize="@dimen/textSize14" />
 
                     <TextView
                         android:id="@+id/tvMessageCount"
@@ -157,7 +157,7 @@
                         android:layout_gravity="center_vertical"
                         android:layout_weight="1"
                         android:text="订购详情"
-                        android:textSize="@dimen/txtsize_title" />
+                        android:textSize="@dimen/textSize14" />
 
                 </LinearLayout>
 
@@ -187,7 +187,7 @@
                         android:layout_gravity="center_vertical"
                         android:layout_weight="1"
                         android:text="订购中心"
-                        android:textSize="@dimen/txtsize_title" />
+                        android:textSize="@dimen/textSize14" />
 
                 </LinearLayout>
 
@@ -217,7 +217,7 @@
                         android:layout_gravity="center_vertical"
                         android:layout_weight="1"
                         android:text="我的孩子"
-                        android:textSize="@dimen/txtsize_title" />
+                        android:textSize="@dimen/textSize14" />
 
                     <TextView
                         android:id="@+id/binding_state"
@@ -225,7 +225,7 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
                         android:text="未绑定"
-                        android:textSize="@dimen/sp_18"
+                        android:textSize="@dimen/textSize14"
                         android:textColor="@color/textRed"
                         />
                 </LinearLayout>
@@ -260,7 +260,7 @@
                         android:layout_gravity="center_vertical"
                         android:layout_weight="1"
                         android:text="意见与反馈"
-                        android:textSize="@dimen/txtsize_title" />
+                        android:textSize="@dimen/textSize14" />
 
                 </LinearLayout>
 
@@ -292,7 +292,7 @@
                         android:layout_gravity="center_vertical"
                         android:layout_weight="1"
                         android:text="版本更新"
-                        android:textSize="@dimen/txtsize_title" />
+                        android:textSize="@dimen/textSize14" />
 
                 </LinearLayout>
 
@@ -324,7 +324,7 @@
                         android:layout_gravity="center_vertical"
                         android:layout_weight="1"
                         android:text="清除缓存"
-                        android:textSize="@dimen/txtsize_title" />
+                        android:textSize="@dimen/textSize14" />
 
                 </LinearLayout>
 
@@ -354,7 +354,7 @@
                         android:layout_gravity="center_vertical"
                         android:layout_weight="1"
                         android:text="关于"
-                        android:textSize="@dimen/txtsize_title" />
+                        android:textSize="@dimen/textSize14" />
 
                 </LinearLayout>
             </LinearLayout>
@@ -367,11 +367,10 @@
                 android:gravity="center"
                 android:layout_weight="1"
                 android:layout_marginTop="@dimen/size_dp_15"
-                android:layout_marginBottom="@dimen/size_dp_15"
                 android:background="@drawable/shape_xueqing_radius8"
                 android:text="退出登录"
                 android:textColor="@color/white"
-                android:textSize="@dimen/size_dp_16" />
+                android:textSize="@dimen/textSize14" />
 
             <TextView
                 android:id="@+id/testEnter"
diff --git a/app/src/main/res/layout/fragment_report.xml b/app/src/main/res/layout/fragment_report.xml
index 347526f..c460bf6 100644
--- a/app/src/main/res/layout/fragment_report.xml
+++ b/app/src/main/res/layout/fragment_report.xml
@@ -65,23 +65,6 @@
             android:visibility="gone" />
     </FrameLayout>
 
-    <RelativeLayout
-        android:id="@+id/rl_noData"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/white"
-        android:visibility="gone">
-
-        <TextView
-            android:id="@+id/tvNoData"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="30px"
-            android:gravity="center"
-            android:lineSpacingExtra="@dimen/size_dp_5"
-            android:text="如需使用该模块，请先前往\n个人中心—我的孩子\n绑定孩子账号"
-            android:textSize="@dimen/size_dp_16" />
-    </RelativeLayout>
 
     <android.support.v4.view.ViewPager
         android:id="@+id/viewPager"
--
libgit2 0.21.0