代码冲突

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/BServiceAddActivity.java

@@ -138,8 +138,8 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
         submit_btn.setOnClickListener(this);
         et_book_name.setText(CommonUtil.getName());
         et_book_phone.setText(MyApplication.getInstance().mLoginUser.getTelephone());
-        
-     
+
+
         tv_sub.setOnClickListener(this);
         tv_title.setOnClickListener(this);
 
@@ -152,30 +152,30 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                 .setOnWarnListener(new AddSubUtils.OnWarnListener() {
                     @Override
                     public void onWarningForInventory(int inventory) {
-                       // Toast.makeText(mContext, "当前库存:" + inventory, Toast.LENGTH_SHORT).show();
+                        // Toast.makeText(mContext, "当前库存:" + inventory, Toast.LENGTH_SHORT).show();
                         tv_food_peoples.setText(inventory);
 //                        tv_food_peoples.setVisibility(View.GONE);
                     }
 
                     @Override
                     public void onWarningForBuyMax(int max) {
-                      //  Toast.makeText(mContext, "超过最大购买数:" + max, Toast.LENGTH_SHORT).show();
+                        //  Toast.makeText(mContext, "超过最大购买数:" + max, Toast.LENGTH_SHORT).show();
                     }
 
                     @Override
                     public void onWarningForBuyMin(int min) {
-                       // Toast.makeText(mContext, "低于最小购买数:" + min, Toast.LENGTH_SHORT).show();
+                        // Toast.makeText(mContext, "低于最小购买数:" + min, Toast.LENGTH_SHORT).show();
                     }
                 })
-              .setOnChangeValueListener(new AddSubUtils.OnChangeValueListener() {
-                @Override
-                public void onChangeValue(int value, int position) {
-                   // Toast.makeText(mContext, "当前值:" + value, Toast.LENGTH_SHORT).show();
-                    tv_food_peoples.setText(String.valueOf(value));
-                    tv_food_peoples.setVisibility(View.GONE);
-                }
-        });
- 
+                .setOnChangeValueListener(new AddSubUtils.OnChangeValueListener() {
+                    @Override
+                    public void onChangeValue(int value, int position) {
+                        // Toast.makeText(mContext, "当前值:" + value, Toast.LENGTH_SHORT).show();
+                        tv_food_peoples.setText(String.valueOf(value));
+                        tv_food_peoples.setVisibility(View.GONE);
+                    }
+                });
+        tv_food_peoples.setText("1");
     }
 
     private boolean isEdited = true;
@@ -190,62 +190,62 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
             //两个字段是从选择人员界面选过来的
             sb_userid = intent.getStringExtra("sb_userid");
             sb_username = intent.getStringExtra("sb_username");
-            LogUtil.d(TAG,"sb_userid:"+sb_userid+"  sb_username:"+sb_username+" dataService:"+dataService);
+            LogUtil.d(TAG, "sb_userid:" + sb_userid + "  sb_username:" + sb_username + " dataService:" + dataService);
             if (model != null) {
                 LogUtil.i(model.toString());
                 initType(model.getType());
                 if (isEdited) {
                     submit_btn.setText("提交");
-                    if(!StringUtil.isEmpty(sb_userid)){
+                    if (!StringUtil.isEmpty(sb_userid)) {
                         AvatarHelper.getInstance().displayAvatar(sb_userid, iv_header, true);
                         AvatarHelper.getInstance().displayAvatar(sb_userid, max_img, true);
                         tv_title.setText(sb_username);
-                        if("10005".equals(model.getIndustrycode())){
-                            tv_sub.setText(getString(R.string.booking_serivce_technician)+" "+model.getAddress());
-                        }else{
-                            tv_sub.setText(getString(R.string.booking_serivce_teacher)+" "+model.getAddress());
+                        if ("10005".equals(model.getIndustrycode())) {
+                            tv_sub.setText(getString(R.string.booking_serivce_technician) + " " + model.getAddress());
+                        } else {
+                            tv_sub.setText(getString(R.string.booking_serivce_teacher) + " " + model.getAddress());
                         }
-                    }else{ 
+                    } else {
                         AvatarHelper.getInstance().display(model.getUrl(), iv_header, true);
                         AvatarHelper.getInstance().display(model.getUrl(), max_img, true);
                         tv_title.setText(model.getName());
                         tv_sub.setText(model.getAddress());
                     }
-                 
+
                 } else {
                     et_book_phone.setOnClickListener(this);
                     JSONObject object = JSON.parseObject(dataService);
                     String sb_status = object.getString("sb_status");
                     String sb_imageurl = object.getString("sc_imageurl");
-                    sb_userid =object.getString("sb_userid");
-                    sb_username =object.getString("sb_username");
+                    sb_userid = object.getString("sb_userid");
+                    sb_username = object.getString("sb_username");
                     if ("已取消".equals(sb_status)) {
                         submit_btn.setVisibility(View.GONE);
                     } else {
                         submit_btn.setVisibility(View.VISIBLE);
                     }
-                    if (!StringUtil.isEmpty(sb_userid)){
+                    if (!StringUtil.isEmpty(sb_userid)) {
                         AvatarHelper.getInstance().displayAvatar(sb_userid, iv_header, true);
                         AvatarHelper.getInstance().displayAvatar(sb_userid, max_img, true);
                         tv_title.setText(sb_username);
-                        if("10005".equals(model.getIndustrycode())){
-                            tv_sub.setText(getString(R.string.booking_serivce_technician) +" "+model.getAddress());
-                         
-                        }else{
-                            tv_sub.setText(getString(R.string.booking_serivce_teacher)+" "+model.getAddress());
+                        if ("10005".equals(model.getIndustrycode())) {
+                            tv_sub.setText(getString(R.string.booking_serivce_technician) + " " + model.getAddress());
+
+                        } else {
+                            tv_sub.setText(getString(R.string.booking_serivce_teacher) + " " + model.getAddress());
                         }
-                    }else{
+                    } else {
                         tv_title.setText(model.getName());
                         tv_sub.setText(model.getAddress());
                         AvatarHelper.getInstance().display(sb_imageurl, iv_header, true);
-                        AvatarHelper.getInstance().display(sb_imageurl, max_img, true); 
+                        AvatarHelper.getInstance().display(sb_imageurl, max_img, true);
                     }
-                   
+
                     submit_btn.setText("取消");
                 }
-               
+
                 getSupportActionBar().setTitle(model.getName());
-              
+
 
             } else {
                 //TODO 由于该界面必须要转进来的对象，如果model缺失，应返回
@@ -334,51 +334,51 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
     @Override
     public void onClick(View v) {
         int id = v.getId();
-        if (id==R.id.tv_title){
+        if (id == R.id.tv_title) {
             //简介
 //            ToastMessage("简介");
             try {
-                if (!StringUtil.isEmpty(dataService)){
+                if (!StringUtil.isEmpty(dataService)) {
                     showDialog(JSON.parseObject(dataService).getString("sc_introduce"));
-                }else{
+                } else {
                     showDialog(model.getIntroduce());
                 }
             } catch (Exception e) {
                 e.printStackTrace();
             }
 
-        }else if (id==R.id.tv_sub){
+        } else if (id == R.id.tv_sub) {
             //地图定位(需要经纬度)
             try {
-                if (model!=null){
-                    if(!StringUtil.isEmpty(model.getLatitude())){
-                        LatLng latLng=new LatLng(Double.valueOf(model.getLatitude()),
+                if (model != null) {
+                    if (!StringUtil.isEmpty(model.getLatitude())) {
+                        LatLng latLng = new LatLng(Double.valueOf(model.getLatitude()),
                                 Double.valueOf(model.getLongitude()));
-                        Intent  intent = new Intent("com.modular.appworks.NavigationActivity");
+                        Intent intent = new Intent("com.modular.appworks.NavigationActivity");
                         intent.putExtra("toLocation", latLng);
                         startActivityForResult(intent, 0x23);
-                    }else{
-                        LatLng latLng=new LatLng(Double.valueOf(JSON.parseObject(dataService).getString("sc_latitude")),
+                    } else {
+                        LatLng latLng = new LatLng(Double.valueOf(JSON.parseObject(dataService).getString("sc_latitude")),
                                 Double.valueOf(JSON.parseObject(dataService).getString("sc_longitude")));
-                        Intent  intent = new Intent("com.modular.appworks.NavigationActivity");
+                        Intent intent = new Intent("com.modular.appworks.NavigationActivity");
                         intent.putExtra("toLocation", latLng);
                         startActivityForResult(intent, 0x23);
                     }
-                }else{
-                    LatLng latLng=new LatLng(Double.valueOf(JSON.parseObject(dataService).getString("sc_latitude")),
+                } else {
+                    LatLng latLng = new LatLng(Double.valueOf(JSON.parseObject(dataService).getString("sc_latitude")),
                             Double.valueOf(JSON.parseObject(dataService).getString("sc_longitude")));
-                    Intent  intent = new Intent("com.modular.appworks.NavigationActivity");
+                    Intent intent = new Intent("com.modular.appworks.NavigationActivity");
                     intent.putExtra("toLocation", latLng);
                     startActivityForResult(intent, 0x23);
                 }
             } catch (Exception e) {
                 e.printStackTrace();
             }
-        }else if(id==R.id.et_book_phone){
+        } else if (id == R.id.et_book_phone) {
             //打电话
             phoneAction(et_book_phone.getText().toString());
         }
-        
+
         //选择时间（用餐时间、唱歌时间....）
         if (id == R.id.tv_food_times
                 || id == R.id.tv_hair_times
@@ -392,16 +392,16 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
             //TODO  1.当model.getBookType()==0的时候，只能选择开始时间，没有结束时间，当model.getBookType()==1的时候，可选开始时间和结束时间，时间间隔是 30分钟
             //TODO  2.需要传进去商家的id或是ktv包厢的id，在里面请求，判断商家繁忙时刻 5.11、获取商家服务繁忙时间段
             String serviceParam = null;
-            if (!StringUtil.isEmpty(sb_userid)||"10001".equals(model.getIndustrycode())) {
+            if (!StringUtil.isEmpty(sb_userid) || "10001".equals(model.getIndustrycode())) {
                 if ("10001".equals(model.getIndustrycode())) {
                     serviceParam = serviceId;
-                }else{
-                    serviceParam=sb_userid;
+                } else {
+                    serviceParam = sb_userid;
                 }
             } else {
                 serviceParam = serviceName;
             }
-            LogUtil.d(TAG,"serviceParam:"+serviceParam);
+            LogUtil.d(TAG, "serviceParam:" + serviceParam);
             startActivityForResult(new Intent(mContext, SelectCalendarActivity.class)
                             .putExtra("startDate", DateFormatUtil.long2Str(DateFormatUtil.YMD_HMS))
                             .putExtra("endDate", DateFormatUtil.long2Str(DateFormatUtil.YMD_HMS))
@@ -418,10 +418,10 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
         }
         //人数选择（1~10以上）
         else if (
-                //id == R.id.tv_food_people||
-        id == R.id.tv_ktv_peoples
-                || id == R.id.tv_club_peoples
-                || id == R.id.tv_sport_peoples) {
+            //id == R.id.tv_food_people||
+                id == R.id.tv_ktv_peoples
+                        || id == R.id.tv_club_peoples
+                        || id == R.id.tv_sport_peoples) {
             ArrayList<SelectBean> formBeaan = new ArrayList<>();
             for (int i = 1; i <= 10; i++) {
                 formBeaan.add(new SelectBean(i == 10 ? "10人以上" : i + "人"));
@@ -451,7 +451,11 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                 || id == R.id.tv_club_technician
                 || id == R.id.tv_ktv_rooms
                 || id == R.id.tv_food_rooms) {
-            loadStoreService(v.getContentDescription());
+            if (id == R.id.tv_food_rooms && TextUtils.isEmpty(tv_food_times.getText())) {
+                ToastUtil.showToast(this, "请先选择用餐时间");
+            } else {
+                loadStoreService(v.getContentDescription());
+            }
         }
 
         //医疗
@@ -470,11 +474,11 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                 save();
             } else if (((Button) v).getText().equals("取消")) {
                 if (!StringUtil.isEmpty(dataService)) {
-                    JSONObject object= JSON.parseObject(dataService);
-                    String recordId= object.getString("sb_recordid");
+                    JSONObject object = JSON.parseObject(dataService);
+                    String recordId = object.getString("sb_recordid");
                     if (MyApplication.getInstance().mLoginUser.getUserId().equals(recordId)) {
                         cancle(String.valueOf(model.getId()));
-                    }else{
+                    } else {
                         ToastMessage("商家不可取消预约！");
                     }
                 }
@@ -501,7 +505,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                         if ("true".equals(JSON.parseObject(o.toString()).getString("result"))) {
                             ToastMessage("取消成功！");
                             //取消  通知商家取消
-                            invite("","");
+                            invite("", "");
                             Intent intent = new Intent("com.modular.booking.BookingListActivity");
                             intent.putExtra("curDate", model.getEndtime() == null ? "" : model.getEndtime());
                             startActivity(intent);
@@ -563,8 +567,8 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                 break;
             case SERVICE_SELECT:
                 try {
-                    SBMenuModel menuModel= data.getParcelableExtra("data");
-                    JSONObject object=  JSON.parseObject(menuModel.getData());
+                    SBMenuModel menuModel = data.getParcelableExtra("data");
+                    JSONObject object = JSON.parseObject(menuModel.getData());
                     //sm_userid
                     //sm_username
                     tvMessage = object.getString("st_name");
@@ -580,8 +584,8 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                 break;
             case MAN_SELECT:
                 try {
-                    SBMenuModel menuModel= data.getParcelableExtra("data");
-                    JSONObject object=  JSON.parseObject(menuModel.getData());
+                    SBMenuModel menuModel = data.getParcelableExtra("data");
+                    JSONObject object = JSON.parseObject(menuModel.getData());
                     //sm_userid
                     //sm_username
                     if (model.getIndustrycode().equals("10001")) {
@@ -589,17 +593,17 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                         tvMessage = object.getString("sm_username");
                         serviceId = object.getString("sm_userid");
                         serviceName = object.getString("sm_username");
-                    }else{
+                    } else {
                         //其它
                         tvMessage = object.getString("st_name");
                         serviceId = object.getString("st_id");
                         serviceName = object.getString("st_name");
                     }
-                  
+
                     if (tv != null) {
-                          tv.setTag(R.id.tag_id, serviceId);
-                          tv.setTag(R.id.tag_id2, serviceName);
-                      }
+                        tv.setTag(R.id.tag_id, serviceId);
+                        tv.setTag(R.id.tag_id2, serviceName);
+                    }
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -661,20 +665,23 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                         }
                     }
                     if (!ListUtils.isEmpty(selectBeens)) {
-                        if (model.getIndustrycode().equals("10003")){
+                        if (model.getIndustrycode().equals("10003")) {
+                       
                             Intent intent = new Intent(ct, GridSelectDateActivity.class)
                                     .putExtra("type", 2)
                                     .putExtra("title", title)
+                                    .putExtra("companyId",model.getCompanyid())
+                                    .putExtra("date",tv_food_times.getText().toString())
                                     .putParcelableArrayListExtra("data", selectBeens);
                             startActivityForResult(intent, SERVICE_SELECT);
-                        }else{
+                        } else {
                             Intent intent = new Intent(ct, GridSelectActivity.class)
                                     .putExtra("type", 2)
                                     .putExtra("title", title)
                                     .putParcelableArrayListExtra("data", selectBeens);
                             startActivityForResult(intent, SERVICE_SELECT);
                         }
-                      
+
                     } else {
                         showToast("该商家当前无可选服务", R.color.load_error);
                     }
@@ -1022,11 +1029,11 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     tv_food_peoples.setVisibility(View.GONE);
                     addSubUtils.setVisibility(View.VISIBLE);
                 } else {
-                    if(StringUtil.isEmpty(data.getString("sb_starttime"))){
+                    if (StringUtil.isEmpty(data.getString("sb_starttime"))) {
                         tv_food_times.setText(data.getString("sb_endtime"));
-                    }else{
-                        tv_food_times.setText(data.getString("sb_starttime").substring(0,10)+" "
-                                +data.getString("sb_starttime").substring(11,16)+"-"+data.getString("sb_endtime").substring(11,16));
+                    } else {
+                        tv_food_times.setText(data.getString("sb_starttime").substring(0, 10) + " "
+                                + data.getString("sb_starttime").substring(11, 16) + "-" + data.getString("sb_endtime").substring(11, 16));
                     }
                     tv_food_rooms.setText(data.getString("sb_stname"));
                     tv_food_peoples.setText(data.getString("sb_person"));
@@ -1041,28 +1048,28 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     tv_hair_rooms.setOnClickListener(this);
                     tv_hair_times.setOnClickListener(this);
                 } else {
-                    if(StringUtil.isEmpty(data.getString("sb_starttime"))){
+                    if (StringUtil.isEmpty(data.getString("sb_starttime"))) {
                         tv_hair_times.setText(data.getString("sb_endtime"));
-                    }else{
-                        tv_hair_times.setText(data.getString("sb_starttime").substring(0,10)+" "
-                        +data.getString("sb_starttime").substring(11,16)+"-"+data.getString("sb_endtime").substring(11,16));
+                    } else {
+                        tv_hair_times.setText(data.getString("sb_starttime").substring(0, 10) + " "
+                                + data.getString("sb_starttime").substring(11, 16) + "-" + data.getString("sb_endtime").substring(11, 16));
                     }
                     tv_hair_rooms.setText(data.getString("sb_stname"));
                 }
                 break;
             case "运动健身":
                 findViewById(R.id.ll_sport).setVisibility(View.VISIBLE);
-                
+
                 if (isEdited) {
                     tv_sport_peoples.setOnClickListener(this);
                     tv_sport_rooms.setOnClickListener(this);
                     tv_sport_time.setOnClickListener(this);
                 } else {
-                    if(StringUtil.isEmpty(data.getString("sb_starttime"))){
+                    if (StringUtil.isEmpty(data.getString("sb_starttime"))) {
                         tv_sport_time.setText(data.getString("sb_endtime"));
-                    }else{
-                        tv_sport_time.setText(data.getString("sb_starttime").substring(0,10)+" "
-                                +data.getString("sb_starttime").substring(11,16)+"-"+data.getString("sb_endtime").substring(11,16));
+                    } else {
+                        tv_sport_time.setText(data.getString("sb_starttime").substring(0, 10) + " "
+                                + data.getString("sb_starttime").substring(11, 16) + "-" + data.getString("sb_endtime").substring(11, 16));
                     }
                     tv_sport_rooms.setText(data.getString("sb_spname"));
                     tv_sport_peoples.setText(data.getString("sb_person"));
@@ -1075,11 +1082,11 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     tag_hospital_doctor.setOnClickListener(this);
                     tv_hospital_time.setOnClickListener(this);
                 } else {
-                    if(StringUtil.isEmpty(data.getString("sb_starttime"))){
+                    if (StringUtil.isEmpty(data.getString("sb_starttime"))) {
                         tv_hospital_time.setText(data.getString("sb_endtime"));
-                    }else{
-                        tv_hospital_time.setText(data.getString("sb_starttime").substring(0,10)+" "
-                                +data.getString("sb_starttime").substring(11,16)+"-"+data.getString("sb_endtime").substring(11,16));
+                    } else {
+                        tv_hospital_time.setText(data.getString("sb_starttime").substring(0, 10) + " "
+                                + data.getString("sb_starttime").substring(11, 16) + "-" + data.getString("sb_endtime").substring(11, 16));
                     }
                     tv_hospital_rooms.setText(data.getString("sb_stname"));
                     tag_hospital_doctor.setText(data.getString("sb_username"));
@@ -1093,11 +1100,11 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     tv_club_time.setOnClickListener(this);
                     tv_club_peoples.setOnClickListener(this);
                 } else {
-                    if(StringUtil.isEmpty(data.getString("sb_starttime"))){
+                    if (StringUtil.isEmpty(data.getString("sb_starttime"))) {
                         tv_club_time.setText(data.getString("sb_endtime"));
-                    }else{
-                        tv_club_time.setText(data.getString("sb_starttime").substring(0,10)+" "
-                                +data.getString("sb_starttime").substring(11,16)+"-"+data.getString("sb_endtime").substring(11,16));
+                    } else {
+                        tv_club_time.setText(data.getString("sb_starttime").substring(0, 10) + " "
+                                + data.getString("sb_starttime").substring(11, 16) + "-" + data.getString("sb_endtime").substring(11, 16));
                     }
                     tv_club_technician.setText(data.getString("sb_stname"));
                     tv_club_peoples.setText(data.getString("sb_person"));
@@ -1111,11 +1118,11 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     tv_ktv_rooms.setOnClickListener(this);
                     tv_ktv_peoples.setOnClickListener(this);
                 } else {
-                    if(StringUtil.isEmpty(data.getString("sb_starttime"))){
+                    if (StringUtil.isEmpty(data.getString("sb_starttime"))) {
                         tv_ktv_times.setText(data.getString("sb_endtime"));
-                    }else{
-                        tv_ktv_times.setText(data.getString("sb_starttime").substring(0,10)+" "
-                                +data.getString("sb_starttime").substring(11,16)+"-"+data.getString("sb_endtime").substring(11,16));
+                    } else {
+                        tv_ktv_times.setText(data.getString("sb_starttime").substring(0, 10) + " "
+                                + data.getString("sb_starttime").substring(11, 16) + "-" + data.getString("sb_endtime").substring(11, 16));
                     }
                     tv_ktv_rooms.setText(data.getString("sb_spname"));
                     tv_ktv_peoples.setText(data.getString("sb_person"));
@@ -1128,11 +1135,11 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     tag_hospital_doctor.setOnClickListener(this);
                     tv_hospital_time.setOnClickListener(this);
                 } else {
-                    if(StringUtil.isEmpty(data.getString("sb_starttime"))){
+                    if (StringUtil.isEmpty(data.getString("sb_starttime"))) {
                         tv_hospital_time.setText(data.getString("sb_endtime"));
-                    }else{
-                        tv_hospital_time.setText(data.getString("sb_starttime").substring(0,10)+" "
-                                +data.getString("sb_starttime").substring(11,16)+"-"+data.getString("sb_endtime").substring(11,16));
+                    } else {
+                        tv_hospital_time.setText(data.getString("sb_starttime").substring(0, 10) + " "
+                                + data.getString("sb_starttime").substring(11, 16) + "-" + data.getString("sb_endtime").substring(11, 16));
                     }
                     tv_hospital_rooms.setText(data.getString("sb_stname"));
                     tag_hospital_doctor.setText(data.getString("sb_username"));
@@ -1146,11 +1153,11 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     tv_sport_rooms.setOnClickListener(this);
                     tv_sport_time.setOnClickListener(this);
                 } else {
-                    if(StringUtil.isEmpty(data.getString("sb_starttime"))){
+                    if (StringUtil.isEmpty(data.getString("sb_starttime"))) {
                         tv_sport_time.setText(data.getString("sb_endtime"));
-                    }else{
-                        tv_sport_time.setText(data.getString("sb_starttime").substring(0,10)+" "
-                                +data.getString("sb_starttime").substring(11,16)+"-"+data.getString("sb_endtime").substring(11,16));
+                    } else {
+                        tv_sport_time.setText(data.getString("sb_starttime").substring(0, 10) + " "
+                                + data.getString("sb_starttime").substring(11, 16) + "-" + data.getString("sb_endtime").substring(11, 16));
                     }
                     tv_sport_rooms.setText(data.getString("sb_spname"));
                     tv_sport_peoples.setText(data.getString("sb_person"));
@@ -1165,11 +1172,11 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     addSubUtils.setVisibility(View.VISIBLE);
                     tv_food_peoples.setVisibility(View.GONE);
                 } else {
-                    if(StringUtil.isEmpty(data.getString("sb_starttime"))){
+                    if (StringUtil.isEmpty(data.getString("sb_starttime"))) {
                         tv_food_times.setText(data.getString("sb_endtime"));
-                    }else{
-                        tv_food_times.setText(data.getString("sb_starttime").substring(0,10)+" "
-                                +data.getString("sb_starttime").substring(11,16)+"-"+data.getString("sb_endtime").substring(11,16));
+                    } else {
+                        tv_food_times.setText(data.getString("sb_starttime").substring(0, 10) + " "
+                                + data.getString("sb_starttime").substring(11, 16) + "-" + data.getString("sb_endtime").substring(11, 16));
                     }
                     tv_food_rooms.setText(data.getString("sb_spname"));
                     tv_food_peoples.setText(data.getString("sb_person"));
@@ -1183,11 +1190,11 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     tv_hair_rooms.setOnClickListener(this);
                     tv_hair_times.setOnClickListener(this);
                 } else {
-                    if(StringUtil.isEmpty(data.getString("sb_starttime"))){
+                    if (StringUtil.isEmpty(data.getString("sb_starttime"))) {
                         tv_hair_times.setText(data.getString("sb_endtime"));
-                    }else{
-                        tv_hair_times.setText(data.getString("sb_starttime").substring(0,10)+" "
-                                +data.getString("sb_starttime").substring(11,16)+"-"+data.getString("sb_endtime").substring(11,16));
+                    } else {
+                        tv_hair_times.setText(data.getString("sb_starttime").substring(0, 10) + " "
+                                + data.getString("sb_starttime").substring(11, 16) + "-" + data.getString("sb_endtime").substring(11, 16));
                     }
                     tv_hair_rooms.setText(data.getString("sb_stname"));
                 }
@@ -1200,11 +1207,11 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     tv_club_time.setOnClickListener(this);
                     tv_club_peoples.setOnClickListener(this);
                 } else {
-                    if(StringUtil.isEmpty(data.getString("sb_starttime"))){
+                    if (StringUtil.isEmpty(data.getString("sb_starttime"))) {
                         tv_club_time.setText(data.getString("sb_endtime"));
-                    }else{
-                        tv_club_time.setText(data.getString("sb_starttime").substring(0,10)+" "
-                                +data.getString("sb_starttime").substring(11,16)+"-"+data.getString("sb_endtime").substring(11,16));
+                    } else {
+                        tv_club_time.setText(data.getString("sb_starttime").substring(0, 10) + " "
+                                + data.getString("sb_starttime").substring(11, 16) + "-" + data.getString("sb_endtime").substring(11, 16));
                     }
                     tv_club_technician.setText(data.getString("sb_stname"));
                     tv_club_peoples.setText(data.getString("sb_person"));
@@ -1218,11 +1225,11 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     tv_ktv_rooms.setOnClickListener(this);
                     tv_ktv_peoples.setOnClickListener(this);
                 } else {
-                    if(StringUtil.isEmpty(data.getString("sb_starttime"))){
+                    if (StringUtil.isEmpty(data.getString("sb_starttime"))) {
                         tv_ktv_times.setText(data.getString("sb_endtime"));
-                    }else{
-                        tv_ktv_times.setText(data.getString("sb_starttime").substring(0,10)+" "
-                                +data.getString("sb_starttime").substring(11,16)+"-"+data.getString("sb_endtime").substring(11,16));
+                    } else {
+                        tv_ktv_times.setText(data.getString("sb_starttime").substring(0, 10) + " "
+                                + data.getString("sb_starttime").substring(11, 16) + "-" + data.getString("sb_endtime").substring(11, 16));
                     }
                     tv_ktv_rooms.setText(data.getString("sb_spname"));
                     tv_ktv_peoples.setText(data.getString("sb_person"));
@@ -1234,7 +1241,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
 
 
     private void invite(String user, final String modeid) {
-        LogUtil.d(TAG,"短信手机号："+user+"  模板："+modeid);
+        LogUtil.d(TAG, "短信手机号：" + user + "  模板：" + modeid);
         final String name = CommonUtil.getName();
         final String phone = user.trim().replaceAll(" ", "");
         if (!StringUtil.isMobileNumber(phone)) {
@@ -1250,9 +1257,9 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
         }, new StringJsonObjectRequest.Listener<AddAttentionResult>() {
             @Override
             public void onResponse(ObjectResult<AddAttentionResult> result) {
-              //  showToast("短信发送成功", R.color.load_submit);
+                //  showToast("短信发送成功", R.color.load_submit);
                 //ToastUtil.showToast(MyApplication.getInstance(),"短信发送成功");
-             //   Toast.makeText(MyApplication.getInstance(),"短信发送成功",Toast.LENGTH_SHORT).show();
+                //   Toast.makeText(MyApplication.getInstance(),"短信发送成功",Toast.LENGTH_SHORT).show();
 
             }
         }, AddAttentionResult.class, null) {
@@ -1311,8 +1318,8 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
 
         dialog.show();
     }
-    
-    public void showDialog(String content){
+
+    public void showDialog(String content) {
         MaterialDialog dialog = new MaterialDialog.Builder(this)
                 .content(content)
                 .positiveText("知道了")
@@ -1324,6 +1331,6 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                 })
                 .build();
         dialog.show();
-                
+
     }
 }

app_modular/appbooking/src/main/java/com/modular/booking/activity/utils/GridSelectActivity.java

@@ -4,7 +4,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
-import android.widget.AdapterView;
 import android.widget.GridView;
 
 import com.alibaba.fastjson.JSON;
@@ -70,41 +69,67 @@ public class GridSelectActivity extends OABaseActivity{
     }
     private static final String TAG = "GridSelectActivity";
     public void initEvent(){
-        
-        gvTopic.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+        itemAdapter.setmOnBookClickListener(new ItemRoomsSelectAdapter.OnBookClickListener() {
             @Override
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                 final ItemRoomsSelectAdapter.ViewHolder menuModel = (ItemRoomsSelectAdapter.ViewHolder) view.getTag();
-                menuModel.tvBookAction.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-//                        ToastMessage("点击事件！");
-                        LogUtil.d(TAG,"按钮点击事件!");
-                        ToastMessage(""+menuModel.model.getDesc()+menuModel.model.getTitle());
+            public void onBookClick(View view, int position) {
+                SBMenuModel menuModel = menuModels.get(position);
+                LogUtil.d(TAG, "按钮点击事件!");
+                ToastMessage("" + menuModel.getDesc() + menuModel.getTitle());
 
-                        if (menuModel.model.isBooking()){
-                            ToastMessage("包间已满，不可预订！");
-                        }else{
-                            setResult(0x21,new Intent().putExtra("data",menuModel.model));
-                            finish();
-                        }
-                    }
-                });
-//                
-                menuModel.ivItem.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        LogUtil.d(TAG,"图片点击事件!");
-                        String loginUserId =menuModel.model.getUrl();
-                        Intent intent = new Intent(activity, SingleImagePreviewActivity.class);
-                        intent.putExtra(AppConstant.EXTRA_IMAGE_URI, loginUserId);
-                        startActivity(intent);
-                    }
-                });
-               
-               
+                if (menuModel.isBooking()) {
+                    ToastMessage("包间已满，不可预订！");
+                } else {
+                    setResult(0x21, new Intent().putExtra("data", menuModel));
+                    finish();
+                }
             }
         });
+
+        itemAdapter.setmOnImageClickListener(new ItemRoomsSelectAdapter.OnImageClickListener() {
+            @Override
+            public void onImageClick(View view, int position) {
+                SBMenuModel menuModel = menuModels.get(position);
+                LogUtil.d(TAG, "图片点击事件!");
+                String loginUserId = menuModel.getUrl();
+                Intent intent = new Intent(activity, SingleImagePreviewActivity.class);
+                intent.putExtra(AppConstant.EXTRA_IMAGE_URI, loginUserId);
+                startActivity(intent);
+            }
+        });
+//        gvTopic.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+//            @Override
+//            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+//                 final ItemRoomsSelectAdapter.ViewHolder menuModel = (ItemRoomsSelectAdapter.ViewHolder) view.getTag();
+//                menuModel.tvBookAction.setOnClickListener(new View.OnClickListener() {
+//                    @Override
+//                    public void onClick(View v) {
+////                        ToastMessage("点击事件！");
+//                        LogUtil.d(TAG,"按钮点击事件!");
+//                        ToastMessage(""+menuModel.model.getDesc()+menuModel.model.getTitle());
+//
+//                        if (menuModel.model.isBooking()){
+//                            ToastMessage("包间已满，不可预订！");
+//                        }else{
+//                            setResult(0x21,new Intent().putExtra("data",menuModel.model));
+//                            finish();
+//                        }
+//                    }
+//                });
+////                
+//                menuModel.ivItem.setOnClickListener(new View.OnClickListener() {
+//                    @Override
+//                    public void onClick(View v) {
+//                        LogUtil.d(TAG,"图片点击事件!");
+//                        String loginUserId =menuModel.model.getUrl();
+//                        Intent intent = new Intent(activity, SingleImagePreviewActivity.class);
+//                        intent.putExtra(AppConstant.EXTRA_IMAGE_URI, loginUserId);
+//                        startActivity(intent);
+//                    }
+//                });
+//               
+//               
+//            }
+//        });
        
     }
 }

app_modular/appbooking/src/main/java/com/modular/booking/activity/utils/GridSelectDateActivity.java

@@ -22,6 +22,7 @@ import com.core.app.MyApplication;
 import com.core.base.OABaseActivity;
 import com.core.model.SelectBean;
 import com.core.widget.view.selectcalendar.SelectCalendarActivity;
+import com.litesuits.orm.db.annotation.Ignore;
 import com.me.network.app.http.HttpClient;
 import com.me.network.app.http.Method;
 import com.me.network.app.http.rx.ResultListener;
@@ -32,6 +33,8 @@ import com.modular.booking.adapter.ItemRoomsSelectAdapter;
 import com.modular.booking.model.SBMenuModel;
 
 import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -46,6 +49,9 @@ public class GridSelectDateActivity extends OABaseActivity {
     ArrayList<SelectBean> selectBeens = new ArrayList<SelectBean>();
     private TextView tvTopDate;
     private ImageView back;
+    private TextView tvVStart;
+    private TextView tvVAfter;
+    private String companyId;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -60,11 +66,44 @@ public class GridSelectDateActivity extends OABaseActivity {
         View view = LayoutInflater.from(ct).inflate(R.layout.action_service_room, null);
         tvTopDate = (TextView) view.findViewById(R.id.tvTopDate);
         back = (ImageView) view.findViewById(R.id.book_service_search_back);
+        tvVStart = (TextView) view.findViewById(R.id.tvVStart);
+        tvVAfter = (TextView) view.findViewById(R.id.tvVAfter);
+        
         ActionBar bar = this.getSupportActionBar();
         bar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
         bar.setBackgroundDrawable(getResources().getDrawable(R.color.antionbarcolor));
         bar.setCustomView(view);
-
+      
+        tvVStart.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                String date =tvTopDate.getText().toString();
+                Calendar calendar = Calendar.getInstance();
+                calendar.setTime(DateFormatUtil.getDate4StrDate(date, "yyyy-MM-dd HH:mm"));
+                calendar.add( Calendar.DATE,-1);//把日期往后增加一天.整数往后推,负数往前移动 
+                System.out.println(DateFormatUtil.getStrDate4Date(calendar.getTime(), "yyyy-MM-dd HH:mm"));
+                String curTime= DateFormatUtil.getStrDate4Date(calendar.getTime(), "yyyy-MM-dd HH:mm");
+                if (curTime.compareTo(DateFormatUtil.getStrDate4Date(new Date(),"yyyy-MM-dd HH:mm"))<0){
+                    ToastMessage("不能选择过去的时间");
+                    return;
+                }
+                tvTopDate.setText(curTime);
+                getBookingDataState(curTime,ServiceUtils.getCodeDateByService(curTime));
+            }
+        });
+        tvVAfter.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                String date =tvTopDate.getText().toString();
+                Calendar calendar = Calendar.getInstance();
+                calendar.setTime(DateFormatUtil.getDate4StrDate(date, "yyyy-MM-dd HH:mm"));
+                calendar.add( Calendar.DATE,1);//把日期往后增加一天.整数往后推,负数往前移动 
+                System.out.println(DateFormatUtil.getStrDate4Date(calendar.getTime(), "yyyy-MM-dd HH:mm"));
+                String curTime= DateFormatUtil.getStrDate4Date(calendar.getTime(), "yyyy-MM-dd HH:mm");
+                tvTopDate.setText(curTime);
+                getBookingDataState(curTime,ServiceUtils.getCodeDateByService(curTime));
+            }
+        });
         back.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -74,6 +113,11 @@ public class GridSelectDateActivity extends OABaseActivity {
         if (getIntent() != null) {
             selectBeens = getIntent().getParcelableArrayListExtra("data");
             getSupportActionBar().setTitle(getIntent().getStringExtra("title"));
+            companyId=getIntent().getStringExtra("companyId");
+            String date =getIntent().getStringExtra("date");
+            tvTopDate.setText(date);
+            getBookingDataState(date,ServiceUtils.getCodeDateByService(date));
+            LogUtil.d(TAG,JSON.toJSONString(selectBeens));
             if (!ListUtils.isEmpty(selectBeens)) {
                 for (int i = 0; i < selectBeens.size(); i++) {
                     SelectBean selectBean = selectBeens.get(i);
@@ -185,7 +229,8 @@ public class GridSelectDateActivity extends OABaseActivity {
                     String startTime = data.getStringExtra("startDate");
                     String displayDate = startTime;
                     tvTopDate.setText(displayDate);
-                    getBookingDataState(DateFormatUtil.getStrDate4Date(DateFormatUtil.getDate4StrDate(displayDate, "yyyyMMdd"), "yyyyMMdd"));
+                    getBookingDataState(displayDate
+                    ,ServiceUtils.getCodeDateByService(displayDate));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -194,14 +239,17 @@ public class GridSelectDateActivity extends OABaseActivity {
     }
 
 
-    public void getBookingDataState(String date) {
-        LogUtil.d(TAG, "date:" + date);
+    public void getBookingDataState(String date, final int state) {
+        date=DateFormatUtil.getStrDate4Date(DateFormatUtil.getDate4StrDate(date, "yyyy-MM-dd"), "yyyyMMdd");
+        LogUtil.d(TAG, "date:" + date+" +state:"+state);
         //http://113.105.74.135:8092/user/appServiceBusytime?yearmonth=20171109&token=8a07b517fdd94248b7f00d120ab29502&commonid=0&type=餐饮&companyid=10002&client=Android%20Client
         HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).build();
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appServiceBusytime")
                 .add("yearmonth", date)
                 .add("commonid", "0")
+                .add("type","餐饮")
+                .add("companyid",companyId)
                 .add("token", MyApplication.getInstance().mAccessToken)
                 .method(Method.GET)
                 .build(), new ResultSubscriber<Object>(new ResultListener<Object>() {
@@ -210,12 +258,45 @@ public class GridSelectDateActivity extends OABaseActivity {
             public void onResponse(Object o) {
                 try {
                     LogUtil.d(TAG, o.toString());
+                    LogUtil.d(TAG,JSON.toJSONString(menuModels));
                     JSONArray reslut = JSON.parseObject(o.toString()).getJSONArray("reslut");
+               
                     if (reslut != null) {
                         for (int i = 0; i < reslut.size(); i++) {
                             JSONObject object = reslut.getJSONObject(i);
+                            //名字
+                            String sb_spname=object.getString("sb_spname");
+                            //时间状态 1，2，3
+                            String  sb_endtime=object.getString("sb_endtime");
 
+                            for (int j = 0; j <menuModels.size() ; j++) {
+                                SBMenuModel menuModel=menuModels.get(j);
+                                if (menuModel.getTitle().equals(sb_spname)){
+                                    if (sb_endtime.equals(String.valueOf(state))){
+                                        menuModel.setBooking(true);//已经预约
+                                    }else{
+                                        menuModel.setBooking(false);//未被预约
+                                    }
+                                }
+                            }
+                            
+                        }
+                        if (reslut.size()==0){
+                            //{"reslut":[]}  全部可以预约
+                            for (int i = 0; i <menuModels.size() ; i++) {
+                                menuModels.get(i).setBooking(false);
+                            }
+                        }
+                        LogUtil.d(TAG,JSON.toJSONString(menuModels));
+                        itemAdapter.notifyDataSetChanged();
+                    }else{
+                      
+                        //{"reslut":[]}  全部可以预约
+                        for (int i = 0; i <menuModels.size() ; i++) {
+                            menuModels.get(i).setBooking(false);
                         }
+                        LogUtil.d(TAG,"[]:"+JSON.toJSONString(menuModels));
+                        itemAdapter.notifyDataSetChanged();
                     }
 
                 } catch (Exception e) {

app_modular/appbooking/src/main/java/com/modular/booking/adapter/ItemPopListAdapter.java

@@ -21,7 +21,7 @@ import java.util.List;
 public class ItemPopListAdapter extends BaseAdapter {
 
     private List<ItemsSelectType1> objects = new ArrayList<ItemsSelectType1>();
-    private int selectId=1;
+    private int selectId=7;
     private Context context;
     private LayoutInflater layoutInflater;
 

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

@@ -1,29 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/book_service_action"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="48dp">
+
     <ImageView
         android:id="@+id/book_service_search_back"
         android:layout_width="24dp"
         android:layout_height="24dp"
-        android:layout_marginRight="60dp"
         android:layout_centerVertical="true"
-        android:src="@drawable/ic_action_back" />
-<TextView
-    android:id="@+id/tvTopDate"
-    android:layout_toRightOf="@+id/book_service_search_back"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content" 
-    android:layout_centerInParent="true"
-    android:textStyle="bold"
-    android:gravity="center"
-    android:drawablePadding="10dp"
-    android:drawableLeft="@drawable/icon_day_qian"
-    android:drawableRight="@drawable/icon_day_after"
-    android:textColor="@color/white"
-    android:textSize="17sp"
-    android:text="2017-11-09 12:13"/>
+        android:layout_marginRight="60dp"
+        android:src="@drawable/ic_action_back" 
+        />
+   <TextView
+       android:id="@+id/tvVStart"
+       android:layout_width="wrap_content"
+       android:layout_height="wrap_content"
+       android:layout_centerVertical="true"
+       android:padding="10dp"
+       android:drawableLeft="@drawable/icon_day_qian"
+       android:layout_toLeftOf="@+id/tvTopDate"/>
+    <TextView
+        android:id="@+id/tvTopDate"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:layout_toRightOf="@+id/book_service_search_back"
 
+        android:drawablePadding="10dp"
+      
+        android:gravity="center"
+        android:text="2017-11-09 12:13"
+        android:textColor="@color/white"
+        android:textSize="17sp"
+        android:textStyle="bold" />
+    <TextView
+        android:id="@+id/tvVAfter"
+        android:padding="10dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:drawableRight="@drawable/icon_day_after"
+        android:layout_toRightOf="@+id/tvTopDate"/>
 </RelativeLayout>

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

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -27,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:alpha="0.16"
-                android:scaleType="fitXY"/>
+                android:scaleType="fitXY" />
 
             <de.hdodenhof.circleimageview.CircleImageView
                 android:id="@+id/iv_header"
@@ -39,8 +38,7 @@
                 android:layout_marginLeft="12dp"
                 android:layout_marginStart="12dp"
                 android:background="@null"
-                android:src="@drawable/defaultpic">
-            </de.hdodenhof.circleimageview.CircleImageView>
+                android:src="@drawable/defaultpic"></de.hdodenhof.circleimageview.CircleImageView>
 
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -54,22 +52,22 @@
                     android:id="@+id/tv_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="********"
-                    android:gravity="center_vertical"
                     android:drawableRight="@drawable/icon_detail"
+                    android:gravity="center_vertical"
+                    android:text="********"
                     android:textColor="@color/black"
                     android:textSize="20sp"
-                    android:textStyle="bold"/>
+                    android:textStyle="bold" />
 
                 <TextView
                     android:id="@+id/tv_sub"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:drawableRight="@drawable/icon_map"
                     android:gravity="center_vertical"
                     android:text="********"
-                    android:drawableRight="@drawable/icon_map"
                     android:textColor="@color/black"
-                    android:textSize="14sp"/>
+                    android:textSize="14sp" />
             </LinearLayout>
         </RelativeLayout>
 
@@ -92,7 +90,7 @@
                     style="@style/item_menu_tag"
                     android:gravity="center_vertical"
                     android:text="@string/service_ktv_rooms"
-                    android:textColor="@color/hintColor"/>
+                    android:textColor="@color/hintColor" />
 
                 <TextView
                     android:id="@+id/tv_ktv_rooms"
@@ -102,7 +100,7 @@
                     android:contentDescription="@string/service_ktv_rooms"
                     android:drawableRight="@drawable/oa_next"
                     android:hint="@string/common_select"
-                    android:textColor="@color/hintColor"/>
+                    android:textColor="@color/hintColor" />
             </RelativeLayout>
 
             <RelativeLayout
@@ -116,7 +114,7 @@
                     android:layout_alignParentStart="true"
                     android:layout_alignParentTop="true"
                     android:gravity="center_vertical"
-                    android:text="@string/service_ktv_times"/>
+                    android:text="@string/service_ktv_times" />
 
                 <TextView
                     android:id="@+id/tv_ktv_times"
@@ -126,20 +124,20 @@
                     android:drawablePadding="6dp"
                     android:drawableRight="@drawable/oa_next"
                     android:ellipsize="end"
-                    android:hint="@string/common_select"/>
+                    android:hint="@string/common_select" />
             </RelativeLayout>
 
 
             <RelativeLayout
                 android:id="@+id/ktv_people_rl"
-                android:visibility="gone"
-                style="@style/item_menu">
+                style="@style/item_menu"
+                android:visibility="gone">
 
                 <TextView
                     android:id="@+id/tag_ktv_peoples"
                     style="@style/item_menu_tag"
                     android:gravity="center_vertical"
-                    android:text="@string/service_ktv_peoples"/>
+                    android:text="@string/service_ktv_peoples" />
 
                 <TextView
                     android:id="@+id/tv_ktv_peoples"
@@ -148,7 +146,7 @@
                     android:layout_toRightOf="@id/tag_ktv_peoples"
                     android:drawablePadding="6dp"
                     android:drawableRight="@drawable/oa_next"
-                    android:hint="@string/common_select"/>
+                    android:hint="@string/common_select" />
             </RelativeLayout>
         </LinearLayout>
 
@@ -171,7 +169,7 @@
                     android:layout_alignParentStart="true"
                     android:layout_alignParentTop="true"
                     android:gravity="center_vertical"
-                    android:text="@string/service_club_list"/>
+                    android:text="@string/service_club_list" />
 
                 <TextView
                     android:id="@+id/tv_club_technician"
@@ -182,7 +180,7 @@
                     android:drawablePadding="6dp"
                     android:drawableRight="@drawable/oa_next"
                     android:ellipsize="end"
-                    android:hint="@string/common_select"/>
+                    android:hint="@string/common_select" />
             </RelativeLayout>
 
             <RelativeLayout
@@ -194,7 +192,7 @@
                     style="@style/item_menu_tag"
                     android:gravity="center_vertical"
                     android:text="@string/service_club_rooms"
-                    android:textColor="@color/hintColor"/>
+                    android:textColor="@color/hintColor" />
 
                 <TextView
                     android:id="@+id/tv_club_time"
@@ -203,19 +201,19 @@
                     android:layout_toRightOf="@id/tag_club_tim"
                     android:drawableRight="@drawable/oa_next"
                     android:hint="@string/common_select"
-                    android:textColor="@color/hintColor"/>
+                    android:textColor="@color/hintColor" />
             </RelativeLayout>
 
             <RelativeLayout
                 android:id="@+id/club_pepoles_rl"
-                android:visibility="gone"
-                style="@style/item_menu">
+                style="@style/item_menu"
+                android:visibility="gone">
 
                 <TextView
                     android:id="@+id/tag_club_peoples"
                     style="@style/item_menu_tag"
                     android:gravity="center_vertical"
-                    android:text="@string/service_ktv_peoples"/>
+                    android:text="@string/service_ktv_peoples" />
 
                 <TextView
                     android:id="@+id/tv_club_peoples"
@@ -224,7 +222,7 @@
                     android:layout_toRightOf="@id/tag_club_peoples"
                     android:drawablePadding="6dp"
                     android:drawableRight="@drawable/oa_next"
-                    android:hint="@string/common_select"/>
+                    android:hint="@string/common_select" />
             </RelativeLayout>
         </LinearLayout>
 
@@ -247,7 +245,7 @@
                     android:layout_alignParentStart="true"
                     android:layout_alignParentTop="true"
                     android:gravity="center_vertical"
-                    android:text="@string/service_hospital_times"/>
+                    android:text="@string/service_hospital_times" />
 
                 <TextView
                     android:id="@+id/tv_hospital_rooms"
@@ -258,7 +256,7 @@
                     android:drawablePadding="6dp"
                     android:drawableRight="@drawable/oa_next"
                     android:ellipsize="end"
-                    android:hint="@string/common_select"/>
+                    android:hint="@string/common_select" />
             </RelativeLayout>
 
             <RelativeLayout
@@ -270,7 +268,7 @@
                     style="@style/item_menu_tag"
                     android:gravity="center_vertical"
                     android:text="@string/service_hospital_rooms"
-                    android:textColor="@color/hintColor"/>
+                    android:textColor="@color/hintColor" />
 
                 <TextView
                     android:id="@+id/tag_hospital_doctor"
@@ -279,7 +277,7 @@
                     android:layout_toRightOf="@id/tag_hospital_rooms"
                     android:drawableRight="@drawable/oa_next"
                     android:hint="@string/common_select"
-                    android:textColor="@color/hintColor"/>
+                    android:textColor="@color/hintColor" />
             </RelativeLayout>
 
             <RelativeLayout
@@ -290,7 +288,7 @@
                     android:id="@+id/tag_hospital_people"
                     style="@style/item_menu_tag"
                     android:gravity="center_vertical"
-                    android:text="@string/service_hospital_peoples"/>
+                    android:text="@string/service_hospital_peoples" />
 
                 <TextView
                     android:id="@+id/tv_hospital_time"
@@ -299,7 +297,7 @@
                     android:layout_toRightOf="@id/tag_hospital_people"
                     android:drawablePadding="6dp"
                     android:drawableRight="@drawable/oa_next"
-                    android:hint="@string/common_select"/>
+                    android:hint="@string/common_select" />
             </RelativeLayout>
         </LinearLayout>
 
@@ -322,7 +320,7 @@
                     android:layout_alignParentStart="true"
                     android:layout_alignParentTop="true"
                     android:gravity="center_vertical"
-                    android:text="@string/service_sport_times"/>
+                    android:text="@string/service_sport_times" />
 
                 <TextView
                     android:id="@+id/tv_sport_time"
@@ -332,7 +330,7 @@
                     android:drawablePadding="6dp"
                     android:drawableRight="@drawable/oa_next"
                     android:ellipsize="end"
-                    android:hint="@string/common_select"/>
+                    android:hint="@string/common_select" />
             </RelativeLayout>
 
             <RelativeLayout
@@ -344,7 +342,7 @@
                     style="@style/item_menu_tag"
                     android:gravity="center_vertical"
                     android:text="@string/service_sport_rooms"
-                    android:textColor="@color/hintColor"/>
+                    android:textColor="@color/hintColor" />
 
                 <TextView
                     android:id="@+id/tv_sport_rooms"
@@ -354,19 +352,19 @@
                     android:contentDescription="@string/service_sport_rooms"
                     android:drawableRight="@drawable/oa_next"
                     android:hint="@string/common_select"
-                    android:textColor="@color/hintColor"/>
+                    android:textColor="@color/hintColor" />
             </RelativeLayout>
 
             <RelativeLayout
                 android:id="@+id/sport_peoples_rl"
-                android:visibility="gone"
-                style="@style/item_menu">
+                style="@style/item_menu"
+                android:visibility="gone">
 
                 <TextView
                     android:id="@+id/tag_sport_peoples"
                     style="@style/item_menu_tag"
                     android:gravity="center_vertical"
-                    android:text="@string/service_ktv_peoples"/>
+                    android:text="@string/service_ktv_peoples" />
 
                 <TextView
                     android:id="@+id/tv_sport_peoples"
@@ -375,7 +373,7 @@
                     android:layout_toRightOf="@id/tag_sport_peoples"
                     android:drawablePadding="6dp"
                     android:drawableRight="@drawable/oa_next"
-                    android:hint="@string/common_select"/>
+                    android:hint="@string/common_select" />
             </RelativeLayout>
         </LinearLayout>
 
@@ -398,7 +396,7 @@
                     android:layout_alignParentStart="true"
                     android:layout_alignParentTop="true"
                     android:gravity="center_vertical"
-                    android:text="@string/service_hair_times"/>
+                    android:text="@string/service_hair_times" />
 
                 <TextView
                     android:id="@+id/tv_hair_times"
@@ -411,7 +409,7 @@
                     android:drawablePadding="6dp"
                     android:drawableRight="@drawable/oa_next"
                     android:ellipsize="end"
-                    android:hint="@string/common_select"/>
+                    android:hint="@string/common_select" />
             </RelativeLayout>
 
             <RelativeLayout
@@ -423,7 +421,7 @@
                     style="@style/item_menu_tag"
                     android:gravity="center_vertical"
                     android:text="@string/service_hair_rooms"
-                    android:textColor="@color/hintColor"/>
+                    android:textColor="@color/hintColor" />
 
                 <TextView
                     android:id="@+id/tv_hair_rooms"
@@ -436,7 +434,7 @@
                     android:contentDescription="@string/service_hair_rooms"
                     android:drawableRight="@drawable/oa_next"
                     android:hint="@string/common_select"
-                    android:textColor="@color/hintColor"/>
+                    android:textColor="@color/hintColor" />
             </RelativeLayout>
 
             <RelativeLayout
@@ -447,7 +445,7 @@
                 <TextView
                     style="@style/item_menu_tag"
                     android:gravity="center_vertical"
-                    android:text="@string/service_ktv_peoples"/>
+                    android:text="@string/service_ktv_peoples" />
 
                 <TextView
                     android:id="@+id/tv_hair_peoples"
@@ -456,7 +454,7 @@
                     android:layout_toRightOf="@id/company_tag"
                     android:drawablePadding="6dp"
                     android:drawableRight="@drawable/oa_next"
-                    android:hint="@string/common_select"/>
+                    android:hint="@string/common_select" />
             </RelativeLayout>
         </LinearLayout>
 
@@ -476,9 +474,9 @@
                     android:id="@+id/tag_food_peoples"
                     style="@style/item_menu_tag"
                     android:gravity="center_vertical"
-                    android:text="@string/service_food_peoples"/>
+                    android:text="@string/service_food_peoples" />
+
 
-               
                 <TextView
                     android:id="@+id/tv_food_peoples"
                     style="@style/item_menu_input"
@@ -486,12 +484,13 @@
                     android:layout_toRightOf="@id/tag_food_peoples"
                     android:drawablePadding="6dp"
                     android:drawableRight="@drawable/oa_next"
-                    android:hint=""/>
+                    android:hint="" />
+
                 <com.modular.booking.widget.AddSubUtils
                     android:id="@+id/add_sub"
                     android:layout_width="120dp"
                     android:layout_height="50dp"
-                    android:layout_alignParentRight="true"/>
+                    android:layout_alignParentRight="true" />
             </RelativeLayout>
 
             <RelativeLayout
@@ -505,7 +504,7 @@
                     android:layout_alignParentStart="true"
                     android:layout_alignParentTop="true"
                     android:gravity="center_vertical"
-                    android:text="@string/service_food_times"/>
+                    android:text="@string/service_food_times" />
 
                 <TextView
                     android:id="@+id/tv_food_times"
@@ -515,7 +514,7 @@
                     android:drawablePadding="6dp"
                     android:drawableRight="@drawable/oa_next"
                     android:ellipsize="end"
-                    android:hint="@string/common_select"/>
+                    android:hint="@string/common_select" />
             </RelativeLayout>
 
             <RelativeLayout
@@ -527,7 +526,7 @@
                     style="@style/item_menu_tag"
                     android:gravity="center_vertical"
                     android:text="@string/service_food_rooms"
-                    android:textColor="@color/hintColor"/>
+                    android:textColor="@color/hintColor" />
 
                 <TextView
                     android:id="@+id/tv_food_rooms"
@@ -541,14 +540,14 @@
                     android:drawableRight="@drawable/oa_next"
                     android:hint="@string/common_select"
                     android:text="否"
-                    android:textColor="@color/hintColor"/>
+                    android:textColor="@color/hintColor" />
             </RelativeLayout>
 
         </LinearLayout>
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="10dp"/>
+            android:layout_height="10dp" />
 
 
         <LinearLayout
@@ -567,7 +566,7 @@
                     android:layout_alignParentStart="true"
                     android:layout_alignParentTop="true"
                     android:gravity="center_vertical"
-                    android:text="@string/service_name"/>
+                    android:text="@string/service_name" />
 
                 <EditText
                     android:id="@+id/et_book_name"
@@ -576,7 +575,7 @@
                     android:layout_toRightOf="@id/tag_book_name"
                     android:drawablePadding="6dp"
                     android:ellipsize="end"
-                    android:hint="@string/common_input2"/>
+                    android:hint="@string/common_input2" />
 
             </RelativeLayout>
 
@@ -591,18 +590,18 @@
                     android:layout_alignParentStart="true"
                     android:layout_alignParentTop="true"
                     android:gravity="center_vertical"
-                    android:text="@string/service_phone"/>
+                    android:text="@string/service_phone" />
 
                 <EditText
                     android:id="@+id/et_book_phone"
                     style="@style/item_menu_input"
                     android:layout_width="110dp"
-                    android:drawablePadding="2dp"
                     android:drawableLeft="@drawable/icon_tel"
-                    android:textColor="#0CB88C"
+                    android:drawablePadding="2dp"
                     android:ellipsize="end"
                     android:hint="@string/common_input2"
-                    android:inputType="phone"/>
+                    android:inputType="phone"
+                    android:textColor="#0CB88C" />
 
             </RelativeLayout>
 
@@ -617,7 +616,7 @@
                     android:layout_alignParentStart="true"
                     android:layout_alignParentTop="true"
                     android:gravity="center_vertical"
-                    android:text="@string/service_notes"/>
+                    android:text="@string/service_notes" />
 
                 <EditText
                     android:id="@+id/et_book_notes"
@@ -626,7 +625,7 @@
                     android:layout_toRightOf="@id/tag_book_notes"
                     android:drawablePadding="6dp"
                     android:ellipsize="end"
-                    android:hint="@string/common_input2"/>
+                    android:hint="@string/common_input2" />
 
 
             </RelativeLayout>
@@ -650,7 +649,7 @@
                 android:padding="10dp"
                 android:text="@string/app_button_commit"
                 android:textColor="@color/white"
-                android:textSize="@dimen/text_main"/>
+                android:textSize="@dimen/text_main" />
         </RelativeLayout>
     </LinearLayout>
 </ScrollView>

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BSettingActivity.java

@@ -116,7 +116,7 @@ public class BSettingActivity extends BaseActivity implements View.OnClickListen
         rTyperl.setOnClickListener(this);
 
         if ("餐饮".equals(sc_industry))
-            rTyperl.setVisibility(View.VISIBLE);
+            rTyperl.setVisibility(View.GONE);
         else
             rTyperl.setVisibility(View.GONE);
     }