优化机构列表

app/src/main/java/com/ynstkz/shitu/android/activity/OrgListActivity.java

@@ -1,21 +1,36 @@
 package com.ynstkz.shitu.android.activity;
 
-import android.content.Context;
-import android.util.AttributeSet;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
 import android.view.View;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
 
 import com.ynstkz.shitu.android.R;
 import com.ynstkz.shitu.android.base.TitleBarActivity;
+import com.ynstkz.shitu.android.fragment.OrgListFragment;
+
+import butterknife.Bind;
 
 /**
  * 作者：fuchangle on 2018/3/7 17:08
  */
 
-public class OrgListActivity extends TitleBarActivity{
+public class OrgListActivity extends TitleBarActivity {
+
+    @Bind(R.id.tv_title)
+    TextView tvTitle;
+    @Bind(R.id.view_title)
+    RelativeLayout viewTitle;
+    private OrgListFragment orgListFragment;
+    private boolean isHideTitleView;
 
     @Override
-    public View onCreateView(String name, Context context, AttributeSet attrs) {
-        return super.onCreateView(name, context, attrs);
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        initView();
+        initData();
     }
 
     @Override
@@ -23,4 +38,16 @@ public class OrgListActivity extends TitleBarActivity{
         return R.layout.activity_org_list;
     }
 
+    private void initView() {
+        tvTitle.setText("机构列表");
+        orgListFragment = (OrgListFragment) getSupportFragmentManager().findFragmentById(R.id.fm_org_list);
+    }
+
+    private void initData() {
+        isHideTitleView = getIntent().getBooleanExtra("isHideTitleView", false);
+        if (isHideTitleView) {
+            orgListFragment.showHideFilterView(View.GONE);
+        }
+    }
+
 }

app/src/main/java/com/ynstkz/shitu/android/fragment/HomeFragment.java

@@ -16,6 +16,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
+import android.widget.AdapterView;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -145,6 +146,7 @@ public class HomeFragment extends BaseFragment implements PullToRefreshBase.OnRe
                     if(!TextUtils.isEmpty(searchKey)){
                         Intent intent = new Intent(getActivity(), OrgListActivity.class);
                         intent.putExtra("searchKey", searchKey);
+                        intent.putExtra("isHideTitleView", true);
                         startActivity(intent);
                     } else {
                         showToast("搜索关键字不能为空");
@@ -153,6 +155,18 @@ public class HomeFragment extends BaseFragment implements PullToRefreshBase.OnRe
                 return false;
             }
         });
+
+        /**
+         * 机构导航
+         */
+        gvCourseNavigation.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
+                Intent intent = new Intent(getActivity(), OrgListActivity.class);
+                intent.putExtra("isHideTitleView", true);
+                startActivity(intent);
+            }
+        });
     }
 
     /**

app/src/main/java/com/ynstkz/shitu/android/fragment/OrgListFragment.java

@@ -6,6 +6,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
+import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.TextView;
 
@@ -39,12 +40,16 @@ import okhttp3.Response;
  * 作者：fuchangle on 2018/1/29 11:43
  */
 
-public class OrgListFragment extends BaseFragment implements PullToRefreshBase.OnRefreshListener2<ListView>{
+public class OrgListFragment extends BaseFragment implements PullToRefreshBase.OnRefreshListener2<ListView> {
 
     @Bind(R.id.tv_location)
     TextView tvLocation;
     @Bind(R.id.pullToRefresh)
     PullToRefreshListView pullToRefresh;
+    @Bind(R.id.ll_filter_main)
+    LinearLayout llFilterMain;
+    @Bind(R.id.ll_home_title)
+    LinearLayout llHomeTitle;
 
     private int pageNumber;
     private List<OrgItemBean> listOrg;
@@ -79,7 +84,7 @@ public class OrgListFragment extends BaseFragment implements PullToRefreshBase.O
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
                 try {
                     Intent intent = new Intent(getActivity(), OrgDetailActivity.class);
-                    intent.putExtra("memberId", ((OrgItemBean)adapterView.getAdapter().getItem(i)).getMemberId());
+                    intent.putExtra("memberId", ((OrgItemBean) adapterView.getAdapter().getItem(i)).getMemberId());
                     startActivity(intent);
                 } catch (Exception e) {
                     e.printStackTrace();
@@ -96,7 +101,7 @@ public class OrgListFragment extends BaseFragment implements PullToRefreshBase.O
 
     @Override
     public void onPullUpToRefresh(PullToRefreshBase<ListView> refreshView) {
-        pageNumber ++;
+        pageNumber++;
         getOrgList(longitude + "," + latitude);
     }
 
@@ -150,6 +155,15 @@ public class OrgListFragment extends BaseFragment implements PullToRefreshBase.O
         });
     }
 
+    /**
+     * 显示和隐藏筛选view
+     *
+     * @param visibility
+     */
+    public void showHideFilterView(int visibility) {
+        llHomeTitle.setVisibility(visibility);
+    }
+
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onMessageEvent(LocationChangedEvent event) {
         tvLocation.setText(event.getAmapLocation().getDistrict());

app/src/main/res/layout/activity_org_list.xml

@@ -7,7 +7,7 @@
     <include layout="@layout/view_title"/>
 
     <fragment
-        android:id="@+id/fm_nearby"
+        android:id="@+id/fm_org_list"
         android:name="com.ynstkz.shitu.android.fragment.OrgListFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>

app/src/main/res/layout/fm_nearby.xml

@@ -5,6 +5,7 @@
     android:orientation="vertical">
 
     <LinearLayout
+        android:id="@+id/ll_home_title"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
         android:orientation="vertical">
@@ -14,6 +15,7 @@
     </LinearLayout>
 
     <LinearLayout
+        android:id="@+id/ll_filter_main"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"