机构导航功能开发

app/build.gradle

@@ -38,6 +38,7 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile project(':library')
+    //noinspection GradleCompatible
     compile 'com.android.support:design:26.1.0'
     compile 'com.jakewharton:butterknife:7.0.1'
     compile 'com.github.bumptech.glide:glide:3.7.0'

app/src/main/java/com/ynstkz/shitu/android/adapter/OrgNavigationGridAdapter.java

@@ -2,9 +2,12 @@ package com.ynstkz.shitu.android.adapter;
 
 import android.content.Context;
 import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
 
 import com.common.library.adapter.CCAdapterHolder;
 import com.common.library.adapter.CCListAdapter;
+import com.ynstkz.shitu.android.R;
 import com.ynstkz.shitu.android.bean.CourseNavigationBean;
 
 import java.util.List;
@@ -23,19 +26,25 @@ public class OrgNavigationGridAdapter extends CCListAdapter<CourseNavigationBean
     @Override
     public CCAdapterHolder<CourseNavigationBean> createHolder(int type) {
         return new CCAdapterHolder<CourseNavigationBean>() {
+
+            ImageView icon;
+            TextView tv_lab;
+
             @Override
             public int getResource() {
-                return 0;
+                return R.layout.item_org_navigation;
             }
 
             @Override
             public void initializeView(View convertView) {
-
+                icon = convertView.findViewById(R.id.iv_icon);
+                tv_lab = convertView.findViewById(R.id.tv_lab);
             }
 
             @Override
             public void updateView(CourseNavigationBean content, int position) {
-
+                icon.setImageResource(content.getIcon_ids());
+                tv_lab.setText(content.getLab());
             }
         };
     }

app/src/main/java/com/ynstkz/shitu/android/bean/CourseNavigationBean.java

@@ -10,6 +10,8 @@ public class CourseNavigationBean extends BaseBean{
 
     private int icon_ids;
 
+    private String lab;
+
     public int getIcon_ids() {
         return icon_ids;
     }
@@ -17,4 +19,12 @@ public class CourseNavigationBean extends BaseBean{
     public void setIcon_ids(int icon_ids) {
         this.icon_ids = icon_ids;
     }
+
+    public String getLab() {
+        return lab;
+    }
+
+    public void setLab(String lab) {
+        this.lab = lab;
+    }
 }

app/src/main/java/com/ynstkz/shitu/android/bean/OrgNavigationBean.java

@@ -0,0 +1,70 @@
+package com.ynstkz.shitu.android.bean;
+
+import com.ynstkz.shitu.android.base.BaseBean;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 作者：fuchangle on 2018/3/5 14:21
+ */
+
+public class OrgNavigationBean extends BaseBean{
+
+    private List<DataBean> data;
+
+
+    public List<DataBean> getData() {
+        return data;
+    }
+
+    public void setData(List<DataBean> data) {
+        this.data = data;
+    }
+
+    public static class DataBean implements Serializable{
+        /**
+         * navigateId : 1
+         * title : 学前教育
+         * icon : null
+         * linkUrl : http://test.com
+         */
+
+        private int navigateId;
+        private String title;
+        private String icon;
+        private String linkUrl;
+
+        public int getNavigateId() {
+            return navigateId;
+        }
+
+        public void setNavigateId(int navigateId) {
+            this.navigateId = navigateId;
+        }
+
+        public String getTitle() {
+            return title;
+        }
+
+        public void setTitle(String title) {
+            this.title = title;
+        }
+
+        public String getIcon() {
+            return icon;
+        }
+
+        public void setIcon(String icon) {
+            this.icon = icon;
+        }
+
+        public String getLinkUrl() {
+            return linkUrl;
+        }
+
+        public void setLinkUrl(String linkUrl) {
+            this.linkUrl = linkUrl;
+        }
+    }
+}

app/src/main/java/com/ynstkz/shitu/android/data/RequestGroup.java

@@ -274,6 +274,14 @@ public class RequestGroup {
         params.put("pageNumber",pageNumber);
         params.put("pageSize", pageSize);
         params.put("location", location);
-        OkHttpUtils.get().url(UrlCat.UTL_AGENCY_RECOMMEND_LIST).params(params).build().execute(callback);
+        OkHttpUtils.get().url(UrlCat.URL_AGENCY_RECOMMEND_LIST).params(params).build().execute(callback);
+    }
+
+    /**
+     * 获取机构导航
+     */
+    public static void getOrgNavigation(Callback callback){
+        Map<String, String> params = getSystemParams();
+        OkHttpUtils.get().url(UrlCat.URL_AGENCY_NAVIGATE_LIST).params(params).build().execute(callback);
     }
 }

app/src/main/java/com/ynstkz/shitu/android/data/UrlCat.java

@@ -116,7 +116,12 @@ public class UrlCat {
     /**
      * 推荐机构列表
      */
-    public static final String UTL_AGENCY_RECOMMEND_LIST = HOST + "api/agency/recommend/list";
+    public static final String URL_AGENCY_RECOMMEND_LIST = HOST + "api/agency/recommend/list";
+
+    /**
+     * 机构导航
+     */
+    public static final String URL_AGENCY_NAVIGATE_LIST = HOST + "api/index/agency/navigate/list";
 }
 
 

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

@@ -27,17 +27,23 @@ import com.ynstkz.shitu.android.R;
 import com.ynstkz.shitu.android.activity.LocationSelectActivity;
 import com.ynstkz.shitu.android.adapter.HomeBannerAdapter;
 import com.ynstkz.shitu.android.adapter.OrgListAdapter;
+import com.ynstkz.shitu.android.adapter.OrgNavigationGridAdapter;
 import com.ynstkz.shitu.android.base.BaseFragment;
+import com.ynstkz.shitu.android.bean.CourseNavigationBean;
 import com.ynstkz.shitu.android.bean.HomeBannerBean;
 import com.ynstkz.shitu.android.bean.OrgItemBean;
+import com.ynstkz.shitu.android.bean.OrgNavigationBean;
 import com.ynstkz.shitu.android.bean.OrgRecommendListBean;
 import com.ynstkz.shitu.android.data.RequestGroup;
 import com.ynstkz.shitu.android.event.LocationChangedEvent;
+import com.ynstkz.shitu.android.view.ScrollViewWithGridView;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import butterknife.Bind;
@@ -59,7 +65,7 @@ public class HomeFragment extends BaseFragment implements PullToRefreshBase.OnRe
     @Bind(R.id.viewpager)
     ViewPager viewpager;
     @Bind(R.id.gv_course_navigation)
-    GridView gvCourseNavigation;
+    ScrollViewWithGridView gvCourseNavigation;
     @Bind(R.id.sv_main)
     PullToRefreshScrollView svMain;
     @Bind(R.id.ll_location_select)
@@ -160,7 +166,37 @@ public class HomeFragment extends BaseFragment implements PullToRefreshBase.OnRe
      */
     private void getOrgNavigation() {
 
-
+//        RequestGroup.getOrgNavigation(new Callback() {
+//            @Override
+//            public Object parseNetworkResponse(Response response, int id) throws Exception {
+//                return new Gson().fromJson(response.body().string(), OrgNavigationBean.class);
+//            }
+//
+//            @Override
+//            public void onError(Call call, Exception e, int id) {
+//                showToast(getActivity(), getString(R.string.error_msg));
+//            }
+//
+//            @Override
+//            public void onResponse(Object response, int id) {
+//
+//            }
+//        });
+
+        int[] icons = new int[]{R.drawable.org_xueqian, R.drawable.org_chudeng, R.drawable.org_zhongdeng,
+            R.drawable.org_gaodeng, R.drawable.org_chengren, R.drawable.org_peixun, R.drawable.org_chuguo, R.drawable.org_other};
+        String[] labs = getResources().getStringArray(R.array.org_navigation);
+
+        List<CourseNavigationBean> listCourseNavigation = new ArrayList<>();
+        for(int i=0; i<8; i++){
+            CourseNavigationBean courseNavigationBean = new CourseNavigationBean();
+            courseNavigationBean.setIcon_ids(icons[i]);
+            courseNavigationBean.setLab(labs[i]);
+            listCourseNavigation.add(courseNavigationBean);
+        }
+        OrgNavigationGridAdapter orgNavigationGridAdapter = new OrgNavigationGridAdapter(getActivity(), listCourseNavigation);
+        gvCourseNavigation.setAdapter(orgNavigationGridAdapter);
+        orgNavigationGridAdapter.notifyDataSetChanged();
     }
 
     /**

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

@@ -39,17 +39,20 @@
 
            </RelativeLayout>
 
-           <GridView
+           <com.ynstkz.shitu.android.view.ScrollViewWithGridView
                android:id="@+id/gv_course_navigation"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:background="@color/white"
+               android:verticalSpacing="@dimen/company_10dp"
+               android:paddingBottom="@dimen/company_10dp"
                android:numColumns="4"/>
 
            <LinearLayout
                android:id="@+id/ll_org_main"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+               android:layout_marginTop="@dimen/company_10dp"
                android:orientation="vertical"/>
 
        </LinearLayout>

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

@@ -3,13 +3,14 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:background="@color/white">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:padding="@dimen/default_content_margin">
+        android:padding="10dp">
 
         <ImageView
             android:id="@+id/iv_headPic"

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

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_centerInParent="true">
+        
+        <ImageView
+            android:id="@+id/iv_icon"
+            android:layout_width="@dimen/company_50dp"
+            android:layout_height="@dimen/company_50dp"/>
+
+        <TextView
+            android:id="@+id/tv_lab"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="@dimen/company_12sp"
+            android:layout_marginTop="@dimen/company_5dp"
+            android:layout_gravity="center_horizontal"
+            android:textColor="@color/color_666"
+            android:text="学前教育"/>
+        
+    </LinearLayout>
+    
+</RelativeLayout>

app/src/main/res/values/arrays.xml

@@ -1,41 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string-array name="citys">
-        <item>北京</item>
-        <item>黑龙江</item>
-        <item>吉林</item>
-        <item>辽宁</item>
-        <item>天津</item>
-        <item>河南</item>
-        <item>河北</item>
-        <item>内蒙</item>
-        <item>山西</item>
-        <item>陕西</item>
-        <item>甘肃</item>
-        <item>新疆</item>
-        <item>宁夏</item>
-        <item>青海</item>
-        <item>云南</item>
-        <item>重庆</item>
-        <item>四川</item>
-        <item>广东</item>
-        <item>海南</item>
-        <item>贵州</item>
-        <item>广西</item>
-        <item>浙江</item>
-        <item>上海</item>
-        <item>江苏</item>
-        <item>湖北</item>
-        <item>湖南</item>
-        <item>江西</item>
-        <item>山东</item>
-        <item>安徽</item>
-        <item>福建</item>
-        <item>深圳</item>
-        <item>东莞</item>
-    </string-array>
-
     <string-array name="usercenter_option">
         <item>我的收藏</item>
         <item>我的评价</item>
@@ -44,4 +9,15 @@
 
     </string-array>
 
+    <string-array name="org_navigation">
+        <item>学前教育</item>
+        <item>初等教育</item>
+        <item>中等教育</item>
+        <item>高等教育</item>
+        <item>成人教育</item>
+        <item>培训机构</item>
+        <item>出国留学</item>
+        <item>其他</item>
+    </string-array>
+
 </resources>