服务预约： fix bug

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/secretary/BookingDetailActivity.java

@@ -297,6 +297,12 @@ public class BookingDetailActivity extends OABaseActivity implements HttpImp,Vie
                    .putExtras(bundle));
            return;
        }
+        if (button.getText().equals("拒绝")){
+            String content=model.getAb_bman()+"拒绝了您"+time+"的预约计划";
+            sendMessage(model.getAb_bmanid(),model.getAb_bman(),model.getAb_recordid(),content);
+            showPopupWindow(button);
+            return;
+        }
         showLoading();
         if (button.getText().equals("确认")){
             String content=model.getAb_bman()+"确认了您"+time+"的预约计划";
@@ -304,12 +310,7 @@ public class BookingDetailActivity extends OABaseActivity implements HttpImp,Vie
             map="{\"ab_confirmstatus \":\"已确认\",\"ab_bmanid\":\""+model.getAb_bmanid()+"\"}";
     
         }
-        if (button.getText().equals("拒绝")){
-            String content=model.getAb_bman()+"拒绝了您"+time+"的预约计划";
-            sendMessage(model.getAb_bmanid(),model.getAb_bman(),model.getAb_recordid(),content);
-            showPopupWindow(button);
-            return;
-        }
+ 
         if (button.getText().equals("取消")){
             if (MyApplication.getInstance().mLoginUser.getUserId().equals(model.getAb_bmanid())){
                 String content=model.getAb_bman()+"取消了您"+time+"的预约计划";
@@ -545,6 +546,7 @@ public class BookingDetailActivity extends OABaseActivity implements HttpImp,Vie
                             map="{\"ab_confirmstatus\":\"已拒绝\",\"ab_reason\":\"其它\",\"ab_bmanid\":\""+model.getAb_bmanid()+"\"}";
                             break;
                     }
+                    showLoading();
                     updateBooking(map);
                     
                 }

app_core/common/src/main/java/com/common/data/DateFormatUtil.java

@@ -12,6 +12,7 @@ import java.util.Date;
 public class DateFormatUtil {
     public static final String YMD = "yyyy-MM-dd";
     public static final String YMD_HMS = "yyyy-MM-dd HH:mm:ss";
+    public static final String YMD_HM = "yyyy-MM-dd HH:mm";
     public static final String HM = "HH:mm";
     public static final String MD = "MM-dd";
 

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

@@ -42,6 +42,7 @@ import com.core.base.BaseActivity;
 import com.core.net.http.ViewUtil;
 import com.core.net.http.http.OAHttpHelper;
 import com.core.utils.CommonUtil;
+import com.core.utils.ToastUtil;
 import com.core.widget.view.selectcalendar.bean.Data;
 import com.core.widget.view.selectcalendar.bean.DataState;
 import com.me.network.app.http.HttpClient;
@@ -811,10 +812,17 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
         } else if (v.getId() == R.id.click_btn) {
             if (type == 3) {
                 if (!StringUtil.isEmpty(tv_time_point.getText().toString())) {
+                    String today = DateFormatUtil.long2Str(DateFormatUtil.YMD_HM);
+                    if (today.compareTo(tv_time_point.getText().toString()) > 0){
+                        ToastMessage("不能预约过去时间");
+                        return;
+                    }                    
                     Intent intent = new Intent();
                     intent.putExtra("startDate", tv_time_point.getText().toString());
                     setResult(0x11, intent);
                     finish();
+                }else{
+                    ToastMessage("请选择时间！");
                 }
             }
             if (swich) {
@@ -1119,7 +1127,12 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
         selectDay = c.get(Calendar.DAY_OF_MONTH);
         String today = DateFormatUtil.long2Str(DateFormatUtil.YMD);
         if (type == 3) {
-            tv_time_point.setText(currentSelectDate);
+            if (today.compareTo(currentSelectDate) > 0){
+                ToastMessage("不能预约过去时间");
+            }else{
+                tv_time_point.setText(currentSelectDate+" "+tv_time_point.getText().toString().substring(11,16));
+            }
+           
         }
         if (today.compareTo(currentSelectDate) > 0 && (type == 1 || type == 4)) {
             ToastMessage("不能预约过去时间");

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

@@ -814,18 +814,29 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     tv_food_rooms.setOnClickListener(this);
                     tv_food_peoples.setOnClickListener(this);
                 } else {
-                    tv_food_times.setText(data.getString("sb_endtime"));
+                    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));
+                    }
                     tv_food_rooms.setText(data.getString("sb_stname"));
                     tv_food_peoples.setText(data.getString("sb_person"));
                 }
                 break;
             case "美容美发"://  美容美发
+                //sb_starttime
                 findViewById(R.id.ll_hair).setVisibility(View.VISIBLE);
                 if (isEdited) {
                     tv_hair_rooms.setOnClickListener(this);
                     tv_hair_times.setOnClickListener(this);
                 } else {
-                    tv_hair_times.setText(data.getString("sb_endtime"));
+                    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));
+                    }
                     tv_hair_rooms.setText(data.getString("sb_stname"));
                 }
                 break;
@@ -836,7 +847,12 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     tv_sport_rooms.setOnClickListener(this);
                     tv_sport_time.setOnClickListener(this);
                 } else {
-                    tv_sport_time.setText(data.getString("sb_endtime"));
+                    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));
+                    }
                     tv_sport_rooms.setText(data.getString("sb_spname"));
                     tv_sport_peoples.setText(data.getString("sb_person"));
                 }
@@ -848,7 +864,12 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     tag_hospital_doctor.setOnClickListener(this);
                     tv_hospital_time.setOnClickListener(this);
                 } else {
-                    tv_hospital_time.setText(data.getString("sb_endtime"));
+                    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));
+                    }
                     tv_hospital_rooms.setText(data.getString("sb_stname"));
                     tag_hospital_doctor.setText(data.getString("sb_username"));
                 }
@@ -860,7 +881,12 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     tv_club_time.setOnClickListener(this);
                     tv_club_peoples.setOnClickListener(this);
                 } else {
-                    tv_club_time.setText(data.getString("sb_endtime"));
+                    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));
+                    }
                     tv_club_technician.setText(data.getString("sb_stname"));
                     tv_club_peoples.setText(data.getString("sb_person"));
                 }
@@ -872,7 +898,12 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     tv_ktv_rooms.setOnClickListener(this);
                     tv_ktv_peoples.setOnClickListener(this);
                 } else {
-                    tv_ktv_times.setText(data.getString("sb_endtime"));
+                    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));
+                    }
                     tv_ktv_rooms.setText(data.getString("sb_spname"));
                     tv_ktv_peoples.setText(data.getString("sb_person"));
                 }
@@ -884,7 +915,12 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     tag_hospital_doctor.setOnClickListener(this);
                     tv_hospital_time.setOnClickListener(this);
                 } else {
-                    tv_hospital_time.setText(data.getString("sb_endtime"));
+                    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));
+                    }
                     tv_hospital_rooms.setText(data.getString("sb_stname"));
                     tag_hospital_doctor.setText(data.getString("sb_username"));
                 }
@@ -896,7 +932,12 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     tv_sport_rooms.setOnClickListener(this);
                     tv_sport_time.setOnClickListener(this);
                 } else {
-                    tv_sport_time.setText(data.getString("sb_endtime"));
+                    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));
+                    }
                     tv_sport_rooms.setText(data.getString("sb_spname"));
                     tv_sport_peoples.setText(data.getString("sb_person"));
                 }
@@ -908,7 +949,12 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     tv_food_rooms.setOnClickListener(this);
                     tv_food_peoples.setOnClickListener(this);
                 } else {
-                    tv_food_times.setText(data.getString("sb_endtime"));
+                    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));
+                    }
                     tv_food_rooms.setText(data.getString("sb_spname"));
                     tv_food_peoples.setText(data.getString("sb_person"));
                 }
@@ -919,7 +965,12 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     tv_hair_rooms.setOnClickListener(this);
                     tv_hair_times.setOnClickListener(this);
                 } else {
-                    tv_hair_times.setText(data.getString("sb_endtime"));
+                    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));
+                    }
                     tv_hair_rooms.setText(data.getString("sb_stname"));
                 }
                 break;
@@ -930,7 +981,12 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     tv_club_time.setOnClickListener(this);
                     tv_club_peoples.setOnClickListener(this);
                 } else {
-                    tv_club_time.setText(data.getString("sb_endtime"));
+                    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));
+                    }
                     tv_club_technician.setText(data.getString("sb_stname"));
                     tv_club_peoples.setText(data.getString("sb_person"));
                 }
@@ -942,7 +998,12 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     tv_ktv_rooms.setOnClickListener(this);
                     tv_ktv_peoples.setOnClickListener(this);
                 } else {
-                    tv_ktv_times.setText(data.getString("sb_endtime"));
+                    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));
+                    }
                     tv_ktv_rooms.setText(data.getString("sb_spname"));
                     tv_ktv_peoples.setText(data.getString("sb_person"));
                 }

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

@@ -14,6 +14,7 @@ import android.view.WindowManager;
 import android.widget.AbsListView;
 import android.widget.AdapterView;
 import android.widget.ImageView;
+import android.widget.ListView;
 import android.widget.RelativeLayout;
 
 import com.alibaba.fastjson.JSON;
@@ -59,6 +60,7 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
     private DrawableCenterTextView mSearchTv;
     private RelativeLayout mRelativeTop;
     private Drawable drawBg;
+    private int pageSize=1;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -200,9 +202,24 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
             }
         },10);
     }
-
+    
     private void initEvent() {
         mListView.setMode(PullToRefreshBase.Mode.BOTH);
+        mListView.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {
+
+
+            @Override
+            public void onPullDownToRefresh(PullToRefreshBase<ListView> refreshView) {
+                pageSize=1;
+                loadListData(pageSize);
+            }
+
+            @Override
+            public void onPullUpToRefresh(PullToRefreshBase<ListView> refreshView) {
+              pageSize++;
+              loadListData(pageSize);
+            }
+        });
         mListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
@@ -264,7 +281,7 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
     }
 
     private void intData() {
-        loadListData();
+        loadListData(pageSize);
     }
 
 
@@ -280,19 +297,23 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
 //        drawBg.setAlpha(255);
 //    }
 
-    public void loadListData() {
+    public void loadListData(final int pageSize) {
+  
         HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL).isDebug(true).build();
         httpClient.Api().send(new HttpClient.Builder()
                 .url("/user/appStoreList")
                 .add("type", "0")
-                .add("pageIndex", "1")
+                .add("pageIndex", String.valueOf(pageSize))
                 .add("token", MyApplication.getInstance().mAccessToken)
                 .method(Method.POST)
                 .build(), new ResultSubscriber<>(new ResultListener<Object>() {
             @Override
             public void onResponse(Object o) {
+                mListView.onRefreshComplete();
                 try {
-                    modelList.clear();
+                    if (pageSize==1) {
+                        modelList.clear();
+                    }
                     LogUtil.d("o.toString" + o.toString());
                     if (JSONUtil.validate(o.toString())) {
                         JSONObject object = JSON.parseObject(o.toString());
@@ -321,13 +342,19 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
                                 modelList.add(sbListModel);
                             }
                             LogUtil.d("myTest", JSON.toJSONString(modelList));
-                            mListAdapter = new ItemBserviceListAdapter(mContext, modelList);
-                            mListView.setAdapter(mListAdapter);
+                            if (mListAdapter==null) {
+                                mListAdapter = new ItemBserviceListAdapter(mContext, modelList);
+                                mListView.setAdapter(mListAdapter);
+                            }else{
+                                mListAdapter.notifyDataSetChanged();
+                            }
                             //mListAdapter.notifyDataSetChanged();
+                        }else{
+                            ToastMessage("没有更多数据");
                         }
                     }
                 } catch (Exception e) {
-
+                         e.printStackTrace();
                 }
             }
         }));