代码冲突

Merge branch 'feature' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer

# Conflicts:
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java
#	app_core/common/src/main/java/com/common/data/StringUtil.java

app_modular/appbooking/src/main/java/com/modular/booking/activity/services/BServicesActivity.java

@@ -30,6 +30,7 @@ import com.common.system.DisplayUtil;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.OABaseActivity;
+import com.core.net.location.BdLocationHelper;
 import com.core.utils.BaiduMapUtil;
 import com.core.utils.DistanceUtils;
 import com.core.widget.DrawableCenterTextView;
@@ -312,8 +313,82 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
 //        drawBg.setAlpha(255);
 //    }
 
-    public void loadListData(final int pageSize) {
+    public void loadSeachData(String distance,final int pageSize){
+        showLoading();
+        BdLocationHelper helper = MyApplication.getInstance().getBdLocationHelper();
+        //distance, type, longitude, latitude, pageIndex, token
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build();
+        httpClient.Api().send(new HttpClient.Builder()
+                .url("user/appSearchStore")
+                .add("type", "0")
+                .add("distance",distance)
+                .add("longitude", helper.getLongitude())
+                .add("latitude", helper.getLatitude())
+                .add("pageIndex", String.valueOf(pageSize))
+                .add("token", MyApplication.getInstance().mAccessToken)
+                .method(Method.POST)
+                .build(), new ResultSubscriber<>(new ResultListener<Object>() {
+            @Override
+            public void onResponse(Object o) {
+                dimssLoading();
+                mListView.onRefreshComplete();
+                try {
+                    if (pageSize == 1) {
+                        modelList.clear();
+                    }
+                    LogUtil.d("o.toString" + o.toString());
+                    if (JSONUtil.validate(o.toString())) {
+                        JSONObject object = JSON.parseObject(o.toString());
+                        JSONArray jsonArray = object.getJSONArray("reslut");
+                        if (!ListUtils.isEmpty(jsonArray)) {
+                            for (int i = 0; i < jsonArray.size(); i++) {
+                                JSONObject mObject = jsonArray.getJSONObject(i);
+                                SBListModel sbListModel = new SBListModel();
+                                sbListModel.setName(mObject.getString("sc_companyname"));
+                                sbListModel.setAddress(mObject.getString("sc_address"));
+                                sbListModel.setBookType(mObject.getString("sc_booktype"));
+                                sbListModel.setUrl(mObject.getString("sc_imageurl"));
+                                sbListModel.setType(mObject.getString("sc_industry"));
+                                sbListModel.setIndustrycode(mObject.getString("sc_industrycode"));
+                                sbListModel.setCompanyid(mObject.getString("sc_uu"));
+                                sbListModel.setPhone(mObject.getString("sc_telephone"));
 
+                                String sc_latitude = mObject.getString("sc_latitude");
+                                String sc_longitude = mObject.getString("sc_longitude");
+                                sbListModel.setLatitude(sc_latitude);
+                                sbListModel.setLongitude(sc_longitude);
+                                sbListModel.setIntroduce(mObject.getString("sc_introduce"));
+                                LatLng latLng = new LatLng(Double.valueOf(sc_latitude), Double.valueOf(sc_longitude));
+                                float distance = BaiduMapUtil.getInstence().autoDistance(latLng);
+                                sbListModel.setDistance(String.valueOf(DistanceUtils.mToKm(distance, "#.0")));
+                                sbListModel.setCash(mObject.getString("sc_telephone"));
+                                sbListModel.setImid(mObject.getString("sc_imid"));
+                                sbListModel.setId(mObject.getInteger("sc_id"));
+                                sbListModel.setStarttime(mObject.getString("sc_starttime"));
+                                sbListModel.setEndtime(mObject.getString("sc_endtime"));
+                                modelList.add(sbListModel);
+                            }
+                            LogUtil.d("myTest", JSON.toJSONString(modelList));
+                            if (mListAdapter == null) {
+                                mListAdapter = new ItemBserviceListAdapter(mContext, modelList);
+                                mListView.setAdapter(mListAdapter);
+                            } else {
+                                mListAdapter.notifyDataSetChanged();
+                            }
+                            //mListAdapter.notifyDataSetChanged();
+                        } else {
+                            ToastMessage("没有更多数据");
+                        }
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }));
+    }
+    
+    
+    public void loadListData(final int pageSize) {
         HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build();
         httpClient.Api().send(new HttpClient.Builder()
                 .url("/user/appStoreList")
@@ -415,16 +490,30 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
                     popupWindow.dismiss();
                     switch (position) {
                         case 0:
-            
+                           loadSeachData("500",pageSize);
                             break;
                         case 1:
-                        
+                            loadSeachData("1000",pageSize);
                             break;
                         case 2:
-                        
+                            loadSeachData("2000",pageSize);
+                            break;
+                        case 3:
+                            loadSeachData("5000",pageSize);
+                            break;
+                        case 4:
+                            loadSeachData("10000",pageSize);
+                            break;
+                        case 5:
+                            loadSeachData("20000",pageSize);
+                            break;
+                        case 6:
+                            loadSeachData("30000",pageSize);
+                            break;
+                        case 7:
+                          loadListData(pageSize);
                             break;
                         default:
-                           
                             break;
                     }
                 }
@@ -470,7 +559,7 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
         map.put("item_name", "30km");
         list.add(map);
         map = new HashMap<>();
-        map.put("item_name", "深圳");
+        map.put("item_name", "全部");
         list.add(map);
         return list;
     }