合并服务预约代码

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

@@ -114,7 +114,6 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
 		Intent intent = getIntent();
 		if (intent != null) {
 			model = intent.getParcelableExtra("model");
-			//TODO 如果选择技师，应传过来技师对应的 id和名字
 			sb_userid = intent.getStringExtra("sb_userid");
 			sb_username = intent.getStringExtra("sb_username");
 			if (model != null) {
@@ -617,20 +616,6 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
 		return map;
 	}
 
-	@Deprecated
-	private Map<String, Object> setMapData(TextView... tvs) {
-		Map<String, Object> map = new HashMap<>();
-		if (tvs != null && tvs.length > 0) {
-			for (TextView tv : tvs) {
-				if (TextUtils.isEmpty(tv.getText())) {
-					return null;
-				} else {
-					map.put("xxx", StringUtil.getTextRexHttp(tv));//姓名
-				}
-			}
-		}
-		return map;
-	}
 
 	private void setTime(Map<String, Object> map, TextView tv) {
 		//这个需要与选择时段相对应，有model确定选择的是时间点还是时段

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

@@ -1,7 +1,9 @@
 package com.modular.booking.activity.services;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
+import android.widget.AdapterView;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
@@ -22,7 +24,7 @@ import com.me.network.app.http.rx.ResultListener;
 import com.me.network.app.http.rx.ResultSubscriber;
 import com.modular.booking.R;
 import com.modular.booking.adapter.ItemBserviceStoremanListAdapter;
-import com.modular.booking.model.SBMenuModel;
+import com.modular.booking.model.SBListModel;
 import com.modular.booking.model.SBStoremanModel;
 
 import java.util.ArrayList;
@@ -34,104 +36,115 @@ import java.util.List;
  */
 
 public class BServiceDetailActivity extends OABaseActivity implements View.OnClickListener {
-    private TextView mBookStoreTv;
-    private PullToRefreshListView mBookDetailPtlv;
-    private HttpClient mHttpClient;
-    private ItemBserviceStoremanListAdapter mStoremanListAdapter;
-    private List<SBStoremanModel> mStoremanModels;
-    private EmptyLayout mEmptyLayout;
-    private String mCompanyId, mServiceId;
-    private SBMenuModel mMenuModel;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_book_service_detail);
-
-        initViews();
-        initEvents();
-        initDatas();
-    }
-
-    private void initDatas() {
-        progressDialog.show();
-        mCompanyId = "201";
-        mServiceId = "10001";
-
-        mHttpClient.Api().send(new HttpClient.Builder()
-                .url("/user/appStoreman")
-                .add("companyid", mCompanyId)
-                .add("serviceid", mServiceId)
-                .add("Token", MyApplication.getInstance().mAccessToken)
-                .method(Method.POST)
-                .build(), new ResultSubscriber<>(new ResultListener<Object>() {
-            @Override
-            public void onResponse(Object o) {
-                progressDialog.dismiss();
-                try {
-                    LogUtil.d("appstoreman", o.toString());
-                    if (JSONUtil.validate(o.toString())) {
-                        JSONObject resultObject = JSON.parseObject(o.toString());
-                        JSONArray resultArray = resultObject.getJSONArray("result");
-                        if (!ListUtils.isEmpty(resultArray)) {
-                            for (int i = 0; i < resultArray.size(); i++) {
-                                JSONObject jsonObject = resultArray.getJSONObject(i);
-                                SBStoremanModel sbStoremanModel = new SBStoremanModel();
-                                sbStoremanModel.setSm_companyid(jsonObject.getString("sm_companyid"));
-                                sbStoremanModel.setSm_companyname(jsonObject.getString("sm_companyname"));
-                                sbStoremanModel.setSm_id(jsonObject.getString("sm_id"));
-                                sbStoremanModel.setSm_level(jsonObject.getString("sm_level"));
-                                sbStoremanModel.setSm_stid(jsonObject.getString("sm_stid"));
-                                sbStoremanModel.setSm_stname(jsonObject.getString("sm_stname"));
-                                sbStoremanModel.setSm_telephone(jsonObject.getString("sm_telephone"));
-                                sbStoremanModel.setSm_userid(jsonObject.getString("sm_userid"));
-                                sbStoremanModel.setSm_username(jsonObject.getString("sm_username"));
-
-                                mStoremanModels.add(sbStoremanModel);
-                            }
-                            mStoremanListAdapter.notifyDataSetChanged();
-                        }
-                    }
-                    if (mStoremanModels.size() == 0) {
-                        mEmptyLayout.showEmpty();
-                    }
-                } catch (Exception e) {
-
-                }
-            }
-        }));
-    }
-
-    private void initEvents() {
-        mBookStoreTv.setOnClickListener(this);
-    }
-
-    private void initViews() {
-        mBookStoreTv = (TextView) findViewById(R.id.book_service_detail_store_tv);
-        mBookDetailPtlv = (PullToRefreshListView) findViewById(R.id.book_service_detail_ptlv);
-        mBookDetailPtlv.setMode(PullToRefreshBase.Mode.DISABLED);
-
-        mEmptyLayout = new EmptyLayout(this, mBookDetailPtlv.getRefreshableView());
-        mEmptyLayout.setShowLoadingButton(false);
-        mEmptyLayout.setShowErrorButton(false);
-        mEmptyLayout.setShowEmptyButton(false);
-
-        if (getIntent() != null) {
-            mMenuModel = getIntent().getParcelableExtra("SBMenuModel");
-            LogUtil.d("myTest", "mMenuModel:" + JSON.toJSONString(mMenuModel));
-        }
-
-        mHttpClient = new HttpClient.Builder(Constants.IM_BASE_URL).isDebug(true).build();
-        mStoremanModels = new ArrayList<>();
-        mStoremanListAdapter = new ItemBserviceStoremanListAdapter(this, mStoremanModels);
-        mBookDetailPtlv.setAdapter(mStoremanListAdapter);
-    }
-
-    @Override
-    public void onClick(View v) {
-        int id = v.getId();
-        if (id == R.id.book_service_detail_store_tv) {
-
-        }
-    }
+	private TextView mBookStoreTv;
+	private PullToRefreshListView mBookDetailPtlv;
+	private HttpClient mHttpClient;
+	private ItemBserviceStoremanListAdapter mStoremanListAdapter;
+	private List<SBStoremanModel> mStoremanModels;
+	private EmptyLayout mEmptyLayout;
+	private String mCompanyId, mServiceId;
+	private SBListModel model;
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.activity_book_service_detail);
+
+		initViews();
+		initEvents();
+		initDatas();
+	}
+
+	private void initDatas() {
+		progressDialog.show();
+		mCompanyId = model.getCompanyid();
+		mServiceId = "0";
+		mHttpClient.Api().send(new HttpClient.Builder()
+				.url("/user/appStoreman")
+				.add("companyid", mCompanyId)
+				.add("serviceid", mServiceId)
+				.add("Token", MyApplication.getInstance().mAccessToken)
+				.method(Method.POST)
+				.build(), new ResultSubscriber<>(new ResultListener<Object>() {
+			@Override
+			public void onResponse(Object o) {
+				progressDialog.dismiss();
+				try {
+					LogUtil.d("appstoreman", o.toString());
+					if (JSONUtil.validate(o.toString())) {
+						JSONObject resultObject = JSON.parseObject(o.toString());
+						JSONArray resultArray = resultObject.getJSONArray("result");
+						if (!ListUtils.isEmpty(resultArray)) {
+							for (int i = 0; i < resultArray.size(); i++) {
+								JSONObject jsonObject = resultArray.getJSONObject(i);
+								SBStoremanModel sbStoremanModel = new SBStoremanModel();
+								sbStoremanModel.setSm_companyid(jsonObject.getString("sm_companyid"));
+								sbStoremanModel.setSm_companyname(jsonObject.getString("sm_companyname"));
+								sbStoremanModel.setSm_id(jsonObject.getString("sm_id"));
+								sbStoremanModel.setSm_level(jsonObject.getString("sm_level"));
+								sbStoremanModel.setSm_stid(jsonObject.getString("sm_stid"));
+								sbStoremanModel.setSm_stname(jsonObject.getString("sm_stname"));
+								sbStoremanModel.setSm_telephone(jsonObject.getString("sm_telephone"));
+								sbStoremanModel.setSm_userid(jsonObject.getString("sm_userid"));
+								sbStoremanModel.setSm_username(jsonObject.getString("sm_username"));
+								mStoremanModels.add(sbStoremanModel);
+							}
+							mStoremanListAdapter.notifyDataSetChanged();
+						}
+					}
+					if (mStoremanModels.size() == 0) {
+						mEmptyLayout.showEmpty();
+					}
+				} catch (Exception e) {
+
+				}
+			}
+		}));
+	}
+
+	private void initEvents() {
+		mBookStoreTv.setOnClickListener(this);
+		mBookDetailPtlv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+			@Override
+			public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+				SBStoremanModel bean = mStoremanListAdapter.getItem((int) id);
+				Intent intent = new Intent(ct, BServiceAddActivity.class);
+				intent.putExtra("model", model);
+				intent.putExtra("sb_userid", bean.getSm_userid());
+				intent.putExtra("sb_username", bean.getSm_username());
+				startActivity(intent);
+			}
+		});
+	}
+
+	private void initViews() {
+		mBookStoreTv = (TextView) findViewById(R.id.book_service_detail_store_tv);
+		mBookDetailPtlv = (PullToRefreshListView) findViewById(R.id.book_service_detail_ptlv);
+		mBookDetailPtlv.setMode(PullToRefreshBase.Mode.DISABLED);
+
+		mEmptyLayout = new EmptyLayout(this, mBookDetailPtlv.getRefreshableView());
+		mEmptyLayout.setShowLoadingButton(false);
+		mEmptyLayout.setShowErrorButton(false);
+		mEmptyLayout.setShowEmptyButton(false);
+
+		if (getIntent() != null) {
+			model = getIntent().getParcelableExtra("model");
+			LogUtil.d("myTest", "model:" + JSON.toJSONString(model));
+		}
+
+		mHttpClient = new HttpClient.Builder(Constants.IM_BASE_URL).isDebug(true).build();
+		mStoremanModels = new ArrayList<>();
+		mStoremanListAdapter = new ItemBserviceStoremanListAdapter(this, mStoremanModels);
+		mBookDetailPtlv.setAdapter(mStoremanListAdapter);
+	}
+
+	@Override
+	public void onClick(View v) {
+		int id = v.getId();
+		if (id == R.id.book_service_detail_store_tv) {
+			Intent intent = new Intent(ct, BServiceAddActivity.class);
+			intent.putExtra("model", model);
+			startActivity(intent);
+		}
+	}
 }

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

@@ -125,21 +125,14 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
 
         itemAdapter = new ItemBserviceHeaderAdapter(mContext, menuModels);
         mGridView.setAdapter(itemAdapter);
-
         mGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                ItemBserviceHeaderAdapter.ViewHolder viewHolder = (ItemBserviceHeaderAdapter.ViewHolder) view.getTag();
-                LogUtil.d("myTest", "menuModel:" + JSON.toJSONString(viewHolder.menuModel));
-                if ("10004".equals(viewHolder.menuModel.getCode()) || "10005".equals(viewHolder.menuModel.getCode())) {
-                    Intent intent = new Intent(mContext, BServiceDetailActivity.class);
-                    intent.putExtra("SBMenuModel", viewHolder.menuModel);
-                    startActivity(intent);
-                } else {
-                    Intent intent = new Intent(mContext, BServiceListActivity.class);
-                    intent.putExtra("SBMenuModel", viewHolder.menuModel);
-                    startActivity(intent);
-                }
+	            ItemBserviceHeaderAdapter.ViewHolder viewHolder = (ItemBserviceHeaderAdapter.ViewHolder) view.getTag();
+	            LogUtil.d("myTest", "menuModel:" + JSON.toJSONString(viewHolder.menuModel));
+	            Intent intent = new Intent(mContext, BServiceListActivity.class);
+	            intent.putExtra("SBMenuModel", viewHolder.menuModel);
+	            startActivity(intent);
             }
         });
     }
@@ -150,7 +143,18 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
         mListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-
+	            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 = new Intent(ct, BServiceDetailActivity.class);
+                }else{
+                     intent = new Intent(ct, BServiceAddActivity.class);
+                }
+	            intent.putExtra("model", mListAdapter.getItem((int) id));
+	            startActivity(intent);
+	            //@update by Bitliker 由于不同类型的预约详情界面差别很大，需要判断当前点击的进行分类
             }
         });
 
@@ -181,18 +185,24 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
                         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.setUrl(mObject.getString("sc_imageurl"));
-                                sbListModel.setType(mObject.getString("sc_industry"));
-                                modelList.add(sbListModel);
-                            }
-                            LogUtil.d("myTest", JSON.toJSONString(modelList));
-                            mListAdapter = new ItemBserviceListAdapter(mContext, modelList);
-                            mListView.setAdapter(mListAdapter);
-                            //mListAdapter.notifyDataSetChanged();
+	                        for (int i = 0; i < jsonArray.size(); i++) {
+		                        JSONObject mObject = jsonArray.getJSONObject(i);
+		                        SBListModel sbListModel = new SBListModel();
+		                        sbListModel.setName(mObject.getString("sc_companyname"));
+		                        sbListModel.setAddress(mObject.getString("sc_address"));
+		                        sbListModel.setBookType(mObject.getString("sc_booktype"));
+		                        sbListModel.setUrl(mObject.getString("sc_imageurl"));
+		                        sbListModel.setType(mObject.getString("sc_industry"));
+
+		                        sbListModel.setCompanyid(mObject.getString("sc_uu"));
+		                        sbListModel.setImid(mObject.getString("sc_imid"));
+		                        sbListModel.setId(mObject.getInteger("sc_id"));
+		                        modelList.add(sbListModel);
+	                        }
+	                        LogUtil.d("myTest", JSON.toJSONString(modelList));
+	                        mListAdapter = new ItemBserviceListAdapter(mContext, modelList);
+	                        mListView.setAdapter(mListAdapter);
+	                        //mListAdapter.notifyDataSetChanged();
                         }
                     }
                 } catch (Exception e) {