绘制附近筛选

app/src/main/java/com/ynstkz/shitu/android/base/BaseFragment.java

@@ -10,6 +10,7 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import com.muddzdev.styleabletoastlibrary.StyleableToast;
+import com.ynstkz.shitu.android.application.STApplication;
 
 /**
  * 作者：fuchangle on 2018/1/29 11:38
@@ -23,9 +24,9 @@ public class BaseFragment extends Fragment{
         return super.onCreateView(inflater, container, savedInstanceState);
     }
 
-    protected void showToast(Context context, String content){
+    protected void showToast(String content){
         new StyleableToast
-                .Builder(context)
+                .Builder(STApplication.getContext())
                 .text(content)
                 .textColor(Color.WHITE)
                 .backgroundColor(Color.BLACK)

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

@@ -251,12 +251,12 @@ public class RequestGroup {
     }
 
     /**
-     * 获取机构列表
+     * 获取附近机构列表
      * @param pageNumber
      * @param pageSize
      * @param callback
      */
-    public static void getAgencyList(String pageNumber, String pageSize, Callback callback){
+    public static void getNearbyAgencyList(String pageNumber, String pageSize, String location, Callback callback){
         Map<String, String> params = getSystemParams();
         params.put("pageNumber",pageNumber);
         params.put("pageSize", pageSize);

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

@@ -140,7 +140,7 @@ public class HomeFragment extends BaseFragment implements PullToRefreshBase.OnRe
 
             @Override
             public void onError(Call call, Exception e, int id) {
-                showToast(getActivity(), getString(R.string.error_msg));
+                showToast(getString(R.string.error_msg));
             }
 
             @Override
@@ -154,7 +154,7 @@ public class HomeFragment extends BaseFragment implements PullToRefreshBase.OnRe
                             initBannerView();
                         }
                     } else {
-                        showToast(getActivity(), bannerBean.getMsg());
+                        showToast(bannerBean.getMsg());
                     }
                 }
             }
@@ -212,7 +212,7 @@ public class HomeFragment extends BaseFragment implements PullToRefreshBase.OnRe
 
             @Override
             public void onError(Call call, Exception e, int id) {
-                showToast(getActivity(), getString(R.string.error_msg));
+                showToast(getString(R.string.error_msg));
             }
 
             @Override
@@ -227,7 +227,7 @@ public class HomeFragment extends BaseFragment implements PullToRefreshBase.OnRe
                             }
                         }
                     } else {
-                        showToast(getActivity(), bean.getMsg());
+                        showToast(bean.getMsg());
                     }
                 }
             }
@@ -338,12 +338,12 @@ public class HomeFragment extends BaseFragment implements PullToRefreshBase.OnRe
 
     @Override
     public void onPullDownToRefresh(PullToRefreshBase<ScrollView> refreshView) {
-        showToast(getActivity(), "onPullDownToRefresh");
+        showToast("onPullDownToRefresh");
     }
 
     @Override
     public void onPullUpToRefresh(PullToRefreshBase<ScrollView> refreshView) {
-        showToast(getActivity(), "onPullUpToRefresh");
+        showToast("onPullUpToRefresh");
     }
 
     @Override

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

@@ -6,16 +6,25 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import com.common.library.okhttp.callback.Callback;
+import com.google.gson.Gson;
 import com.ynstkz.shitu.android.R;
 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.data.RequestGroup;
 import com.ynstkz.shitu.android.event.LocationChangedEvent;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
+import java.util.List;
+
 import butterknife.Bind;
 import butterknife.ButterKnife;
+import okhttp3.Call;
+import okhttp3.Response;
 
 /**
  * 附近
@@ -49,9 +58,47 @@ public class NearbyFragment extends BaseFragment {
 
     }
 
+    /**
+     * 获取推荐机构列表
+     */
+    private void getOrgList(String location) {
+
+        RequestGroup.getNearbyAgencyList("", "", location, new Callback() {
+            @Override
+            public Object parseNetworkResponse(Response response, int id) throws Exception {
+                return new Gson().fromJson(response.body().string(), OrgRecommendListBean.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) {
+                OrgRecommendListBean bean = (OrgRecommendListBean) 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) {
+
+                            }
+                        }
+                    } else {
+                        showToast(bean.getMsg());
+                    }
+                }
+            }
+        });
+    }
+
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onMessageEvent(LocationChangedEvent event) {
         tvLocation.setText(event.getAmapLocation().getDistrict());
+
+        //获取推荐机构列表
+        getOrgList(event.getAmapLocation().getLongitude() + "," + event.getAmapLocation().getLatitude());
     }
 
     @Override

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

@@ -148,7 +148,7 @@ public class UserCenterFragment extends BaseFragment {
 
             @Override
             public void onError(Call call, Exception e, int id) {
-                showToast(getActivity(), getString(R.string.error_msg));
+                showToast(getString(R.string.error_msg));
             }
 
             @Override

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

@@ -48,11 +48,45 @@
                android:paddingBottom="@dimen/company_10dp"
                android:numColumns="4"/>
 
+           <RelativeLayout
+               android:layout_width="match_parent"
+               android:layout_height="@dimen/company_40dp"
+               android:layout_marginTop="@dimen/company_10dp"
+               android:background="@color/white">
+
+               <TextView
+                   android:layout_width="@dimen/company_4dp"
+                   android:layout_height="match_parent"
+                   android:background="@color/main_color"/>
+
+               <TextView
+                   android:layout_width="wrap_content"
+                   android:layout_height="wrap_content"
+                   android:layout_centerVertical="true"
+                   android:layout_marginLeft="@dimen/company_10dp"
+                   android:textSize="@dimen/company_16sp"
+                   android:textColor="@color/color_333"
+                   android:text="推荐机构"/>
+
+               <TextView
+                   android:id="@+id/iv_org_more"
+                   android:layout_width="wrap_content"
+                   android:layout_height="wrap_content"
+                   android:layout_alignParentRight="true"
+                   android:layout_centerVertical="true"
+                   android:layout_marginRight="@dimen/company_10dp"
+                   android:textSize="@dimen/company_12sp"
+                   android:textColor="@color/color_333"
+                   android:text="更多>"/>
+
+           </RelativeLayout>
+
+           <include layout="@layout/view_default_line"/>
+
            <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/fm_nearby.xml

@@ -13,6 +13,131 @@
 
     </LinearLayout>
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:background="@color/white">
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:gravity="center"
+            android:padding="@dimen/company_10dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:maxLines="1"
+                android:textSize="@dimen/company_16sp"
+                android:textColor="@color/color_666"
+                android:text="附近"/>
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/company_10dp"
+                android:layout_marginLeft="@dimen/company_5dp"
+                android:src="@drawable/org_filt_nomal"/>
+
+        </LinearLayout>
+
+        <TextView
+            android:layout_width="@dimen/company_1dp"
+            android:layout_height="match_parent"
+            android:layout_marginTop="@dimen/company_10dp"
+            android:layout_marginBottom="@dimen/company_10dp"
+            android:background="#f0f0f0"/>
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:gravity="center"
+            android:padding="@dimen/company_10dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:maxLines="1"
+                android:textSize="@dimen/company_16sp"
+                android:textColor="@color/color_666"
+                android:text="培训学校"/>
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/company_10dp"
+                android:layout_marginLeft="@dimen/company_5dp"
+                android:src="@drawable/org_filt_nomal"/>
+
+        </LinearLayout>
+
+        <TextView
+            android:layout_width="@dimen/company_1dp"
+            android:layout_height="match_parent"
+            android:layout_marginTop="@dimen/company_10dp"
+            android:layout_marginBottom="@dimen/company_10dp"
+            android:background="#f0f0f0"/>
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:gravity="center"
+            android:padding="@dimen/company_10dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:maxLines="1"
+                android:textSize="@dimen/company_16sp"
+                android:textColor="@color/color_666"
+                android:text="好评"/>
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/company_10dp"
+                android:layout_marginLeft="@dimen/company_5dp"
+                android:src="@drawable/org_filt_nomal"/>
+
+        </LinearLayout>
+
+        <TextView
+            android:layout_width="@dimen/company_1dp"
+            android:layout_height="match_parent"
+            android:layout_marginTop="@dimen/company_10dp"
+            android:layout_marginBottom="@dimen/company_10dp"
+            android:background="#f0f0f0"/>
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:gravity="center"
+            android:padding="@dimen/company_10dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:maxLines="1"
+                android:textSize="@dimen/company_16sp"
+                android:textColor="@color/color_666"
+                android:text="英语"/>
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/company_10dp"
+                android:layout_marginLeft="@dimen/company_5dp"
+                android:src="@drawable/org_filt_nomal"/>
+
+        </LinearLayout>
+
+    </LinearLayout>
+
     <com.common.library.pulltorefresh.PullToRefreshListView
         android:id="@+id/pullToRefresh"
         android:layout_width="match_parent"