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

# Conflicts:
#	WeiChat/version.properties

WeiChat/src/main/res/layout/item_booking_list.xml

@@ -61,10 +61,11 @@
 
     <TextView
         android:id="@+id/handler_tv"
-        android:layout_width="250dp"
+        android:layout_width="wrap_content"
+        android:maxWidth="280dp"
         android:layout_height="wrap_content"
         android:layout_below="@id/address_tv"
-        android:layout_marginRight="30dp"
+        android:layout_marginRight="10dp"
         android:text="*****"
         android:layout_marginTop="10dp"
         android:ellipsize="end"
@@ -72,7 +73,8 @@
 
     <TextView
         android:id="@+id/topic_tv"
-        android:layout_width="150dp"
+        android:layout_width="wrap_content"
+        android:maxWidth="150dp"
         android:layout_height="wrap_content"
         android:layout_below="@id/address_tv"
         android:layout_toRightOf="@+id/handler_tv"

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Mon Dec 25 11:38:10 CST 2017
-debugName=251
+#Fri Dec 22 17:27:12 CST 2017
+debugName=235
 versionName=612
-debugCode=251
+debugCode=235
 versionCode=151

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

@@ -361,8 +361,8 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     
                 }
 
-                getSupportActionBar().setTitle(model.getName());
-
+               // getSupportActionBar().setTitle(model.getName());
+                getSupportActionBar().setTitle("预约");
 
             } else {
                 //TODO 由于该界面必须要转进来的对象，如果model缺失，应返回
@@ -1331,6 +1331,9 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     }
                     tv_hospital_rooms.setText(data.getString("sb_stname"));
                     tag_hospital_doctor.setText(data.getString("sb_username"));
+
+                    tv_hospital_time.setCompoundDrawables(null,null,null,null);
+                    tv_hospital_rooms.setCompoundDrawables(null,null,null,null);
                 }
                 break;
             case "10002"://运动健身
@@ -1349,6 +1352,9 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     }
                     tv_sport_rooms.setText(data.getString("sb_spname"));
                     tv_sport_peoples.setText(data.getString("sb_person"));
+
+                    tv_sport_rooms.setCompoundDrawables(null,null,null,null);
+                    tv_sport_peoples.setCompoundDrawables(null,null,null,null);
                 }
                 break;
             case "10003"://餐饮
@@ -1387,6 +1393,11 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                             tvSeatsRight.setVisibility(View.VISIBLE);  //商家释放
                         }
                     }
+
+                    tvSeatsRight .setCompoundDrawables(null,null,null,null);
+                    tv_food_peoples .setCompoundDrawables(null,null,null,null);
+                    tv_food_times .setCompoundDrawables(null,null,null,null);
+                    tv_food_rooms.setCompoundDrawables(null,null,null,null);
                 }
                 break;
             case "10004"://美容美发
@@ -1402,6 +1413,8 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                                 + data.getString("sb_starttime").substring(11, 16) + "-" + data.getString("sb_endtime").substring(11, 16));
                     }
                     tv_hair_rooms.setText(data.getString("sb_stname"));
+                    tv_hair_times.setCompoundDrawables(null,null,null,null);
+                    tv_hair_rooms. setCompoundDrawables(null,null,null,null);
                 }
                 break;
             case "10005"://会所
@@ -1420,6 +1433,9 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     }
                     tv_club_technician.setText(data.getString("sb_stname"));
                     tv_club_peoples.setText(data.getString("sb_person"));
+
+                    tv_club_technician. setCompoundDrawables(null,null,null,null);
+                    tv_club_peoples.setCompoundDrawables(null,null,null,null);
                 }
                 break;
             case "10006"://ktv
@@ -1438,6 +1454,9 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     }
                     tv_ktv_rooms.setText(data.getString("sb_spname"));
                     tv_ktv_peoples.setText(data.getString("sb_person"));
+                    tv_ktv_rooms.setCompoundDrawables(null,null,null,null);
+                    tv_ktv_peoples. setCompoundDrawables(null,null,null,null);
+                    tv_ktv_times.setCompoundDrawables(null,null,null,null);
                 }
                 break;
 
@@ -1653,6 +1672,9 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                              JSONArray deskbook=JSON.parseObject(o.toString()).getJSONArray("deskbook");
                              JSONArray desklist=JSON.parseObject(o.toString()).getJSONArray("desklist");
                              if (!ListUtils.isEmpty(deskbook)){
+                                 CommonUtil.textSpanForStyle(tvMSeatsNum,"前方"+"0"+"桌","0",ct.getResources().getColor(R.color.blue_seats_num));
+                                 CommonUtil.textSpanForStyle(tvZSeatsNum,"前方"+"0"+"桌","0",ct.getResources().getColor(R.color.blue_seats_num));
+                                 CommonUtil.textSpanForStyle(tvDSeatsNum,"前方"+"0"+"桌","0",ct.getResources().getColor(R.color.blue_seats_num));
                                  for (int i = 0; i <deskbook.size() ; i++) {
                                      JSONObject object=deskbook.getJSONObject(i);
                                      String number= object.getString("number");//预约量

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

@@ -43,37 +43,37 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
-  * @desc:
-  * @author：Arison on 2017/9/28
-  */
+ * @desc:
+ * @author：Arison on 2017/9/28
+ */
 public class BServiceListActivity extends OABaseActivity {
     private VoiceSearchView voiceSearchView;
     private PullToRefreshListView mListView;
     private ItemBserviceListAdapter mListAdapter;
-    private List<SBListModel> modelList=new ArrayList<>();
-    private  SBMenuModel menuModel;
-    
+    private List<SBListModel> modelList = new ArrayList<>();
+    private SBMenuModel menuModel;
     private EmptyLayout emptyLayout;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_bservices);
-        
+
         initView();
         initEvent();
         initData();
     }
 
     private void initView() {
-        if (getIntent()!=null){
-            menuModel=getIntent().getParcelableExtra("SBMenuModel");
+        if (getIntent() != null) {
+            menuModel = getIntent().getParcelableExtra("SBMenuModel");
             getSupportActionBar().setTitle(menuModel.getTitle());
-            LogUtil.d("myTest","menuModel:"+JSON.toJSONString(menuModel));
+            LogUtil.d("myTest", "menuModel:" + JSON.toJSONString(menuModel));
         }
         voiceSearchView = (VoiceSearchView) findViewById(R.id.voiceSearchView);
         mListView = (PullToRefreshListView) findViewById(R.id.mListView);
-        emptyLayout=new EmptyLayout(mContext,mListView.getRefreshableView());
-        mListAdapter=new ItemBserviceListAdapter(mContext,modelList);
+        emptyLayout = new EmptyLayout(mContext, mListView.getRefreshableView());
+        mListAdapter = new ItemBserviceListAdapter(mContext, modelList);
         mListView.setAdapter(mListAdapter);
 
         initSearchView();
@@ -82,6 +82,7 @@ public class BServiceListActivity extends OABaseActivity {
     private ImageView mBackImageView, mVoiceImageView;
     private ClearEditText mSearchEditText;
     private EmptyLayout mEmptyLayout;
+
     private void initSearchView() {
         View view = LayoutInflater.from(ct).inflate(R.layout.action_book_service_search, null);
         mBackImageView = (ImageView) view.findViewById(R.id.book_service_search_back);
@@ -126,21 +127,21 @@ public class BServiceListActivity extends OABaseActivity {
 
             @Override
             public void afterTextChanged(Editable s) {
-                if (!TextUtils.isEmpty(s.toString())){
-                    if (!ListUtils.isEmpty(modelList)){
-                        List<SBListModel> tempList=new ArrayList<>();
-                        for (int i = 0; i <modelList.size() ; i++) {
-                            if (modelList.get(i).getName().contains(s.toString())){
+                if (!TextUtils.isEmpty(s.toString())) {
+                    if (!ListUtils.isEmpty(modelList)) {
+                        List<SBListModel> tempList = new ArrayList<>();
+                        for (int i = 0; i < modelList.size(); i++) {
+                            if (modelList.get(i).getName().contains(s.toString())) {
                                 tempList.add(modelList.get(i));
                             }
                         }
-                        if (ListUtils.isEmpty(tempList))  mEmptyLayout.showEmpty();
-                        LogUtil.d(TAG,"tempList:"+JSON.toJSONString(tempList.toString()));
+                        if (ListUtils.isEmpty(tempList)) mEmptyLayout.showEmpty();
+                        LogUtil.d(TAG, "tempList:" + JSON.toJSONString(tempList.toString()));
                         mListAdapter.setObjects(tempList);
                         mListAdapter.notifyDataSetChanged();
 
                     }
-                }else{
+                } else {
                     mListAdapter.setObjects(modelList);
                     mListAdapter.notifyDataSetChanged();
                 }
@@ -155,48 +156,48 @@ public class BServiceListActivity extends OABaseActivity {
                 LogUtil.i("position=" + position);
                 LogUtil.i("id=" + id);
                 SBListModel model = mListAdapter.getItem((int) id);
-                Intent intent =null;
-                if (model.getType().equals("会所")||model.getType().equals("美容美发")){
+                Intent intent = null;
+                if (model.getType().equals("会所") || model.getType().equals("美容美发")) {
                     intent = new Intent(ct, BServiceDetailActivity.class);
-                }else{
+                } else {
                     intent = new Intent(ct, BServiceAddActivity.class);
                 }
-                LogUtil.d(TAG,"model:"+JSON.toJSONString(model));
+                LogUtil.d(TAG, "model:" + JSON.toJSONString(model));
                 intent.putExtra("model", model);
                 startActivity(intent);
                 //@update by Bitliker 由于不同类型的预约详情界面差别很大，需要判断当前点击的进行分类
             }
         });
     }
-    
+
     private void initData() {
-        if (menuModel!=null){
-            loadListData(menuModel.getCode(),1);
+        if (menuModel != null) {
+            loadListData(menuModel.getCode(), 1);
         }
     }
 
-    
-    public void loadListData(String type,int page){
+
+    public void loadListData(String type, int page) {
         MyApplication.getInstance().getBdLocationHelper().requestLocation();
-        HttpClient httpClient=new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build();
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build();
         httpClient.Api().send(new HttpClient.Builder()
                 .url("/user/appStoreList")
-                .add("type",type)
-                .add("pageIndex",page)
+                .add("type", type)
+                .add("pageIndex", page)
                 .add("token", MyApplication.getInstance().mAccessToken)
                 .method(Method.POST)
-                .build(),new ResultSubscriber<>(new ResultListener<Object>() {
+                .build(), new ResultSubscriber<>(new ResultListener<Object>() {
             @Override
             public void onResponse(Object o) {
                 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();
+                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"));
@@ -204,14 +205,14 @@ public class BServiceListActivity extends OABaseActivity {
                             sbListModel.setType(mObject.getString("sc_industry"));
                             sbListModel.setPhone(mObject.getString("sc_telephone"));
                             sbListModel.setIndustrycode(mObject.getString("sc_industrycode"));
-                            String sc_latitude=mObject.getString("sc_latitude");
-                            String sc_longitude=mObject.getString("sc_longitude");
+                            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.setDistance(String.valueOf(DistanceUtils.mToKm(distance, "#.0")));
                             sbListModel.setCash(mObject.getString("sc_telephone"));
                             sbListModel.setCompanyid(mObject.getString("sc_uu"));
                             sbListModel.setImid(mObject.getString("sc_imid"));
@@ -221,14 +222,14 @@ public class BServiceListActivity extends OABaseActivity {
                             modelList.add(sbListModel);
                         }
                         LogUtil.d("myTest", JSON.toJSONString(modelList));
-                        mListAdapter=new ItemBserviceListAdapter(mContext,modelList);
+                        mListAdapter = new ItemBserviceListAdapter(mContext, modelList);
                         mListView.setAdapter(mListAdapter);
-                        if (mListAdapter.getCount()==0){
+                        if (mListAdapter.getCount() == 0) {
                             emptyLayout.showEmpty();
                         }
                         //mListAdapter.notifyDataSetChanged();
-                    }else{
-                        if (mListAdapter.getCount()==0){
+                    } else {
+                        if (mListAdapter.getCount() == 0) {
                             emptyLayout.showEmpty();
                         }
                     }

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

@@ -36,6 +36,7 @@ import com.core.widget.DrawableCenterTextView;
 import com.core.widget.view.MyGridView;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
+import com.me.imageloader.ImageLoaderUtil;
 import com.me.network.app.http.HttpClient;
 import com.me.network.app.http.Method;
 import com.me.network.app.http.rx.ResultListener;
@@ -48,6 +49,8 @@ import com.modular.booking.model.ItemsSelectType1;
 import com.modular.booking.model.SBListModel;
 import com.modular.booking.model.SBMenuModel;
 import com.modular.booking.widget.ObservableScrollView;
+import com.youth.banner.Banner;
+import com.youth.banner.loader.ImageLoader;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -69,6 +72,7 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
     private Drawable drawBg;
     private int pageSize = 1;
     private TextView tv_distance;
+    private Banner mBanner;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -112,7 +116,7 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
         bar.setCustomView(view);
 
         mListView = (PullToRefreshListView) findViewById(R.id.mListView);
-    
+
         initHeader();
         mListAdapter = new ItemBserviceListAdapter(mContext, modelList);
         mListView.setAdapter(mListAdapter);
@@ -121,8 +125,17 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
     private void initHeader() {
         View headview = LayoutInflater.from(ct).inflate(R.layout.header_bservices_grid, null);
         mListView.getRefreshableView().addHeaderView(headview);
-        tv_distance =(TextView)findViewById(R.id.tv_distance);
-        MyGridView mGridView = (MyGridView) findViewById(R.id.mGridView);
+        tv_distance = findViewById(R.id.tv_distance);
+        MyGridView mGridView = findViewById(R.id.mGridView);
+        mBanner = findViewById(R.id.city_industry_service_main_banner);
+        mBanner.setImageLoader(new BannerImageLoader());
+        List<String> imgList=new ArrayList<>();
+        imgList.add("http://demo.sc.chinaz.com/Files/DownLoad/webjs1/201707/jiaoben5258/images/3-1.jpg");
+        imgList.add("http://demo.sc.chinaz.com/Files/DownLoad/webjs1/201707/jiaoben5258/images/2-1.jpg");
+        imgList.add("http://demo.sc.chinaz.com/Files/DownLoad/webjs1/201707/jiaoben5258/images/1-1.jpg");
+        imgList.add("http://demo.sc.chinaz.com/Files/DownLoad/webjs1/201707/jiaoben5258/images/4-1.jpg");
+        mBanner.update(imgList);
+        mBanner.start();
         List<SBMenuModel> menuModels = new ArrayList<>();
         SBMenuModel menuModel = new SBMenuModel();
         menuModel.setUrl("");
@@ -195,6 +208,7 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
     protected void onResume() {
         super.onResume();
 //        drawBg.setAlpha(80);
+        mBanner.stopAutoPlay();
     }
 
     @Override
@@ -228,25 +242,25 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
             @Override
             public void onPullDownToRefresh(PullToRefreshBase<ListView> refreshView) {
                 pageSize = 1;
-                if (tv_distance.getText().toString().equals("全部")||tv_distance.getText().toString().equals("距离")){
+                if (tv_distance.getText().toString().equals("全部") || tv_distance.getText().toString().equals("距离")) {
                     loadListData(pageSize);
-                }else{
-                    loadSeachData(tv_distance.getTag().toString(),pageSize);
+                } else {
+                    loadSeachData(tv_distance.getTag().toString(), pageSize);
                 }
-                
+
             }
 
             @Override
             public void onPullUpToRefresh(PullToRefreshBase<ListView> refreshView) {
                 pageSize++;
-                if (tv_distance.getText().toString().equals("全部")||tv_distance.getText().toString().equals("距离")){
+                if (tv_distance.getText().toString().equals("全部") || tv_distance.getText().toString().equals("距离")) {
                     loadListData(pageSize);
-                }else{
-                    loadSeachData(tv_distance.getTag().toString(),pageSize);
+                } else {
+                    loadSeachData(tv_distance.getTag().toString(), pageSize);
                 }
             }
         });
-        
+
         mListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
@@ -331,7 +345,7 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
 //        drawBg.setAlpha(255);
 //    }
 
-    public void loadSeachData(String distance,final int pageSize){
+    public void loadSeachData(String distance, final int pageSize) {
         showLoading();
         BdLocationHelper helper = MyApplication.getInstance().getBdLocationHelper();
         //distance, type, longitude, latitude, pageIndex, token
@@ -339,7 +353,7 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appSearchStore")
                 .add("type", "0")
-                .add("distance",distance)
+                .add("distance", distance)
                 .add("longitude", helper.getLongitude())
                 .add("latitude", helper.getLatitude())
                 .add("pageIndex", String.valueOf(pageSize))
@@ -404,8 +418,8 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
             }
         }));
     }
-    
-    
+
+
     public void loadListData(final int pageSize) {
         HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build();
         httpClient.Api().send(new HttpClient.Builder()
@@ -438,7 +452,7 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
                                 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);
@@ -482,16 +496,17 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
             Intent intent = new Intent();
             intent.setClass(this, BServiceSearchActivity.class);
             startActivity(intent);
-        } else if (id==R.id.tv_distance){
+        } else if (id == R.id.tv_distance) {
             //搜索距离-showPopupWindow
             showPopupWindow(v);
         }
     }
 
-    
+
     //距离popupWindow
     private PopupWindow popupWindow = null;
     private int selectId;
+
     public void showPopupWindow(View parent) {
         View view = null;
         WindowManager windowManager = (WindowManager) getSystemService(Context.WINDOW_SERVICE);
@@ -501,8 +516,8 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
             ListView plist = (ListView) view.findViewById(R.id.mList);
 //            SelectSimpleAdapter adapter = new SelectSimpleAdapter(ct, getPopData(),
 //                    R.layout.item_pop_list);
-            List<ItemsSelectType1> datas=  getItemsSelect();
-            final ItemPopListAdapter adapter=new ItemPopListAdapter(ct,datas);
+            List<ItemsSelectType1> datas = getItemsSelect();
+            final ItemPopListAdapter adapter = new ItemPopListAdapter(ct, datas);
             plist.setAdapter(adapter);
             Drawable drawable = getResources().getDrawable(R.drawable.selector_check_items);
             plist.setSelector(drawable);
@@ -510,8 +525,8 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
                 @Override
                 public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                     popupWindow.dismiss();
-                    pageSize=1;
-                    selectId=position;
+                    pageSize = 1;
+                    selectId = position;
                     adapter.setSelectId(selectId);
                     adapter.notifyDataSetChanged();
 //                    ItemPopListAdapter.ViewHolder viewHolder= (ItemPopListAdapter.ViewHolder) view.getTag();
@@ -519,37 +534,37 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
 //                    adapter.notifyDataSetChanged();
                     switch (position) {
                         case 0:
-                           loadSeachData("500",pageSize);
-                           tv_distance.setText("0.5km");
-                           tv_distance.setTag("500");
+                            loadSeachData("500", pageSize);
+                            tv_distance.setText("0.5km");
+                            tv_distance.setTag("500");
                             break;
                         case 1:
-                            loadSeachData("1000",pageSize);
+                            loadSeachData("1000", pageSize);
                             tv_distance.setText("1km");
                             tv_distance.setTag("1000");
                             break;
                         case 2:
-                            loadSeachData("2000",pageSize);
+                            loadSeachData("2000", pageSize);
                             tv_distance.setText("2km");
                             tv_distance.setTag("2000");
                             break;
                         case 3:
-                            loadSeachData("5000",pageSize);
+                            loadSeachData("5000", pageSize);
                             tv_distance.setText("5km");
                             tv_distance.setTag("5000");
                             break;
                         case 4:
-                            loadSeachData("10000",pageSize);
+                            loadSeachData("10000", pageSize);
                             tv_distance.setText("10km");
                             tv_distance.setTag("10000");
                             break;
                         case 5:
-                            loadSeachData("20000",pageSize);
+                            loadSeachData("20000", pageSize);
                             tv_distance.setText("20km");
                             tv_distance.setTag("20000");
                             break;
                         case 6:
-                            loadSeachData("30000",pageSize);
+                            loadSeachData("30000", pageSize);
                             tv_distance.setText("30km");
                             tv_distance.setTag("30000");
                             break;
@@ -561,7 +576,7 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
                         default:
                             break;
                     }
-                
+
                 }
             });
             popupWindow = new PopupWindow(view, windowManager.getDefaultDisplay().getWidth() / 3, windowManager.getDefaultDisplay().getHeight() / 3);
@@ -581,54 +596,54 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
         popupWindow.showAsDropDown(parent, windowManager.getDefaultDisplay().getWidth(), 0);
     }
 
-    
-    private List<ItemsSelectType1> getItemsSelect(){
-        List<ItemsSelectType1> list=new ArrayList<>();
-        ItemsSelectType1 model=new ItemsSelectType1();
+
+    private List<ItemsSelectType1> getItemsSelect() {
+        List<ItemsSelectType1> list = new ArrayList<>();
+        ItemsSelectType1 model = new ItemsSelectType1();
         model.setName("0.5km");
         list.add(model);
 
-        model=new ItemsSelectType1();
+        model = new ItemsSelectType1();
         model.setName("1km");
         list.add(model);
 
-        model=new ItemsSelectType1();
+        model = new ItemsSelectType1();
         model.setName("2km");
         list.add(model);
 
 
-        model=new ItemsSelectType1();
+        model = new ItemsSelectType1();
         model.setName("5km");
         list.add(model);
 
 
-        model=new ItemsSelectType1();
+        model = new ItemsSelectType1();
         model.setName("10km");
         list.add(model);
 
-        model=new ItemsSelectType1();
+        model = new ItemsSelectType1();
         model.setName("20km");
         list.add(model);
 
-        model=new ItemsSelectType1();
+        model = new ItemsSelectType1();
         model.setName("30km");
         list.add(model);
 
-        model=new ItemsSelectType1();
+        model = new ItemsSelectType1();
         model.setName("全部");
         list.add(model);
-        
-        return  list;
-        
+
+        return list;
+
     }
-     
+
     private List<Map<String, Object>> getPopData() {
         List<Map<String, Object>> list = new ArrayList<>();
         Map<String, Object> map = new HashMap<>();
-        map.put("item_name","0.5km");
+        map.put("item_name", "0.5km");
         list.add(map);
         map = new HashMap<>();
-        map.put("item_name","1km");
+        map.put("item_name", "1km");
         list.add(map);
         map = new HashMap<>();
         map.put("item_name", "2km");
@@ -655,4 +670,12 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
     public void onObservableScrollViewListener(int l, int t, int oldl, int oldt) {
 
     }
+
+    private class BannerImageLoader extends ImageLoader {
+        @Override
+        public void displayImage(Context context, Object path, ImageView imageView) {
+            imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
+            ImageLoaderUtil.getInstance().loadImage(path.toString(), imageView);
+        }
+    }
 }

app_modular/appbooking/src/main/res/layout/activity_bservices.xml

@@ -9,6 +9,7 @@
         android:id="@+id/mListView"
         android:layout_below="@+id/voiceSearchView"
         android:dividerHeight="0.1dp"
+        android:background="@color/transparent"
         android:divider="@color/item_line"
         style="@style/ListViewBasic" />
 </RelativeLayout>

app_modular/appbooking/src/main/res/layout/header_bservices_grid.xml

@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="#EBE9EA"
     android:orientation="vertical">
     <!--android:layout_marginTop="80dp"-->
@@ -17,6 +18,19 @@
         android:verticalSpacing="0.5dp">
     </com.core.widget.view.MyGridView>
 
+
+    <com.youth.banner.Banner
+        android:id="@+id/city_industry_service_main_banner"
+        android:layout_width="match_parent"
+        android:layout_marginTop="10dp"
+        android:layout_height="100dp"
+        app:banner_default_image="@drawable/skin_icon_blue_circle"
+        app:delay_time="3000"
+        app:is_auto_play="true"
+        app:layout_collapseMode="none"
+        app:layout_collapseParallaxMultiplier="0.5"
+        app:scroll_time="600" />
+    
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

app_modular/appbooking/src/main/res/layout/item_bservice_header.xml

@@ -16,14 +16,15 @@
         android:layout_margin="3dp"
         android:text="*****"
         android:textColor="@color/black"
-        android:textSize="17sp"
+        android:textSize="15sp"
         android:textStyle="bold" />
 
     <TextView
         android:id="@id/tv_desc"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="3dp"
+        android:textSize="11sp"
+        android:layout_margin="2dp"
         android:text="*****" />
 
     <de.hdodenhof.circleimageview.CircleImageView

app_modular/appworks/src/main/java/com/uas/appworks/activity/CityIndustryServiceMainActivity.java

@@ -134,7 +134,6 @@ public class CityIndustryServiceMainActivity extends BaseMVPActivity<WorkPlatPre
     @Override
     protected void onStop() {
         super.onStop();
-        mBanner.stopAutoPlay();
     }
 
     @Override