服务预约： fix bug

app_core/common/src/main/java/com/core/widget/view/selectcalendar/SelectCalendarActivity.java

@@ -748,6 +748,10 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
      */
     public List<DataState> timeAddMuilt(String start, String end, int minute) {
         LogUtil.d("Test", "timeAddMuilt start:");
+        if (StringUtil.isEmpty(start)||StringUtil.isEmpty(end)){
+            start="08:30";
+            end="21:30";
+        }
         List<DataState> result = new ArrayList<>();
         DataState dataState = new DataState();
         dataState.setValue(start);

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

@@ -131,30 +131,62 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
             isEdited = intent.getBooleanExtra("isEdited", true);
             isHasPerson = intent.getBooleanExtra("isHasPerson", false);
             dataService = intent.getStringExtra("dataService");
+            //两个字段是从选择人员界面选过来的
             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);
             if (model != null) {
                 LogUtil.i(model.toString());
                 initType(model.getType());
                 if (isEdited) {
                     submit_btn.setText("提交");
-                    AvatarHelper.getInstance().display(model.getUrl(), iv_header, true);
-                    AvatarHelper.getInstance().display(model.getUrl(), max_img, true);
+                    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("特聘导师");
+                        }else{
+                            tv_sub.setText("特聘技师");
+                        }
+                    }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 {
+        
                     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");
                     if ("已取消".equals(sb_status)) {
                         submit_btn.setVisibility(View.GONE);
                     } else {
                         submit_btn.setVisibility(View.VISIBLE);
                     }
-                    AvatarHelper.getInstance().display(sb_imageurl, iv_header, true);
-                    AvatarHelper.getInstance().display(sb_imageurl, max_img, true);
+                    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("特聘导师");
+                        }else{
+                            tv_sub.setText("特聘技师");
+                        }
+                    }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); 
+                    }
+                   
                     submit_btn.setText("取消");
                 }
-                tv_title.setText(model.getName());
-                tv_sub.setText(model.getAddress());
+               
                 getSupportActionBar().setTitle(model.getName());
               
 

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

@@ -44,6 +44,7 @@ public class BServiceDetailActivity extends OABaseActivity implements View.OnCli
 	private EmptyLayout mEmptyLayout;
 	private String mCompanyId, mServiceId;
 	private SBListModel model;
+	private TextView guide_title;
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
@@ -120,6 +121,7 @@ public class BServiceDetailActivity extends OABaseActivity implements View.OnCli
 
 	private void initViews() {
 		mBookStoreTv = (TextView) findViewById(R.id.book_service_detail_store_tv);
+		guide_title=(TextView) findViewById(R.id.guide_title);
 		mBookDetailPtlv = (PullToRefreshListView) findViewById(R.id.book_service_detail_ptlv);
 		mBookDetailPtlv.setMode(PullToRefreshBase.Mode.DISABLED);
 
@@ -132,6 +134,15 @@ public class BServiceDetailActivity extends OABaseActivity implements View.OnCli
 			model = getIntent().getParcelableExtra("model");
 			getSupportActionBar().setTitle(model.getName());
 			LogUtil.d("myTest", "model:" + JSON.toJSONString(model));
+			if ("10005".equals(model.getIndustrycode())){
+				//会所
+				mBookStoreTv.setText("不指定技师，预约门店");
+				guide_title.setText("指定技师");
+			}else if("10004".equals(model.getIndustrycode())){
+				//美容美化
+				mBookStoreTv.setText("不指定发型师，预约门店");
+				guide_title.setText("指定发型师");
+			}
 		}
 
 		mHttpClient = new HttpClient.Builder(Constants.IM_BASE_URL).isDebug(true).build();

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

@@ -40,5 +40,7 @@
         android:id="@+id/book_service_detail_ptlv"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:divider="@color/item_line"
+        android:dividerHeight="@dimen/line"
       />
 </LinearLayout>

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

@@ -7,8 +7,8 @@
 
     <ImageView
         android:id="@+id/bservice_storeman_iv"
-        android:layout_width="60dp"
-        android:layout_height="60dp"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
         android:layout_margin="10dp"
         android:src="@drawable/defaultpic" />