对接结构列表接口

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

@@ -3,8 +3,15 @@ package com.ynstkz.shitu.android.activity;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 
+import com.common.library.okhttp.callback.Callback;
+import com.google.gson.Gson;
 import com.ynstkz.shitu.android.R;
 import com.ynstkz.shitu.android.base.TitleBarActivity;
+import com.ynstkz.shitu.android.bean.OrgDetailBean;
+import com.ynstkz.shitu.android.data.RequestGroup;
+
+import okhttp3.Call;
+import okhttp3.Response;
 
 /**
  * 机构详情
@@ -13,13 +20,62 @@ import com.ynstkz.shitu.android.base.TitleBarActivity;
 
 public class OrgDetailActivity extends TitleBarActivity{
 
+    private int memberId;
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        initView();
+        initData();
+        setListener();
     }
 
     @Override
     protected int getLayoutId() {
         return R.layout.activity_org_detail;
     }
+
+    private void initView(){
+
+    }
+
+    private void initData(){
+        memberId = getIntent().getIntExtra("memberId", 0);
+        getOrgDetail(memberId);
+    }
+
+    private void setListener(){
+
+    }
+
+    /**
+     * 获取机构详情
+     * @param memberId
+     */
+    private void getOrgDetail(int memberId){
+
+        RequestGroup.getOrgDetail(memberId+"", new Callback() {
+            @Override
+            public Object parseNetworkResponse(Response response, int id) throws Exception {
+                return new Gson().fromJson(response.body().string(), OrgDetailBean.class);
+            }
+
+            @Override
+            public void onError(Call call, Exception e, int id) {
+                showToast(getString(R.string.error_msg));
+            }
+
+            @Override
+            public void onResponse(Object response, int id) {
+                OrgDetailBean orgDetailBean = (OrgDetailBean)response;
+                if(orgDetailBean != null){
+                    if("200".equals(orgDetailBean.getCode())){
+                        showToast("success");
+                    } else {
+                        showToast(orgDetailBean.getMsg());
+                    }
+                }
+            }
+        });
+    }
 }

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

@@ -0,0 +1,12 @@
+package com.ynstkz.shitu.android.bean;
+
+import com.ynstkz.shitu.android.base.BaseBean;
+
+/**
+ * 作者：fuchangle on 2018/3/6 14:15
+ */
+
+public class CourseItemBean extends BaseBean{
+
+
+}

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

@@ -0,0 +1,80 @@
+package com.ynstkz.shitu.android.bean;
+
+import com.google.gson.annotations.SerializedName;
+import com.ynstkz.shitu.android.base.BaseBean;
+
+import java.util.List;
+
+/**
+ * 作者：fuchangle on 2018/3/6 15:39
+ */
+
+public class OrgDetailBean extends BaseBean{
+
+    private DataBean data;
+
+    public DataBean getData() {
+        return data;
+    }
+
+    public void setData(DataBean data) {
+        this.data = data;
+    }
+
+    public static class DataBean {
+        /**
+         * total : 1
+         * current : 1
+         * pages : 1
+         * size : 10
+         * records : [{"score":1,"address":"null","memberName":"首都英语培训机构","location":"","courseList":[],"viewCount":99,"headPic":null,"memberId":1}]
+         */
+
+        private int total;
+        private int current;
+        private int pages;
+        private int size;
+
+        private List<OrgItemBean> records;
+
+        public int getTotal() {
+            return total;
+        }
+
+        public void setTotal(int total) {
+            this.total = total;
+        }
+
+        public int getCurrent() {
+            return current;
+        }
+
+        public void setCurrent(int current) {
+            this.current = current;
+        }
+
+        public int getPages() {
+            return pages;
+        }
+
+        public void setPages(int pages) {
+            this.pages = pages;
+        }
+
+        public int getSize() {
+            return size;
+        }
+
+        public void setSize(int size) {
+            this.size = size;
+        }
+
+        public List<OrgItemBean> getRecords() {
+            return records;
+        }
+
+        public void OrgItemBean(List<OrgItemBean> records) {
+            this.records = records;
+        }
+    }
+}

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

@@ -10,55 +10,29 @@ import java.util.List;
 
 public class OrgItemBean extends BaseBean{
 
-    private int memberId;
-    private String memberCode;
+    private int score;
+    private String address;
     private String memberName;
-    private String memberType;
-    private int agencyId;
-    private String phone;
-    private Object licenseNum;
-    private Object licenseDateRange;
-    private Object typeId;
-    private Object regRegionId;
-    private Object regAddress;
-    private Object permitNum;
-    private Object permitDateRange;
-    private Object chargeMan;
-    private Object chargeManPhone;
-    private Object legalMan;
-    private Object legalManPhone;
-    private Object legalManIdCardNum;
-    private int vip;
-    private Object vipDateRange;
-    private int valid;
-    private Object operateRegionId;
-    private Object operateAddress;
-    private int auditStatus;
+    private String location;
     private int viewCount;
-    private Object headPic;
-    private Object introduction;
-    private String oprator;
-    private Object createTime;
-    private Object updateTime;
-    private int isDelete;
-    private Object eduAgencyShowPicList;
-    private Object eduCourseList;
-    private List<?> eduMemberPicList;
+    private String headPic;
+    private int memberId;
+    private List<CourseItemBean> courseList;
 
-    public int getMemberId() {
-        return memberId;
+    public int getScore() {
+        return score;
     }
 
-    public void setMemberId(int memberId) {
-        this.memberId = memberId;
+    public void setScore(int score) {
+        this.score = score;
     }
 
-    public String getMemberCode() {
-        return memberCode;
+    public String getAddress() {
+        return address;
     }
 
-    public void setMemberCode(String memberCode) {
-        this.memberCode = memberCode;
+    public void setAddress(String address) {
+        this.address = address;
     }
 
     public String getMemberName() {
@@ -69,172 +43,12 @@ public class OrgItemBean extends BaseBean{
         this.memberName = memberName;
     }
 
-    public String getMemberType() {
-        return memberType;
-    }
-
-    public void setMemberType(String memberType) {
-        this.memberType = memberType;
-    }
-
-    public int getAgencyId() {
-        return agencyId;
-    }
-
-    public void setAgencyId(int agencyId) {
-        this.agencyId = agencyId;
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
-
-    public Object getLicenseNum() {
-        return licenseNum;
-    }
-
-    public void setLicenseNum(Object licenseNum) {
-        this.licenseNum = licenseNum;
-    }
-
-    public Object getLicenseDateRange() {
-        return licenseDateRange;
-    }
-
-    public void setLicenseDateRange(Object licenseDateRange) {
-        this.licenseDateRange = licenseDateRange;
-    }
-
-    public Object getTypeId() {
-        return typeId;
-    }
-
-    public void setTypeId(Object typeId) {
-        this.typeId = typeId;
-    }
-
-    public Object getRegRegionId() {
-        return regRegionId;
-    }
-
-    public void setRegRegionId(Object regRegionId) {
-        this.regRegionId = regRegionId;
-    }
-
-    public Object getRegAddress() {
-        return regAddress;
-    }
-
-    public void setRegAddress(Object regAddress) {
-        this.regAddress = regAddress;
-    }
-
-    public Object getPermitNum() {
-        return permitNum;
-    }
-
-    public void setPermitNum(Object permitNum) {
-        this.permitNum = permitNum;
-    }
-
-    public Object getPermitDateRange() {
-        return permitDateRange;
-    }
-
-    public void setPermitDateRange(Object permitDateRange) {
-        this.permitDateRange = permitDateRange;
-    }
-
-    public Object getChargeMan() {
-        return chargeMan;
-    }
-
-    public void setChargeMan(Object chargeMan) {
-        this.chargeMan = chargeMan;
-    }
-
-    public Object getChargeManPhone() {
-        return chargeManPhone;
-    }
-
-    public void setChargeManPhone(Object chargeManPhone) {
-        this.chargeManPhone = chargeManPhone;
-    }
-
-    public Object getLegalMan() {
-        return legalMan;
-    }
-
-    public void setLegalMan(Object legalMan) {
-        this.legalMan = legalMan;
-    }
-
-    public Object getLegalManPhone() {
-        return legalManPhone;
-    }
-
-    public void setLegalManPhone(Object legalManPhone) {
-        this.legalManPhone = legalManPhone;
-    }
-
-    public Object getLegalManIdCardNum() {
-        return legalManIdCardNum;
-    }
-
-    public void setLegalManIdCardNum(Object legalManIdCardNum) {
-        this.legalManIdCardNum = legalManIdCardNum;
-    }
-
-    public int getVip() {
-        return vip;
-    }
-
-    public void setVip(int vip) {
-        this.vip = vip;
-    }
-
-    public Object getVipDateRange() {
-        return vipDateRange;
-    }
-
-    public void setVipDateRange(Object vipDateRange) {
-        this.vipDateRange = vipDateRange;
-    }
-
-    public int getValid() {
-        return valid;
-    }
-
-    public void setValid(int valid) {
-        this.valid = valid;
-    }
-
-    public Object getOperateRegionId() {
-        return operateRegionId;
-    }
-
-    public void setOperateRegionId(Object operateRegionId) {
-        this.operateRegionId = operateRegionId;
-    }
-
-    public Object getOperateAddress() {
-        return operateAddress;
-    }
-
-    public void setOperateAddress(Object operateAddress) {
-        this.operateAddress = operateAddress;
-    }
-
-    public int getAuditStatus() {
-        return auditStatus;
+    public String getLocation() {
+        return location;
     }
 
-    public void setAuditStatus(int auditStatus) {
-        this.auditStatus = auditStatus;
+    public void setLocation(String location) {
+        this.location = location;
     }
 
     public int getViewCount() {
@@ -245,75 +59,27 @@ public class OrgItemBean extends BaseBean{
         this.viewCount = viewCount;
     }
 
-    public Object getHeadPic() {
+    public String getHeadPic() {
         return headPic;
     }
 
-    public void setHeadPic(Object headPic) {
+    public void setHeadPic(String headPic) {
         this.headPic = headPic;
     }
 
-    public Object getIntroduction() {
-        return introduction;
-    }
-
-    public void setIntroduction(Object introduction) {
-        this.introduction = introduction;
-    }
-
-    public String getOprator() {
-        return oprator;
-    }
-
-    public void setOprator(String oprator) {
-        this.oprator = oprator;
-    }
-
-    public Object getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Object createTime) {
-        this.createTime = createTime;
-    }
-
-    public Object getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Object updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public int getIsDelete() {
-        return isDelete;
-    }
-
-    public void setIsDelete(int isDelete) {
-        this.isDelete = isDelete;
-    }
-
-    public Object getEduAgencyShowPicList() {
-        return eduAgencyShowPicList;
-    }
-
-    public void setEduAgencyShowPicList(Object eduAgencyShowPicList) {
-        this.eduAgencyShowPicList = eduAgencyShowPicList;
-    }
-
-    public Object getEduCourseList() {
-        return eduCourseList;
+    public int getMemberId() {
+        return memberId;
     }
 
-    public void setEduCourseList(Object eduCourseList) {
-        this.eduCourseList = eduCourseList;
+    public void setMemberId(int memberId) {
+        this.memberId = memberId;
     }
 
-    public List<?> getEduMemberPicList() {
-        return eduMemberPicList;
+    public List<CourseItemBean> getCourseList() {
+        return courseList;
     }
 
-    public void setEduMemberPicList(List<?> eduMemberPicList) {
-        this.eduMemberPicList = eduMemberPicList;
+    public void setCourseList(List<CourseItemBean> courseList) {
+        this.courseList = courseList;
     }
 }

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

@@ -0,0 +1,81 @@
+package com.ynstkz.shitu.android.bean;
+
+import com.google.gson.annotations.SerializedName;
+import com.ynstkz.shitu.android.base.BaseBean;
+
+import java.util.List;
+
+/**
+ * 作者：fuchangle on 2018/3/6 14:17
+ */
+
+public class OrgListBean extends BaseBean{
+
+
+    private DataBean data;
+
+    public DataBean getData() {
+        return data;
+    }
+
+    public void setData(DataBean data) {
+        this.data = data;
+    }
+
+    public static class DataBean {
+        /**
+         * total : 1
+         * current : 1
+         * pages : 1
+         * size : 10
+         * records : [{"score":1,"address":"null","memberName":"首都英语培训机构","location":"","courseList":[],"viewCount":99,"headPic":null,"memberId":1}]
+         */
+
+        private int total;
+        private int current;
+        private int pages;
+        private int size;
+        private List<OrgItemBean> records;
+
+        public int getTotal() {
+            return total;
+        }
+
+        public void setTotal(int total) {
+            this.total = total;
+        }
+
+        public int getCurrent() {
+            return current;
+        }
+
+        public void setCurrent(int current) {
+            this.current = current;
+        }
+
+        public int getPages() {
+            return pages;
+        }
+
+        public void setPages(int pages) {
+            this.pages = pages;
+        }
+
+        public int getSize() {
+            return size;
+        }
+
+        public void setSize(int size) {
+            this.size = size;
+        }
+
+        public List<OrgItemBean> getRecords() {
+            return records;
+        }
+
+        public void setRecords(List<OrgItemBean> records) {
+            this.records = records;
+        }
+
+    }
+}

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

@@ -284,4 +284,14 @@ public class RequestGroup {
         Map<String, String> params = getSystemParams();
         OkHttpUtils.get().url(UrlCat.URL_AGENCY_NAVIGATE_LIST).params(params).build().execute(callback);
     }
+
+    /**
+     * 机构详情
+     * @param memberId
+     */
+    public static void getOrgDetail(String memberId, Callback callback){
+        Map<String, String> params = getSystemParams();
+        params.put("memberId", memberId);
+        OkHttpUtils.get().url(UrlCat.URL_AGENCY_DETAIL).params(params).build().execute(callback);
+    }
 }

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

@@ -122,6 +122,11 @@ public class UrlCat {
      * 机构导航
      */
     public static final String URL_AGENCY_NAVIGATE_LIST = HOST + "api/index/agency/navigate/list";
+
+    /**
+     * 机构详情
+     */
+    public static final String URL_AGENCY_DETAIL = HOST + "api/agency/detail";
 }
 
 

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

@@ -1,17 +1,24 @@
 package com.ynstkz.shitu.android.fragment;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ListView;
 import android.widget.TextView;
 
 import com.common.library.okhttp.callback.Callback;
+import com.common.library.pulltorefresh.PullToRefreshBase;
+import com.common.library.pulltorefresh.PullToRefreshListView;
 import com.google.gson.Gson;
 import com.ynstkz.shitu.android.R;
+import com.ynstkz.shitu.android.activity.OrgDetailActivity;
+import com.ynstkz.shitu.android.adapter.OrgListAdapter;
 import com.ynstkz.shitu.android.base.BaseFragment;
 import com.ynstkz.shitu.android.bean.OrgItemBean;
-import com.ynstkz.shitu.android.bean.OrgRecommendListBean;
+import com.ynstkz.shitu.android.bean.OrgListBean;
 import com.ynstkz.shitu.android.data.RequestGroup;
 import com.ynstkz.shitu.android.event.LocationChangedEvent;
 
@@ -19,6 +26,7 @@ import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import butterknife.Bind;
@@ -31,10 +39,19 @@ import okhttp3.Response;
  * 作者：fuchangle on 2018/1/29 11:43
  */
 
-public class NearbyFragment extends BaseFragment {
+public class NearbyFragment extends BaseFragment implements PullToRefreshBase.OnRefreshListener2<ListView>{
 
     @Bind(R.id.tv_location)
     TextView tvLocation;
+    @Bind(R.id.pullToRefresh)
+    PullToRefreshListView pullToRefresh;
+
+    private int pageNumber;
+    private List<OrgItemBean> listOrg;
+    private OrgListAdapter orgListAdapter;
+
+    private double longitude;
+    private double latitude;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@@ -46,16 +63,41 @@ public class NearbyFragment extends BaseFragment {
         return view;
     }
 
-    private void initView(){
+    private void initView() {
         EventBus.getDefault().register(this);
+        pullToRefresh.setOnRefreshListener(this);
     }
 
-    private void initData(){
+    private void initData() {
 
     }
 
-    private void setListener(){
+    private void setListener() {
 
+        pullToRefresh.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            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());
+                    startActivity(intent);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+    }
+
+    @Override
+    public void onPullDownToRefresh(PullToRefreshBase<ListView> refreshView) {
+        pageNumber = 1;
+        getOrgList(longitude + "," + latitude);
+    }
+
+    @Override
+    public void onPullUpToRefresh(PullToRefreshBase<ListView> refreshView) {
+        pageNumber ++;
+        getOrgList(longitude + "," + latitude);
     }
 
     /**
@@ -63,10 +105,10 @@ public class NearbyFragment extends BaseFragment {
      */
     private void getOrgList(String location) {
 
-        RequestGroup.getNearbyAgencyList("", "", location, new Callback() {
+        RequestGroup.getNearbyAgencyList(pageNumber + "", "10", location, new Callback() {
             @Override
             public Object parseNetworkResponse(Response response, int id) throws Exception {
-                return new Gson().fromJson(response.body().string(), OrgRecommendListBean.class);
+                return new Gson().fromJson(response.body().string(), OrgListBean.class);
             }
 
             @Override
@@ -76,19 +118,33 @@ public class NearbyFragment extends BaseFragment {
 
             @Override
             public void onResponse(Object response, int id) {
-                OrgRecommendListBean bean = (OrgRecommendListBean) response;
+                OrgListBean bean = (OrgListBean) response;
                 if (bean != null) {
                     if ("200".equals(bean.getCode())) {
                         if (bean.getData() != null) {
-                            List<OrgItemBean> listOrg = bean.getData().getRecords();
-                            if (listOrg != null && listOrg.size() > 0) {
-
+                            List<OrgItemBean> listOrgNet = bean.getData().getRecords();
+                            if (listOrgNet != null && listOrgNet.size() > 0) {
+                                if (pageNumber == 1) {
+                                    if (listOrg == null) {
+                                        listOrg = new ArrayList<>();
+                                    }
+                                    listOrg.clear();
+                                    listOrg.addAll(listOrgNet);
+                                    orgListAdapter = new OrgListAdapter(getActivity(), listOrg);
+                                    pullToRefresh.setAdapter(orgListAdapter);
+                                    orgListAdapter.notifyDataSetChanged();
+                                    pullToRefresh.setMode(PullToRefreshBase.Mode.BOTH);
+                                } else {
+                                    listOrg.addAll(listOrgNet);
+                                    orgListAdapter.notifyDataSetChanged();
+                                }
                             }
                         }
                     } else {
                         showToast(bean.getMsg());
                     }
                 }
+                pullToRefresh.onRefreshComplete();
             }
         });
     }
@@ -98,7 +154,10 @@ public class NearbyFragment extends BaseFragment {
         tvLocation.setText(event.getAmapLocation().getDistrict());
 
         //获取推荐机构列表
-        getOrgList(event.getAmapLocation().getLongitude() + "," + event.getAmapLocation().getLatitude());
+        pageNumber = 1;
+        longitude = event.getAmapLocation().getLongitude();
+        latitude = event.getAmapLocation().getLatitude();
+        getOrgList(longitude + "," + latitude);
     }
 
     @Override

library/src/main/java/com/common/library/okhttp/OkHttpUtils.java

@@ -1,8 +1,11 @@
 package com.common.library.okhttp;
 
+import android.util.Log;
+
 import java.io.IOException;
 import java.util.concurrent.Executor;
 
+import com.common.library.Constants;
 import com.common.library.okhttp.builder.GetBuilder;
 import com.common.library.okhttp.builder.HeadBuilder;
 import com.common.library.okhttp.builder.OtherRequestBuilder;
@@ -183,6 +186,9 @@ public class OkHttpUtils
             {
                 callback.onError(call, e, id);
                 callback.onAfter(id);
+                if(Constants.DEVELOP_MODE){
+                    Log.e("okhttp", e.getMessage());
+                }
             }
         });
     }