From 8afee2bd1e51efccbe98689758c1f6b9ab1d314a Mon Sep 17 00:00:00 2001
From: 姚旭斌 <15805828761@163.com>
Date: Sat, 24 Mar 2018 17:31:29 +0800
Subject: [PATCH] no message

---
 app/src/main/AndroidManifest.xml                                                   |  1 -
 app/src/main/java/com/shunzhi/parent/adapter/SchoolListAdapter.java                | 15 ++++++++++-----
 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    |  5 ++---
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e03b275..0ed9333 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -144,7 +144,6 @@
 
         <activity
             android:name=".ui.MainActivity"
-            android:launchMode="singleInstance"
             android:screenOrientation="portrait"/>
 
         <activity
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 8db72ea..2a2d876 100644
--- a/app/src/main/java/com/shunzhi/parent/adapter/SchoolListAdapter.java
+++ b/app/src/main/java/com/shunzhi/parent/adapter/SchoolListAdapter.java
@@ -32,7 +32,6 @@ public class SchoolListAdapter extends BaseRecyclerViewAdapter<SortBean> {
     public SchoolListAdapter(Context context, List<SortBean> list) {
         this.context = context;
         this.list = list;
-        Log.e("sss-===",list.size()+"");
         ischeck = new boolean[list.size()];
         for (int i=0;i<ischeck.length;i++){
             ischeck[i]=false;
@@ -93,12 +92,18 @@ public class SchoolListAdapter extends BaseRecyclerViewAdapter<SortBean> {
             item_view.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    ischeck[position] = true;
-                    if(currentPosition!=-1) {
+                    if(ischeck[position]){
+                        currentPosition=-1;
                         ischeck[currentPosition] = false;
+                        currentSortBean = null;
+                    }else {
+                        ischeck[position] = true;
+                        if (currentPosition != -1) {
+                            ischeck[currentPosition] = false;
+                        }
+                        currentPosition = position;
+                        currentSortBean = object;
                     }
-                    currentPosition = position;
-                    currentSortBean=object;
                     notifyDataSetChanged();
                 }
             });
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 fa45705..2df4562 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
@@ -96,7 +96,7 @@ public class SelectSchoolActivity extends BaseMVPCompatActivity<SchoolListContra
     }
 
     private void setSchoolList() {
-        mPresenter.schoolListResult(AppContext.getInstance().cityName, "");
+        mPresenter.schoolListResult(AppContext.getInstance().district, "");
     }
 
     @Override
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 b92dec9..a50aa58 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
@@ -4,7 +4,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.View;
 import android.webkit.JavascriptInterface;
 import android.webkit.WebChromeClient;
@@ -68,7 +67,7 @@ public class WebViewActivity extends BaseCompatActivity {
             @Override
             public void onClick(View v) {
                 if(type!=-1&&type!= AppConfig.ORDER_CENTER) {
-                    startActivity(new Intent().setClass(WebViewActivity.this, MainActivity.class));
+                    startActivity(new Intent().setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP).setClass(WebViewActivity.this, MainActivity.class));
                 }else{
                     finish();
                 }
@@ -134,7 +133,7 @@ public class WebViewActivity extends BaseCompatActivity {
         } else {
             super.onBackPressedSupport();
             if (type != -1 && type != AppConfig.ORDER_CENTER) {
-                startActivity(new Intent().setClass(this, MainActivity.class));
+                startActivity(new Intent().setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP).setClass(this, MainActivity.class));
             }
         }
     }
--
libgit2 0.21.0