From e04ba2c490ac3c3b24d1d1707d2fd907109cb078 Mon Sep 17 00:00:00 2001
From: 姚旭斌 <15805828761@163.com>
Date: Wed, 25 Apr 2018 17:20:50 +0800
Subject: [PATCH] no message

---
 app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java         |  9 +++++++--
 app/src/main/java/com/shunzhi/parent/ui/activity/BankActivity.java                   | 14 ++++++++++++--
 app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java      |  2 ++
 app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java                 | 14 ++++++++++++++
 app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplyReplaceCardFragment.java |  3 ++-
 app/src/main/java/com/shunzhi/parent/ui/fragment/report/ChengZhangFragment.java      | 18 +++++++++++++-----
 app/src/main/res/layout/fragment_cheng_zhang.xml                                     | 17 +++++++++++++++++
 app/src/main/res/layout/fragment_report.xml                                          |  8 ++++----
 8 files changed, 71 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java
index 5e0ec2e..5d3a457 100644
--- a/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java
+++ b/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java
@@ -1,6 +1,5 @@
 package com.shunzhi.parent.presenter.consult;
 
-import android.util.Log;
 import android.view.View;
 import android.widget.LinearLayout;
 
@@ -101,7 +100,13 @@ public class ConsultPresenter extends ConsultContract.ConsultPresenter {
         }, new Consumer<Throwable>() {
             @Override
             public void accept(Throwable throwable) throws Exception {
-                OkHttpExceptionUtil.handOkHttpException((HttpException) throwable);
+               try {
+                   OkHttpExceptionUtil.handOkHttpException((HttpException) throwable);
+               }catch (Exception e){
+
+                   e.printStackTrace();
+               }
+
             }
         }));
 
diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/BankActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/BankActivity.java
index e32d070..a198acb 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/BankActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/BankActivity.java
@@ -3,7 +3,10 @@ package com.shunzhi.parent.ui.activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.text.Spannable;
+import android.text.SpannableString;
 import android.text.TextUtils;
+import android.text.style.ForegroundColorSpan;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -41,8 +44,15 @@ public class BankActivity extends BaseCompatActivity {
             }
         });
         String info = getIntent().getStringExtra("info");
-        if (!TextUtils.isEmpty(info))
-            tv_info.setText(info);
+        if (!TextUtils.isEmpty(info)) {
+            if (info.equals("如果使用该应用，请前往激活孩子校园卡")) {
+                Spannable span = new SpannableString(info);
+                span.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.xueqing_blue)), 11, 23, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+                tv_info.setText(span);
+            } else {
+                tv_info.setText(info);
+            }
+        }
 
     }
 
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 45ed56f..46c4385 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
@@ -5,6 +5,7 @@ import android.content.Intent;
 import android.graphics.Bitmap;
 import android.os.Bundle;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
 import android.webkit.JavascriptInterface;
 import android.webkit.WebChromeClient;
@@ -134,6 +135,7 @@ public class WebViewActivity extends BaseCompatActivity {
 
         initWebView();
         initWebSetting(nesteScrollWebView.getSettings());
+        Log.e("aaaa",url);
         nesteScrollWebView.loadUrl(url);
     }
 
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 bad1ee9..0199cee 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
@@ -11,7 +11,10 @@ import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.view.ViewPager;
+import android.text.Spannable;
+import android.text.SpannableString;
 import android.text.TextUtils;
+import android.text.style.ForegroundColorSpan;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -68,6 +71,7 @@ public class ReportFragment extends BaseMVPCompatFragment<MyChildContract.MyChil
         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);
@@ -99,6 +103,13 @@ 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);
+    }
+
 
     @Override
     public void onResume() {
@@ -179,6 +190,9 @@ public class ReportFragment extends BaseMVPCompatFragment<MyChildContract.MyChil
             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 (TextUtils.isEmpty(currChildStr)) {
                 if (childlist != null && childlist.size() > 0) {
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplyReplaceCardFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplyReplaceCardFragment.java
index a207758..0306fd0 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplyReplaceCardFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplyReplaceCardFragment.java
@@ -10,7 +10,6 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.google.gson.Gson;
 import com.share.mvpsdk.base.BasePresenter;
@@ -81,6 +80,8 @@ public class ApplyReplaceCardFragment extends BaseMVPCompatFragment<ApplyReplace
                     mPresenter.ReplaceCardDetail(currChildBean.getStudentId(), cardnum);
                 }
                 break;
+            case R.id.bt_cancle:
+                getActivity().finish();
             default:
                 break;
         }
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 2b0a4ba..b077a89 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
@@ -6,7 +6,10 @@ import android.os.Message;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.RecyclerView;
+import android.text.Spannable;
+import android.text.SpannableString;
 import android.text.TextUtils;
+import android.text.style.ForegroundColorSpan;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -14,6 +17,7 @@ import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.amy.monthweek.materialcalendarview.MonthWeekMaterialCalendarView;
@@ -77,6 +81,8 @@ public class ChengZhangFragment extends BaseMVPCompatFragment<ReportContract.Rep
 
     LinearLayout layout_chengzhang, layout_report, layout_kaoqin, layout_buka, layout_qingjia;
 
+    RelativeLayout rl_noData;
+
     @Override
     public int getLayoutId() {
         return R.layout.fragment_cheng_zhang;
@@ -84,7 +90,7 @@ public class ChengZhangFragment extends BaseMVPCompatFragment<ReportContract.Rep
 
     @Override
     public void initUI(View view, @Nullable Bundle savedInstanceState) {
-
+        rl_noData = view.findViewById(R.id.rl_noData);
         layout_report = view.findViewById(R.id.layout_report);
         recyclerView = view.findViewById(R.id.recycle_report);
         layout_kaoqin = view.findViewById(R.id.layout_kaoqin);
@@ -111,8 +117,8 @@ public class ChengZhangFragment extends BaseMVPCompatFragment<ReportContract.Rep
 
         } else {
             layout_chengzhang.setVisibility(View.GONE);
-            layout_report.setVisibility(View.VISIBLE);
-
+            layout_report.setVisibility(View.GONE);
+            rl_noData.setVisibility(View.VISIBLE);
             initCalendarView();
             initReportList();
 
@@ -181,7 +187,10 @@ public class ChengZhangFragment extends BaseMVPCompatFragment<ReportContract.Rep
             backgroundAlpha(0.5f);
             View view1 = LayoutInflater.from(getActivity()).inflate(R.layout.dialog_view, null);
             TextView dialog_info = view1.findViewById(R.id.dialog_info);
-            dialog_info.setText("请前往订购中心\n订购“智能校卫”\n才能够使用相关应用功能");
+            String text="请前往订购中心\n订购“智能校卫”\n才能够使用相关应用功能";
+            Spannable span = new SpannableString(text);
+            span.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.xueqing_blue)),3,7,Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            dialog_info.setText(span);
             dialog_info.setGravity(Gravity.CENTER);
             TextView right_btn = view1.findViewById(R.id.right_btn);
             right_btn.setText("前往订购");
@@ -213,7 +222,6 @@ public class ChengZhangFragment extends BaseMVPCompatFragment<ReportContract.Rep
         }
 
         if (TextUtils.isEmpty(childBean.getCardNumber())) {
-
             BankActivity.newInstance(getActivity(), "如果使用该应用，请前往激活孩子校园卡");
             return;
 
diff --git a/app/src/main/res/layout/fragment_cheng_zhang.xml b/app/src/main/res/layout/fragment_cheng_zhang.xml
index 493834e..b3c35dd 100644
--- a/app/src/main/res/layout/fragment_cheng_zhang.xml
+++ b/app/src/main/res/layout/fragment_cheng_zhang.xml
@@ -120,5 +120,22 @@
         </com.amy.monthweek.materialcalendarview.MonthWeekMaterialCalendarView>
 
     </LinearLayout>
+    <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="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:lineSpacingExtra="@dimen/size_dp_5"
+            android:background="@drawable/baogao_back"
+            android:textColor="@color/xueqing_blue"
+            android:textSize="@dimen/size_dp_16" />
+    </RelativeLayout>
 
 </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_report.xml b/app/src/main/res/layout/fragment_report.xml
index 8b0c394..347526f 100644
--- a/app/src/main/res/layout/fragment_report.xml
+++ b/app/src/main/res/layout/fragment_report.xml
@@ -74,12 +74,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:background="@drawable/baogao_back"
+            android:layout_marginTop="30px"
+            android:gravity="center"
             android:lineSpacingExtra="@dimen/size_dp_5"
-            android:textColor="@color/xueqing_blue"
+            android:text="如需使用该模块，请先前往\n个人中心—我的孩子\n绑定孩子账号"
             android:textSize="@dimen/size_dp_16" />
     </RelativeLayout>
 
--
libgit2 0.21.0