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 2214e1a..7949b10 100644 --- a/app/src/main/java/com/shunzhi/parent/adapter/SchoolListAdapter.java +++ b/app/src/main/java/com/shunzhi/parent/adapter/SchoolListAdapter.java @@ -72,7 +72,6 @@ public class SchoolListAdapter extends BaseRecyclerViewAdapter { @Override public void onBindViewHolder(final SortBean object, final int position) { select_school.setVisibility(View.INVISIBLE); - Log.e("1111-===",position+""); if (ischeck[position] ==true) { select_school.setVisibility(View.VISIBLE); } 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 2df4562..70ab4d4 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 @@ -5,7 +5,12 @@ import android.os.Bundle; import android.support.annotation.NonNull; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; +import android.text.Editable; +import android.text.TextUtils; +import android.text.TextWatcher; +import android.util.Log; import android.view.View; +import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; @@ -41,12 +46,13 @@ public class SelectSchoolActivity extends BaseMVPCompatActivity list = new ArrayList<>(); + private List currList = new ArrayList<>(); SchoolListAdapter schoolListAdapter; int schoolId; CityPicker cityPicker = null; + EditText et_search; @NonNull @Override @@ -74,6 +80,10 @@ public class SelectSchoolActivity extends BaseMVPCompatActivity list = new ArrayList<>(); + if (!TextUtils.isEmpty(s)) { + for (int i = 0; i < currList.size(); i++) { + if (currList.get(i).school_name.contains(s)) { + list.add(currList.get(i)); + } + } + showResult(list); + return; + } + showResult(currList); + } + @Override public void showList(List list) { + currList.clear(); + currList.addAll(list); + showResult(list); + + } + + void showResult(List list) { final List schoolList = OrderedSortSmodel(list); - if(schoolListAdapter==null){ - schoolListAdapter = new SchoolListAdapter(this, schoolList); - schoolListAdapter.addAll(schoolList); - schoollist.setAdapter(schoolListAdapter); - }else{ + if (schoolListAdapter == null) { + schoolListAdapter = new SchoolListAdapter(this, schoolList); + schoolListAdapter.addAll(schoolList); + schoollist.setAdapter(schoolListAdapter); + } else { schoolListAdapter.addAll(schoolList); schoolListAdapter.notifyDataSetChanged(); } } + @Override public void showChild(CurrentBean currentBean) { if (currentBean.isNew() == 0) { startActivity(new Intent().putExtra("school_id", schoolId).setClass(SelectSchoolActivity.this, CheckInfoActivity.class)); } else { - startActivity(new Intent().putExtra("school_id",schoolId).setClass(SelectSchoolActivity.this, InviteCodeActivity.class)); + startActivity(new Intent().putExtra("school_id", schoolId).setClass(SelectSchoolActivity.this, InviteCodeActivity.class)); } } @@ -216,8 +250,27 @@ public class SelectSchoolActivity extends BaseMVPCompatActivity - + android:orientation="vertical"> + + - + android:layout_height="wrap_content"> + + + android:paddingBottom="5dp" + android:paddingTop="5dp"> - + android:gravity="center_horizontal" + android:hint="请输入搜索内容" + android:textSize="@dimen/sp_16" /> + + + + android:layout_marginTop="5dp" + android:background="#77dddddd" /> @@ -95,16 +96,14 @@ android:id="@+id/go_next" android:layout_width="match_parent" android:layout_height="40dp" + android:layout_marginBottom="10dp" android:layout_marginLeft="10dp" android:layout_marginRight="10dp" + android:background="@drawable/rudiobtn" + android:gravity="center" android:text="下一步" android:textColor="@color/white" - android:textSize="@dimen/txtsize_title" - android:gravity="center" - android:background="@drawable/rudiobtn" - android:layout_marginBottom="10dp" - /> - + android:textSize="@dimen/txtsize_title" /> \ No newline at end of file -- libgit2 0.21.0