服务预约： fix bug

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

@@ -28,6 +28,7 @@ import com.core.base.HttpImp;
 import com.core.base.OABaseActivity;
 import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
+import com.core.utils.sp.UserSp;
 import com.core.widget.CustomerScrollView;
 import com.core.widget.EmptyLayout;
 import com.core.widget.MyListView;
@@ -189,6 +190,7 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
                     model.setId(Integer.valueOf(viewHolder.model.getAb_id()));
                     model.setAddress(viewHolder.model.getAb_address());
                     model.setType(viewHolder.model.getAb_content());//行业关键代码
+                    model.setIndustrycode(viewHolder.model.getAb_content());
                     model.setEndtime(viewHolder.model.getAb_endtime());
                     model.setName(viewHolder.model.getAb_bman());
 
@@ -334,9 +336,9 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
         showLoading();
         String url = Constants.IM_BASE_URL + "user/appBookingList";
         Map<String, Object> params = new HashMap<>();
-        params.put("token", MyApplication.getInstance().mAccessToken);
-        params.put("userid", MyApplication.getInstance().mLoginUser.getUserId());
-        params.put("telephone", MyApplication.getInstance().mLoginUser.getTelephone());
+        params.put("token",  UserSp.getInstance(MyApplication.getInstance()).getAccessToken(""));
+        params.put("userid", UserSp.getInstance(MyApplication.getInstance()).getUserId(""));
+        params.put("telephone",  UserSp.getInstance(MyApplication.getInstance()).getTelephone(""));
         params.put("yearmonth", DateFormatUtil.getStrDate4Date(curDate, "yyyyMM"));
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
@@ -449,7 +451,7 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
                                     model.setAb_recordid(object.getString("sb_recordid"));
                                     model.setAb_recordman(object.getString("sb_recordor"));
                                     model.setAb_sharestatus("未共享");
-                                    model.setAb_starttime(object.getString("ab_starttime"));
+                                    model.setAb_starttime(object.getString("sb_starttime"));
                                     model.setAb_type(object.getString("sb_stname"));//科目
                                     model.setKind(object.getString("kind"));//关键字段
                                     model.setData_service(object.toJSONString());

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

@@ -401,9 +401,14 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                 GridDataAdapter.ViewModle modle = (GridDataAdapter.ViewModle) view.getTag();
-                //ToastMessage(modle.tv_text.getText().toString());
                 gAdapter.setSelected(position);
                 gAdapter.notifyDataSetChanged();
+                if (type == 1 || type == 4||type==3) {
+                    if (!modle.clicked) {
+                        ToastMessage("该时间段不能预约！");
+                        return;
+                    }
+                }
                 if (type == 3) {
                     tv_time_point.setText(tv_time_point.getText().toString().substring(0, 10) + " " + modle.tv_text.getText().toString());
                 }
@@ -437,12 +442,7 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
                     ToastMessage("请先选择日期,再选择时间段！");
                     return;
                 }
-                if (type == 1 || type == 4) {
-                    if (!modle.clicked) {
-                        ToastMessage("该时间段不能预约！");
-                        return;
-                    }
-                }
+               
 
                 if (swich) {
                     //时间段请假：
@@ -627,6 +627,7 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
     }
 
     private void initTimeData() {
+        if (!ListUtils.isEmpty(mTimeData))mTimeData.clear();
         if (type == 2) {
             mTimeData.addAll(timeAddMuilt("00:00", "23:45", 15));
             if (mContext != null) {
@@ -817,7 +818,7 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
             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){
+                    if (today.compareTo(tv_time_point.getText().toString()) >= 0){
                         ToastMessage("不能预约过去时间");
                         return;
                     }                    
@@ -1185,7 +1186,11 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
                     }
                 }
             }
-            getBookingTime(imId);
+            if (type==1) {
+                getBookingTime(imId);
+            }else if(type==4||type==3){
+                getBServiceTimes();
+            }
         }
 
 
@@ -1364,10 +1369,11 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
                             }
                         });
                     } catch (Exception e) {
-                        initTimeData();
+                        e.printStackTrace();
+                        //initTimeData();
                     }
                 } else {
-                    initTimeData();
+                  //  initTimeData();
                 }
 
             }

app_modular/appbooking/src/main/java/com/modular/booking/activity/business/BBookingAddActivity.java

@@ -208,6 +208,7 @@ public class BBookingAddActivity extends OABaseActivity implements View.OnClickL
                 intent.putExtra("type", 1);
                 intent.putExtra("title", getString(R.string.booking_object_name));
                 intent.putExtra("isSingleSelect", false);
+                intent.putParcelableArrayListExtra("models",models);
                 startActivityForResult(intent, 0x01);
             }
         } else if (i == R.id.rl_company) {
@@ -216,13 +217,13 @@ public class BBookingAddActivity extends OABaseActivity implements View.OnClickL
         }
     }
 
-
+    ArrayList<ContactsModel> models;
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (data == null) return;
         switch (requestCode) {
             case 0x01://对象
-                ArrayList<ContactsModel> models = data.getParcelableArrayListExtra("data");
+                models = data.getParcelableArrayListExtra("data");
                 //拿到多个预约对象，需要下拉他们的企业信息
                 StringBuilder names = new StringBuilder("");
                 StringBuilder imids = new StringBuilder("");

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

@@ -145,9 +145,9 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                         AvatarHelper.getInstance().displayAvatar(sb_userid, max_img, true);
                         tv_title.setText(sb_username);
                         if("10005".equals(model.getIndustrycode())){
-                            tv_sub.setText("特聘导师");
+                            tv_sub.setText(R.string.booking_serivce_technician);
                         }else{
-                            tv_sub.setText("特聘技师");
+                            tv_sub.setText(R.string.booking_serivce_teacher);
                         }
                     }else{ 
                         AvatarHelper.getInstance().display(model.getUrl(), iv_header, true);
@@ -173,9 +173,10 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                         AvatarHelper.getInstance().displayAvatar(sb_userid, max_img, true);
                         tv_title.setText(sb_username);
                         if("10005".equals(model.getIndustrycode())){
-                            tv_sub.setText("特聘导师");
+                            tv_sub.setText(R.string.booking_serivce_technician);
+                         
                         }else{
-                            tv_sub.setText("特聘技师");
+                            tv_sub.setText(R.string.booking_serivce_teacher);
                         }
                     }else{
                         tv_title.setText(model.getName());
@@ -290,11 +291,12 @@ 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 (isHasPerson) {
+            if (!StringUtil.isEmpty(sb_userid)||"10001".equals(model.getIndustrycode())) {
                 serviceParam = serviceId;
             } else {
                 serviceParam = serviceName;
             }
+            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))
@@ -305,7 +307,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                             .putExtra("businessType", model.getType())
                             .putExtra("startTime", model.getStarttime())
                             .putExtra("endTime", model.getEndtime())
-                            .putExtra("serviceId", StringUtil.isEmpty(serviceId) == true ? "" : serviceId)
+                            .putExtra("serviceId", StringUtil.isEmpty(serviceParam) == true ? "" : serviceParam)
                             .putExtra("type", 3)
                     , TIME_SELECT);
         }
@@ -519,8 +521,6 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
     //load 选择服务人员
     public void loadServiceMan(String serviceId, final String title) {
         progressDialog.show();
-        LogUtil.d("HttpLogs", "serviceId:" + serviceId);
-        LogUtil.d("HttpLogs", "companyid:" + model.getCompanyid());
         HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL).isDebug(BaseConfig.isDebug()).build();
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appStoreman")

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

@@ -1,17 +1,12 @@
 package com.modular.booking.activity.services;
 
 import android.content.Intent;
-import android.graphics.Color;
 import android.graphics.drawable.Drawable;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.v7.app.ActionBar;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-import android.widget.AbsListView;
 import android.widget.AdapterView;
 import android.widget.ImageView;
 import android.widget.ListView;
@@ -66,22 +61,22 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
     protected void onCreate(Bundle savedInstanceState) {
        // getWindow().requestFeature(Window.FEATURE_ACTION_BAR_OVERLAY);
         super.onCreate(savedInstanceState);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            Window window = getWindow();
-           // window.addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
-            window.addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
-        }
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            Window window = getWindow();
-            window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS
-                    | WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
-            window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                    | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
-                    | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
-            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-            //window.setStatusBarColor(Color.TRANSPARENT);
-            window.setNavigationBarColor(Color.TRANSPARENT);
-        }
+//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+//            Window window = getWindow();
+//           // window.addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+//            window.addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
+//        }
+//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+//            Window window = getWindow();
+//            window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS
+//                    | WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
+//            window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+//                    | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+//                    | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
+//            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+//            //window.setStatusBarColor(Color.TRANSPARENT);
+//            window.setNavigationBarColor(Color.TRANSPARENT);
+//        }
        
         setContentView(R.layout.activity_bservices);
         
@@ -178,18 +173,18 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
     @Override
     protected void onResume() {
         super.onResume();
-        drawBg.setAlpha(80);
+//        drawBg.setAlpha(80);
     }
 
     @Override
     public void onBackPressed() {
         super.onBackPressed();
-        new Handler().postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                drawBg.setAlpha(255);
-            }
-        },10);
+//        new Handler().postDelayed(new Runnable() {
+//            @Override
+//            public void run() {
+//                drawBg.setAlpha(255);
+//            }
+//        },10);
     }
 
     @Override
@@ -235,46 +230,46 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
             }
         });
         //监听滚动事件
-        mListView.setOnScrollListener(new AbsListView.OnScrollListener() {
-            private int DISTANCE =900;
-
-            @Override
-            public void onScrollStateChanged(AbsListView view, int scrollState) {
-
-            }
-
-            @Override
-            public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
-                int offset = 0;
-                if (firstVisibleItem == 0||firstVisibleItem==1) {
-                    View firstItem = mListView.getRefreshableView().getChildAt(0);
-                    if (firstItem != null) {
-                        offset = 0 - firstItem.getTop()+120;
-                    }
-                } else {
-                    offset =DISTANCE-1;
-                }
-
-                float percent = (offset * 1f) / (DISTANCE * 1f) ;
-                if (percent >=0 && percent < 1) {
-                    drawBg.setAlpha((int)(percent *255));
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                        getWindow().setStatusBarColor(getResources().getColor(R.color.antionbarcolor));
-                    }
-                }else if(percent>=1&&firstVisibleItem!=1){
-                    drawBg.setAlpha((int)(percent *255));
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                        getWindow().setStatusBarColor(getResources().getColor(R.color.antionbarcolor));
-                    }
-                }else if(percent==1){
-                    drawBg.setAlpha(255);
-                }
-                LogUtil.d(TAG,"offset:"+offset);
-                LogUtil.d(TAG,"percent:"+(int)(percent *255));
-             
-
-            }
-        });
+//        mListView.setOnScrollListener(new AbsListView.OnScrollListener() {
+//            private int DISTANCE =900;
+//
+//            @Override
+//            public void onScrollStateChanged(AbsListView view, int scrollState) {
+//
+//            }
+//
+//            @Override
+//            public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
+//                int offset = 0;
+//                if (firstVisibleItem == 0||firstVisibleItem==1) {
+//                    View firstItem = mListView.getRefreshableView().getChildAt(0);
+//                    if (firstItem != null) {
+//                        offset = 0 - firstItem.getTop()+120;
+//                    }
+//                } else {
+//                    offset =DISTANCE-1;
+//                }
+//
+//                float percent = (offset * 1f) / (DISTANCE * 1f) ;
+//                if (percent >=0 && percent < 1) {
+//                    drawBg.setAlpha((int)(percent *255));
+//                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+//                        getWindow().setStatusBarColor(getResources().getColor(R.color.antionbarcolor));
+//                    }
+//                }else if(percent>=1&&firstVisibleItem!=1){
+//                    drawBg.setAlpha((int)(percent *255));
+//                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+//                        getWindow().setStatusBarColor(getResources().getColor(R.color.antionbarcolor));
+//                    }
+//                }else if(percent==1){
+//                    drawBg.setAlpha(255);
+//                }
+//                LogUtil.d(TAG,"offset:"+offset);
+//                LogUtil.d(TAG,"percent:"+(int)(percent *255));
+//             
+//
+//            }
+//        });
 
         mBackImageView.setOnClickListener(this);
         mSearchTv.setOnClickListener(this);

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

@@ -69,7 +69,7 @@ public class ItemBserviceStoremanListAdapter extends BaseAdapter {
 
     private void initializeViews(final SBStoremanModel object, ViewHolder holder) {
         holder.bserviceStoremanTitleTv.setText(object.getSm_username());
-        AvatarHelper.getInstance().display(object.getSm_userid(),  holder.bserviceStoremanIv, true);
+        AvatarHelper.getInstance().displayAvatar(object.getSm_userid(),  holder.bserviceStoremanIv, true);
         holder.model=object;
         holder.bserviceStoremanOrderBtn.setOnClickListener(new View.OnClickListener() {
             @Override

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

@@ -4,13 +4,12 @@
     android:layout_height="match_parent"
     android:background="@color/white"
     android:orientation="vertical">
-
+    <!--android:layout_marginTop="80dp"-->
     <com.core.widget.view.MyGridView
         android:id="@+id/mGridView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/white"
-        android:layout_marginTop="80dp"
         android:horizontalSpacing="1dp"
         android:numColumns="3"
         android:paddingTop="5dp"

app_modular/appbooking/src/main/res/values-en/strings.xml

@@ -37,6 +37,8 @@
     <string name="booking_add_company">企业</string>
     <string name="unspecified_hair_stylist">不指定发型师，预约门店</string>
     <string name="specified_hair_stylist">指定发型师</string>
+    <string name="booking_serivce_teacher">特聘导师</string>
+    <string name="booking_serivce_technician">特聘技师</string>
 
 
     <string-array name="booking_reject">

app_modular/appbooking/src/main/res/values-zh-rCN/strings.xml

@@ -37,6 +37,8 @@
     <string name="booking_add_company">企业</string>
     <string name="unspecified_hair_stylist">不指定发型师，预约门店</string>
     <string name="specified_hair_stylist">指定发型师</string>
+    <string name="booking_serivce_teacher">特聘导师</string>
+    <string name="booking_serivce_technician">特聘技师</string>
 
 
     <string-array name="booking_reject">

app_modular/appbooking/src/main/res/values-zh-rTW/strings.xml

@@ -37,6 +37,8 @@
     <string name="booking_add_company">企业</string>
     <string name="unspecified_hair_stylist">不指定发型师，预约门店</string>
     <string name="specified_hair_stylist">指定发型师</string>
+    <string name="booking_serivce_teacher">特聘导师</string>
+    <string name="booking_serivce_technician">特聘技师</string>
 
 
     <string-array name="booking_reject">

app_modular/appbooking/src/main/res/values/strings.xml

@@ -38,6 +38,8 @@
     <string name="booking_add_company">企业</string>
     <string name="unspecified_hair_stylist">不指定发型师，预约门店</string>
     <string name="specified_hair_stylist">指定发型师</string>
+    <string name="booking_serivce_teacher">特聘导师</string>
+    <string name="booking_serivce_technician">特聘技师</string>
 
     <string-array name="booking_reject">
         <item>请选择拒绝理由</item>

app_modular/appcontact/src/main/java/com/uas/appcontact/ui/activity/ContactsActivity.java

@@ -37,6 +37,7 @@ import com.common.system.SystemUtil;
 import com.common.thread.ThreadPool;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;
+import com.core.app.AppConstant;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.OABaseActivity;
@@ -66,7 +67,6 @@ import com.core.xmpp.dao.FriendDao;
 import com.core.xmpp.dao.NewFriendDao;
 import com.core.xmpp.listener.OnCompleteListener;
 import com.core.xmpp.model.AddAttentionResult;
-import com.core.app.AppConstant;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
@@ -108,6 +108,7 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
     private int allSelect = 0;
 
     private LinearLayout include_tag;
+    private ArrayList<ContactsModel> stateModels= new ArrayList<>();//记住状态值
 
 
     @Override
@@ -146,6 +147,7 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
             type = getIntent().getIntExtra("type", 0);
             String title = getIntent().getStringExtra("title");
             isSingleSelect = getIntent().getBooleanExtra("isSingleSelect", true);
+            stateModels=getIntent().getParcelableArrayListExtra("models");
             if (isSingleSelect) {
                 select_rl.setVisibility(View.GONE);
             } else {
@@ -464,6 +466,16 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
             @Override
             public void run() {
                 final List<ContactsModel> lists = getLocalContactsByDB();
+                //上传
+//                if (!ListUtils.isEmpty(stateModels)){
+//                    for (int i = 0; i <lists.size() ; i++) {
+//                        for (int j = 0; j <stateModels.size(); j++) {
+//                            if (lists.get(i).getImid().equals(stateModels.get(j).getImid())){
+//                                lists.get(i).setClick(stateModels.get(j).isClick);
+//                            }
+//                        }
+//                    }
+//                }
                 ThreadPool.getThreadPool().addTask(new Runnable() {
                     @Override
                     public void run() {