From c1a67969e749313c963a4ad57d6097e51a8d673f Mon Sep 17 00:00:00 2001
From: yxb <15805828761@163.com>
Date: Fri, 11 May 2018 16:27:42 +0800
Subject: [PATCH] no message

---
 app/libs/processor.jar                                                                         | Bin 5681 -> 0 bytes
 app/src/main/java/com/shunzhi/parent/adapter/SchoolListAdapter.java                            | 11 +++++++++++
 app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java |  3 ++-
 app/src/main/java/com/shunzhi/parent/ui/activity/MyChildActivity.java                          |  5 +++++
 app/src/main/java/com/shunzhi/parent/ui/activity/binding/SelectSchoolActivity.java             |  2 ++
 app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java                |  4 +---
 app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java                             | 21 ++++++++++++++-------
 app/src/main/res/layout/fragment_mine.xml                                                      |  5 +++--
 8 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/app/libs/processor.jar b/app/libs/processor.jar
index 952eada..7f3ef0c 100644
Binary files a/app/libs/processor.jar and b/app/libs/processor.jar differ
diff --git a/app/src/main/java/com/shunzhi/parent/adapter/SchoolListAdapter.java b/app/src/main/java/com/shunzhi/parent/adapter/SchoolListAdapter.java
index 7949b10..d7f1003 100644
--- a/app/src/main/java/com/shunzhi/parent/adapter/SchoolListAdapter.java
+++ b/app/src/main/java/com/shunzhi/parent/adapter/SchoolListAdapter.java
@@ -39,6 +39,17 @@ public class SchoolListAdapter extends BaseRecyclerViewAdapter<SortBean> {
 
     }
 
+
+   public void  setStart(){
+       ischeck = new boolean[list.size()];
+       for (int i=0;i<ischeck.length;i++){
+           ischeck[i]=false;
+       }
+       currentPosition=-1;
+
+    }
+
+
     @Override
     public void addAll(List<SortBean> data) {
         super.addAll(data);
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 395e2dd..55f870f 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
@@ -169,8 +169,9 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
                     AppConfig.getAppConfig(AppContext.getContext()).set(AppConfig.USER_ID, currentBean.getUserid());
 
                     if (currentBean.getStudentClass() != null && currentBean.getStudentClass().size() > 0) {
-//                    Log.e("qqqq--==","qqqqq");
                         AppConfig.getAppConfig(mIView.getBindActivity()).set(AppConfig.ISBINDING, "1");
+                    }else{
+                        AppConfig.getAppConfig(mIView.getBindActivity()).set(AppConfig.ISBINDING, "0");
                     }
 
                     String account = currentBean.getUserid();
diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/MyChildActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/MyChildActivity.java
index 1ac8a34..b1712b6 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/MyChildActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/MyChildActivity.java
@@ -102,6 +102,11 @@ public class MyChildActivity extends BaseMVPCompatActivity<MyChildContract.MyChi
     public void updateChildList(CurrentBean currentBean) {
         currlist.clear();
         List<ChildBean> list = currentBean.getStudentClass();
+        if (list.size() > 0) {
+            AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.ISBINDING, "1");
+        } else {
+            AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.ISBINDING, "0");
+        }
         currlist.addAll(list);
         if (childAdapter == null) {
             childAdapter = new ChildAdapter(this);
diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/binding/SelectSchoolActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/binding/SelectSchoolActivity.java
index 70ab4d4..0abb0b8 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/binding/SelectSchoolActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/binding/SelectSchoolActivity.java
@@ -226,7 +226,9 @@ public class SelectSchoolActivity extends BaseMVPCompatActivity<SchoolListContra
             schoolListAdapter.addAll(schoolList);
             schoollist.setAdapter(schoolListAdapter);
         } else {
+
             schoolListAdapter.addAll(schoolList);
+            schoolListAdapter.setStart();
             schoolListAdapter.notifyDataSetChanged();
         }
     }
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 2acbda4..2337f2f 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
@@ -79,9 +79,8 @@ public class WebViewActivity extends BaseCompatActivity {
             public void onClick(View v) {
                 if (type != -1 && type != AppConfig.ORDER_CENTER) {
                     startActivity(new Intent().setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP).setClass(WebViewActivity.this, MainActivity.class));
-                } else {
-                    finish();
                 }
+                finish();
             }
         });
 
@@ -101,7 +100,6 @@ public class WebViewActivity extends BaseCompatActivity {
         if (token != null && !"".equals(token) && !TextUtils.isEmpty(token)) {
             url = url + "&Token=" + token;
         }
-//        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/MineFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
index 7f09177..d9f04df 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
@@ -7,6 +7,7 @@ import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -16,6 +17,7 @@ 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.BuildConfig;
@@ -102,9 +104,10 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract
         String useName = AppConfig.getAppConfig(getContext()).get(AppConfig.USER_NAME);
         if (!TextUtils.isEmpty(useName)) AppConfig.ISLOGIN = true;
         else AppConfig.ISLOGIN = false;
-
-        if (!TextUtils.isEmpty(AppConfig.getAppConfig(getContext()).get(AppConfig.ISBINDING))) {
+        if (AppConfig.getAppConfig(getContext()).get(AppConfig.ISBINDING).equals("1")) {
             binding_state.setText("");
+        } else {
+            binding_state.setText("未绑定");
         }
 
         if (AppConfig.ISLOGIN) {
@@ -156,11 +159,15 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract
                 startNewActivity(OrderDetailActivity.class);
                 break;
             case R.id.layout_order:
-                Bundle bundle = new Bundle();
-                bundle.putString("url", AppConfig.BASE_URL_ORDER + "ParentOrderCenter.aspx?userid=" +
-                        AppConfig.getAppConfig(getContext()).get(AppConfig.USER_ID));
-                bundle.putInt("type", AppConfig.ORDER_CENTER);
-                startNewActivity(WebViewActivity.class, bundle);
+                if (AppConfig.getAppConfig(getContext()).get(AppConfig.ISBINDING).equals("1")) {
+                    Bundle bundle = new Bundle();
+                    bundle.putString("url", AppConfig.BASE_URL_ORDER + "ParentOrderCenter.aspx?userid=" +
+                            AppConfig.getAppConfig(getContext()).get(AppConfig.USER_ID));
+                    bundle.putInt("type", AppConfig.ORDER_CENTER);
+                    startNewActivity(WebViewActivity.class, bundle);
+                } else {
+                    ToastUtils.showToast("请先绑定孩子");
+                }
                 break;
             case R.id.tvExit:
                 clearUerinfo();
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index de1e990..2c24823 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -30,6 +30,7 @@
                 android:textSize="@dimen/sp_18" />
 
             <LinearLayout
+                android:layout_marginTop="20dp"
                 android:id="@+id/personinfo"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -73,8 +74,8 @@
                 </LinearLayout>
 
                 <ImageView
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
+                    android:layout_width="25dp"
+                    android:layout_height="25dp"
                     android:layout_marginRight="20dp"
                     android:layout_gravity="center_vertical"
                     android:src="@drawable/arrow_right" />
--
libgit2 0.21.0