From d7705eadded73e7562b40862e1db4c3b10102099 Mon Sep 17 00:00:00 2001
From: 姚旭斌 <15805828761@163.com>
Date: Wed, 21 Mar 2018 15:26:40 +0800
Subject: [PATCH] no message

---
 app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java               |   2 +-
 app/src/main/java/com/shunzhi/parent/presenter/consult/consultone/ConsultOnePresenter.java |   2 +-
 app/src/main/java/com/shunzhi/parent/presenter/mine/MyChildPresenter.java                  |   1 -
 app/src/main/java/com/shunzhi/parent/ui/activity/binding/CheckInfoActivity.java            |   3 ++-
 app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java            |  10 +++++++---
 app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java                         |  26 ++++++++++++++------------
 app/src/main/res/layout/activity_web_view.xml                                              |   5 ++++-
 app/src/main/res/layout/activity_webview.xml                                               | 128 --------------------------------------------------------------------------------------------------------------------------------
 app/src/main/res/layout/dialog_view.xml                                                    |  17 +++++++++--------
 app/src/main/res/layout/fragment_mine.xml                                                  |   1 +
 10 files changed, 39 insertions(+), 156 deletions(-)
 delete mode 100644 app/src/main/res/layout/activity_webview.xml

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 7711c74..04f9d60 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
@@ -77,7 +77,7 @@ public class ConsultPresenter extends ConsultContract.ConsultPresenter {
                     }
                     mIView.showBanners(guangGaoBeanList);
                 } else {
-                    ToastUtils.showToast(jsonObject.get("message").getAsString());
+//                    ToastUtils.showToast(jsonObject.get("message").getAsString());
                 }
             }
         }, new Consumer<Throwable>() {
diff --git a/app/src/main/java/com/shunzhi/parent/presenter/consult/consultone/ConsultOnePresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/consult/consultone/ConsultOnePresenter.java
index c778e30..40eeeeb 100644
--- a/app/src/main/java/com/shunzhi/parent/presenter/consult/consultone/ConsultOnePresenter.java
+++ b/app/src/main/java/com/shunzhi/parent/presenter/consult/consultone/ConsultOnePresenter.java
@@ -73,7 +73,7 @@ public class ConsultOnePresenter extends ConsultOneContract.ConsultOnePresenter{
                     }
                     mIView.showBanners(guangGaoBeanList);
                 }else {
-                    ToastUtils.showToast(jsonObject.get("message").getAsString());
+//                    ToastUtils.showToast(jsonObject.get("message").getAsString());
                 }
             }
         }, new Consumer<Throwable>() {
diff --git a/app/src/main/java/com/shunzhi/parent/presenter/mine/MyChildPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/mine/MyChildPresenter.java
index 1ea2442..72f6097 100644
--- a/app/src/main/java/com/shunzhi/parent/presenter/mine/MyChildPresenter.java
+++ b/app/src/main/java/com/shunzhi/parent/presenter/mine/MyChildPresenter.java
@@ -71,7 +71,6 @@ public class MyChildPresenter extends MyChildContract.MyChildPresenter {
             @Override
             public void accept(JsonObject jsonObject) throws Exception {
                 ToastUtils.showToast("绑定孩子成功");
-                Log.e("asdasda", jsonObject.get("data").toString());
                 if (jsonObject.get("data").toString().equals("null")) {
                     mIView.addChildSuccess("", "");
                 } else {
diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/binding/CheckInfoActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/binding/CheckInfoActivity.java
index 2073157..28a5d00 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/binding/CheckInfoActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/binding/CheckInfoActivity.java
@@ -101,7 +101,8 @@ public class CheckInfoActivity extends BaseMVPCompatActivity<MyChildContract.MyC
             right_btn.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    startActivity(new Intent().setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP).setClass(CheckInfoActivity.this, MyChildActivity.class));
+                    popupWindow.dismiss();
+                    startActivity(new Intent().setFlags(Intent.FLAG_ACTIVITY_NEW_TASK|Intent.FLAG_ACTIVITY_CLEAR_TASK).setClass(CheckInfoActivity.this, MyChildActivity.class));
                     finish();
                 }
             });
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 16d5e92..5fd9d26 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
@@ -40,6 +40,7 @@ public class WebViewActivity extends BaseCompatActivity {
         Intent intent = new Intent(context, WebViewActivity.class);
         intent.putExtra("url", url);
         intent.putExtra("type", type);
+        intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
         context.startActivity(intent);
     }
 
@@ -57,7 +58,7 @@ public class WebViewActivity extends BaseCompatActivity {
     @Override
     protected void initView(Bundle savedInstanceState) {
 
-        binding_success = findViewById(R.id.binding_success);
+//        binding_success = findViewById(R.id.binding_success);
 
         binding_success = findViewById(R.id.binding_success1);
 
@@ -78,7 +79,7 @@ public class WebViewActivity extends BaseCompatActivity {
 
         nesteScrollWebView = findViewById(R.id.nesteScrollWebView);
 
-        nesteScrollWebView = findViewById(R.id.webView);
+//        nesteScrollWebView = findViewById(R.id.webView);
 
         pvWeb = findViewById(R.id.pb_web);
         type = getIntent().getIntExtra("type", 0);
@@ -106,6 +107,9 @@ public class WebViewActivity extends BaseCompatActivity {
             binding_success.setVisibility(View.GONE);
             binding_success2.setVisibility(View.GONE);
             title_web.setVisibility(View.GONE);
+            LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) nesteScrollWebView.getLayoutParams();
+            lp.setMargins(0, 0, 0, 0);
+            nesteScrollWebView.setLayoutParams(lp);
 
         }
 
@@ -117,7 +121,7 @@ public class WebViewActivity extends BaseCompatActivity {
 
     @Override
     protected int getLayoutId() {
-        return R.layout.activity_webview;
+        return R.layout.activity_web_view;
     }
 
     @Override
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 f6a66b9..9cb5519 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
@@ -16,7 +16,6 @@ import com.makeramen.roundedimageview.RoundedImageView;
 import com.share.mvpsdk.base.BasePresenter;
 import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;
 import com.share.mvpsdk.utils.CacheUtils;
-import com.share.mvpsdk.utils.ToastUtils;
 import com.shunzhi.parent.AppConfig;
 import com.shunzhi.parent.AppContext;
 import com.shunzhi.parent.R;
@@ -29,13 +28,11 @@ import com.shunzhi.parent.ui.activity.PersonInfoActivity;
 import com.shunzhi.parent.ui.activity.mywebview.WebViewActivity;
 import com.shunzhi.parent.ui.activity.orderdetail.OrderDetailActivity;
 
-import static java.util.ResourceBundle.clearCache;
-
 public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract.LoginPresenter, LoginAndRegisterContract.ILoginModel>
         implements MineContract.IMineView, View.OnClickListener {
-    LinearLayout childlayout, personinfo, layout_orderDetail, layout_order,layout_cache;
+    LinearLayout childlayout, personinfo, layout_orderDetail, layout_order, layout_cache, layout_about;
     RoundedImageView user_photo;
-    TextView user_name, user_mobile, tvExit,binding_state;
+    TextView user_name, user_mobile, tvExit, binding_state;
 
     @NonNull
     @Override
@@ -54,7 +51,9 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract
         personinfo = view.findViewById(R.id.personinfo);
         layout_order = view.findViewById(R.id.layout_order);
         layout_orderDetail = view.findViewById(R.id.layout_orderDetail);
-        layout_cache=view.findViewById(R.id.layout_cache);
+        layout_cache = view.findViewById(R.id.layout_cache);
+        layout_about = view.findViewById(R.id.layout_about);
+        layout_about.setOnClickListener(this);
         layout_cache.setOnClickListener(this);
         childlayout.setOnClickListener(this);
         personinfo.setOnClickListener(this);
@@ -65,17 +64,17 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract
         user_mobile = view.findViewById(R.id.user_mobile);
         tvExit = view.findViewById(R.id.tvExit);
         tvExit.setOnClickListener(this);
-        binding_state=view.findViewById(R.id.binding_state);
-        if(AppConfig.ISBINDING){
+        binding_state = view.findViewById(R.id.binding_state);
+        if (AppConfig.ISBINDING) {
             binding_state.setText("");
         }
 
     }
 
-    private void  setPersonInfo() {
+    private void setPersonInfo() {
         if (AppConfig.ISLOGIN) {
             String url = AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_IMAGE);
-            ToastUtils.showToast(url);
+//            ToastUtils.showToast(url);
             if (!TextUtils.isEmpty(url)) {
                 Glide.with(getActivity()).load(url).asBitmap().error(R.drawable.test).centerCrop().into(user_photo);
             } else {
@@ -119,6 +118,9 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract
             case R.id.layout_cache:
                 clearMyCache();
                 break;
+            case R.id.layout_about:
+                WebViewActivity.getInstance(getActivity(),AppConfig.BASE_URL_ORDER+"About.html",-1);
+                break;
             default:
                 break;
         }
@@ -126,9 +128,9 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract
 
     private void clearMyCache() {
 
-        AlertDialog.Builder builder=new AlertDialog.Builder(getActivity());
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         try {
-            builder.setMessage("清理缓存"+CacheUtils.getCacheSize(getActivity())+"")
+            builder.setMessage("清理缓存" + CacheUtils.getCacheSize(getActivity()) + "")
                     .setPositiveButton("取消", new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialogInterface, int i) {
diff --git a/app/src/main/res/layout/activity_web_view.xml b/app/src/main/res/layout/activity_web_view.xml
index 54f3164..bf144e2 100644
--- a/app/src/main/res/layout/activity_web_view.xml
+++ b/app/src/main/res/layout/activity_web_view.xml
@@ -39,7 +39,7 @@
     </RelativeLayout>
 
     <LinearLayout
-        android:id="@+id/binding_success"
+        android:id="@+id/binding_success1"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center"
@@ -122,6 +122,9 @@
     <com.share.mvpsdk.widgets.NestedScrollWebView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_marginTop="10dp"
         android:id="@+id/nesteScrollWebView"
         ></com.share.mvpsdk.widgets.NestedScrollWebView>
 
diff --git a/app/src/main/res/layout/activity_webview.xml b/app/src/main/res/layout/activity_webview.xml
deleted file mode 100644
index 7bf3987..0000000
--- a/app/src/main/res/layout/activity_webview.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:background="@color/bgColor">
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:background="@color/back_top"
-        android:layout_height="?android:actionBarSize"
-        android:orientation="horizontal"
-        >
-        <ImageView
-            android:id="@+id/close_btn"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:paddingLeft="@dimen/size_dp_15"
-            android:src="@drawable/back"
-            android:paddingRight="@dimen/size_dp_15"
-            android:textColor="@color/textColor"
-            android:textSize="@dimen/textSize16" />
-        <TextView
-            android:id="@+id/title_web"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="订购中心"
-            android:textSize="@dimen/txtsize_title"
-            android:layout_centerInParent="true"
-            android:visibility="gone"
-            android:textColor="@color/textColor"
-
-            />
-
-    </RelativeLayout>
-
-    <ProgressBar
-        android:id="@+id/pb_web"
-        style="?android:attr/progressBarStyleHorizontal"
-        android:layout_width="match_parent"
-        android:layout_height="3dp"
-        android:progressDrawable="@drawable/web_progress_bar_bg"
-        android:visibility="gone"/>
-
-    <LinearLayout
-        android:id="@+id/binding_success1"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:background="@color/white"
-        android:layout_marginLeft="20dp"
-        android:padding="30dp"
-        android:layout_marginRight="20dp"
-
-        >
-
-        <ImageView
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:background="@drawable/success_big" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_marginLeft="20dp"
-            android:text="绑定成功"
-            android:gravity="center"
-            android:textColor="@color/textColor"
-            android:textSize="@dimen/txtsize_headline" />
-
-    </LinearLayout>
-    <LinearLayout
-        android:id="@+id/binding_success2"
-        android:visibility="gone"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:background="@color/white"
-        android:layout_marginLeft="20dp"
-        android:padding="30dp"
-        android:orientation="vertical"
-        android:layout_marginRight="20dp"
-
-        >
-        <TextView
-            android:id="@+id/tv_info"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_marginLeft="20dp"
-            android:text="生成孩子“汇作业”账号为：sz1803081515，初始密码为：sz1803081515（与账号相同）。孩子可以下载“汇作业”app进行使用"
-            android:gravity="center"
-            android:textColor="@color/textColor"
-            android:textSize="@dimen/txtsize_headline" />
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:gravity="center"
-            >
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_marginLeft="20dp"
-            android:text="下载地址:"
-            android:textColor="@color/textColor"
-            android:textSize="@dimen/txtsize_headline" />
-        <TextView
-            android:id="@+id/zuoye"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_marginLeft="20dp"
-            android:text="汇作业"
-            android:gravity="center"
-            android:textColor="@color/textBlue"
-            android:textSize="@dimen/txtsize_headline" />
-        </LinearLayout>
-
-    </LinearLayout>
-    <com.share.mvpsdk.widgets.NestedScrollWebView
-        android:id="@+id/webView"
-        android:layout_height="match_parent"
-        android:layout_width="match_parent"
-        android:layout_marginTop="20dp"
-        android:layout_marginRight="20dp"
-        android:layout_marginLeft="20dp"
-        />
-
-</LinearLayout>
diff --git a/app/src/main/res/layout/dialog_view.xml b/app/src/main/res/layout/dialog_view.xml
index abc1809..6cc9cef 100644
--- a/app/src/main/res/layout/dialog_view.xml
+++ b/app/src/main/res/layout/dialog_view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="300dp"
+    android:layout_width="260dp"
     android:layout_gravity="center"
     android:layout_height="wrap_content"
     android:background="#00000000"
@@ -8,11 +8,12 @@
 
     <TextView
         android:id="@+id/dialog_info"
-        android:layout_width="300dp"
-        android:layout_height="200dp"
+        android:layout_width="260dp"
+        android:layout_height="180dp"
         android:gravity="center"
-        android:textSize="@dimen/txtsize_headline"
+        android:textSize="@dimen/sp_18"
         android:layout_gravity="center"
+        android:padding="@dimen/size_dp_10"
         android:background="@drawable/rudiobtn_white" />
 
     <LinearLayout
@@ -22,22 +23,22 @@
 
         <TextView
             android:id="@+id/cancel_btn"
-            android:layout_width="140dp"
+            android:layout_width="120dp"
             android:layout_height="40dp"
             android:gravity="center"
             android:textColor="@color/white"
-            android:textSize="@dimen/txtsize_title"
+            android:textSize="@dimen/sp_16"
             android:background="@drawable/rudiobtn"
             android:text="取消" />
 
         <TextView
             android:id="@+id/right_btn"
             android:layout_marginLeft="20dp"
-            android:layout_width="140dp"
+            android:layout_width="120dp"
             android:layout_height="40dp"
             android:gravity="center"
             android:textColor="@color/white"
-            android:textSize="@dimen/txtsize_title"
+            android:textSize="@dimen/sp_16"
             android:background="@drawable/rudiobtn"
             android:text="确定" />
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index 7d5afe9..42c5ac9 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -299,6 +299,7 @@
                     android:layout_marginRight="15dp"
                     android:background="@color/bottomline" />
                 <LinearLayout
+                    android:id="@+id/layout_about"
                     android:layout_width="match_parent"
                     android:layout_height="?android:actionBarSize"
                     android:gravity="center_vertical"
--
libgit2 0.21.0