代码冲突

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_core/common/src/main/java/com/core/widget/view/selectcalendar/SelectCalendarActivity.java

@@ -81,8 +81,8 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
     private TextView tv_date_start;
     private TextView tv_date_end;
 
-    private TextView v_date_start;
-    private TextView v_date_end;
+    private TextView v_date_start;//时间开始
+    private TextView v_date_end;//时间结束
 
     private TextView v_time_start;
     private TextView v_time_end;
@@ -273,7 +273,6 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
         ll_time_top = (LinearLayout) findViewById(R.id.ll_time_top);
         ll_time_point = (LinearLayout) findViewById(R.id.ll_time_point);
         tv_time_point = (TextView) findViewById(R.id.tv_time_point);
-
         ll_date_start = (LinearLayout) findViewById(R.id.ll_date_start);
         tv_date_start = (TextView) findViewById(R.id.tv_date_start);
         v_date_start = (TextView) findViewById(R.id.v_date_start);
@@ -310,6 +309,7 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
             companyId = intent.getStringExtra("companyId");
             bStartTime = intent.getStringExtra("startTime");
             bEndTime = intent.getStringExtra("endTime");
+            //预约功能模块---时间段，时间点预约设置
             if (!StringUtil.isEmpty(bookType)) {
                 if ("0".equals(bookType)) {
                     type = 3;//设置单一时间点
@@ -326,7 +326,7 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
             if (!TextUtils.isEmpty(mcaller) && ("Workovertime".equals(mcaller) || "ExtraWork$".equals(mcaller))) {
                 mWorkovertime = true;
             }
-            if (type != 2) {
+            if (type != 2&&type!=5) {
                 v_date_start.setText(startDate);
                 v_date_end.setText(startDate);
             }
@@ -340,7 +340,7 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
                 }
             }
 
-            if (type != 2) {
+            if (type != 2&&type!=5) {
                 if (!StringUtil.isEmpty(startDate) && !StringUtil.isEmpty(endDate)) {
                     v_date_start.setText(startDate.substring(0, startDate.length() - 3));
                     v_date_end.setText(endDate.substring(0, endDate.length() - 3));
@@ -412,7 +412,7 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
                 if (type == 3) {
                     tv_time_point.setText(tv_time_point.getText().toString().substring(0, 10) + " " + modle.tv_text.getText().toString());
                 }
-                if (type == 2) {
+                if (type == 2||type==5) {
                     //按时间请假：
                     if (startDate) {//按钮状态
                         //开始时间
@@ -497,7 +497,12 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
             case 1://预约时间段---繁忙赶时间段不可点击   固定 时间间隔十五分钟
                 getBookingTotalTime(imId);//获取预约总时间
                 break;
-            case 2://预约时间段设置--在设置界面
+            case 2://预约时间段设置--在设置界面   固定时间段间隔 十五分钟
+                initTimeData();
+                viewPager.setVisibility(View.GONE);
+                currentSelectDate = "";
+                break;
+            case 5://预约时间段设置--在设置界面  固定时间段间隔  半小时
                 initTimeData();
                 viewPager.setVisibility(View.GONE);
                 currentSelectDate = "";
@@ -507,7 +512,6 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
                 getBServiceTimes();
                 break;
             case 4://服务预约 时间段选择(限定开始和截止时间段)  固定时间间隔半小时
-                //初始化时间段
                 initTimeData();
                 getBServiceTimes();
                 break;
@@ -635,6 +639,13 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
                 gv_date_list.setAdapter(gAdapter);
             }
         }
+        if (type==5){
+            mTimeData.addAll(timeAddMuilt("00:00", "23:45", 30));
+            if (mContext != null) {
+                gAdapter = new GridDataAdapter(mContext, mTimeData);
+                gv_date_list.setAdapter(gAdapter);
+            }
+        }
         if (type == 3 || type == 4) {//服务预约
             mTimeData.addAll(timeAddMuilt(bStartTime, bEndTime, 30));
             if (mContext != null) {
@@ -866,7 +877,7 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
                 //时间
                 if (!StringUtil.isEmpty(v_date_start.getText().toString()) && !
                         StringUtil.isEmpty(v_date_end.getText().toString())) {
-                    if (type == 2) {
+                    if (type == 2||type==5) {
                         setResultIntent();
                         return;
                     }

app_core/common/src/main/res/drawable/selector_pop_items.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    
+    <item android:drawable="@color/greenyellow" android:state_activated="true"/>
+    <item android:drawable="@color/item_color2" />
+</selector>

app_core/common/src/main/res/layout/item_pop_list.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:background="@drawable/selector_pop_items">
     <TextView
         android:id="@+id/tv_item_name"
         android:paddingLeft="2dp"
@@ -11,7 +12,6 @@
         android:textSize="14sp"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@drawable/select_weixin_list_item"
         android:gravity="center"
         android:text="xxx" />
 </LinearLayout>

app_core/common/src/main/res/layout/item_pop_list_select.xml

@@ -2,16 +2,16 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
-  
     <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:id="@+id/tv_item_name"
+        android:layout_centerInParent="true"
         android:paddingLeft="2dp"
         android:paddingRight="2dp"
         android:paddingTop="10dp"
         android:paddingBottom="10dp"
         android:textSize="14sp"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
         android:background="@drawable/selector_me_menu_item_bg"
         android:gravity="center"
         android:text="xxx" />

app_core/common/src/main/res/layout/pop_crm_list.xml

@@ -6,21 +6,14 @@
     android:layout_height="match_parent"
     app:sl_cornerRadius="0dp"
     app:sl_dx="0dp"
-    app:sl_dy="0dp"
+    app:sl_dy="-2dp"
     app:sl_shadowColor="@color/shadow"
     app:sl_shadowRadius="1dp">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/shape_pop_ll"
-        android:orientation="vertical"
-        android:padding="0.1dp">
-
         <ListView
             android:id="@+id/mList"
             style="@style/ListViewBasic"
+            android:listSelector="@drawable/selector_pop_items"
             android:layout_height="wrap_content"
-            android:dividerHeight="0dp"></ListView>
-    </LinearLayout>
+            android:dividerHeight="0dp">
+        </ListView>
 </com.xzjmyk.pm.activity.view.shadow.ShadowLayout>

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

@@ -139,11 +139,11 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
         et_book_name.setText(CommonUtil.getName());
         et_book_phone.setText(MyApplication.getInstance().mLoginUser.getTelephone());
         
-        et_book_phone.setOnClickListener(this);
+     
         tv_sub.setOnClickListener(this);
         tv_title.setOnClickListener(this);
 
-         addSubUtils = (AddSubUtils) findViewById(R.id.add_sub);
+        addSubUtils = (AddSubUtils) findViewById(R.id.add_sub);
         addSubUtils.setBuyMax(50)       // 最大购买数，默认为int的最大值
                 .setInventory(50)       // 库存，默认为int的最大值
                 .setCurrentNumber(1)    // 设置当前数，默认为1
@@ -201,9 +201,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(R.string.booking_serivce_technician);
+                            tv_sub.setText(getString(R.string.booking_serivce_technician)+" "+model.getAddress());
                         }else{
-                            tv_sub.setText(R.string.booking_serivce_teacher);
+                            tv_sub.setText(getString(R.string.booking_serivce_teacher)+" "+model.getAddress());
                         }
                     }else{ 
                         AvatarHelper.getInstance().display(model.getUrl(), iv_header, true);
@@ -213,7 +213,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     }
                  
                 } 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");
@@ -229,10 +229,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(R.string.booking_serivce_technician);
+                            tv_sub.setText(getString(R.string.booking_serivce_technician) +" "+model.getAddress());
                          
                         }else{
-                            tv_sub.setText(R.string.booking_serivce_teacher);
+                            tv_sub.setText(getString(R.string.booking_serivce_teacher)+" "+model.getAddress());
                         }
                     }else{
                         tv_title.setText(model.getName());
@@ -469,7 +469,15 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
             if (((Button) v).getText().equals("提交")) {
                 save();
             } else if (((Button) v).getText().equals("取消")) {
-                cancle(String.valueOf(model.getId()));
+                if (!StringUtil.isEmpty(dataService)) {
+                    JSONObject object= JSON.parseObject(dataService);
+                    String recordId= object.getString("sb_recordid");
+                    if (MyApplication.getInstance().mLoginUser.getUserId().equals(recordId)) {
+                        cancle(String.valueOf(model.getId()));
+                    }else{
+                        ToastMessage("商家不可取消预约！");
+                    }
+                }
             }
         }
     }
@@ -492,6 +500,8 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     if (JSONUtil.validate(o.toString())) {
                         if ("true".equals(JSON.parseObject(o.toString()).getString("result"))) {
                             ToastMessage("取消成功！");
+                            //取消  通知商家取消
+                            invite("","");
                             Intent intent = new Intent("com.modular.booking.BookingListActivity");
                             intent.putExtra("curDate", model.getEndtime() == null ? "" : model.getEndtime());
                             startActivity(intent);

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

@@ -16,7 +16,6 @@ import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.PopupWindow;
 import android.widget.RelativeLayout;
-import android.widget.SimpleAdapter;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
@@ -44,6 +43,8 @@ import com.me.network.app.http.rx.ResultSubscriber;
 import com.modular.booking.R;
 import com.modular.booking.adapter.ItemBserviceHeaderAdapter;
 import com.modular.booking.adapter.ItemBserviceListAdapter;
+import com.modular.booking.adapter.ItemPopListAdapter;
+import com.modular.booking.model.ItemsSelectType1;
 import com.modular.booking.model.SBListModel;
 import com.modular.booking.model.SBMenuModel;
 import com.modular.booking.widget.ObservableScrollView;
@@ -481,9 +482,13 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
             LayoutInflater layoutInflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
             view = layoutInflater.inflate(R.layout.pop_crm_list, null);
             ListView plist = (ListView) view.findViewById(R.id.mList);
-            SimpleAdapter adapter = new SimpleAdapter(ct, getPopData(),
-                    R.layout.item_pop_list, new String[]{"item_name"}, new int[]{R.id.tv_item_name});
+//            SelectSimpleAdapter adapter = new SelectSimpleAdapter(ct, getPopData(),
+//                    R.layout.item_pop_list);
+            List<ItemsSelectType1> datas=  getItemsSelect();
+            final ItemPopListAdapter adapter=new ItemPopListAdapter(ct,datas);
             plist.setAdapter(adapter);
+            Drawable drawable = getResources().getDrawable(R.drawable.selector_pop_items);
+            plist.setSelector(drawable);
             plist.setOnItemClickListener(new AdapterView.OnItemClickListener() {
                 @Override
                 public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
@@ -497,7 +502,6 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
                             loadSeachData("1000",pageSize);
                             break;
                         case 2:
-                            
                             loadSeachData("2000",pageSize);
                             break;
                         case 3:
@@ -518,6 +522,8 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
                         default:
                             break;
                     }
+                    adapter.getItem(position).setSelected(true);
+                    adapter.notifyDataSetChanged();
                 }
             });
             popupWindow = new PopupWindow(view, windowManager.getDefaultDisplay().getWidth() / 3, windowManager.getDefaultDisplay().getHeight() / 3);
@@ -537,6 +543,47 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
         popupWindow.showAsDropDown(parent, windowManager.getDefaultDisplay().getWidth(), 0);
     }
 
+    
+    private List<ItemsSelectType1> getItemsSelect(){
+        List<ItemsSelectType1> list=new ArrayList<>();
+        ItemsSelectType1 model=new ItemsSelectType1();
+        model.setName("0.5km");
+        list.add(model);
+
+        model=new ItemsSelectType1();
+        model.setName("1km");
+        list.add(model);
+
+        model=new ItemsSelectType1();
+        model.setName("2km");
+        list.add(model);
+
+
+        model=new ItemsSelectType1();
+        model.setName("5km");
+        list.add(model);
+
+
+        model=new ItemsSelectType1();
+        model.setName("10km");
+        list.add(model);
+
+        model=new ItemsSelectType1();
+        model.setName("20km");
+        list.add(model);
+
+        model=new ItemsSelectType1();
+        model.setName("30km");
+        list.add(model);
+
+        model=new ItemsSelectType1();
+        model.setName("全部");
+        list.add(model);
+        
+        return  list;
+        
+    }
+     
     private List<Map<String, Object>> getPopData() {
         List<Map<String, Object>> list = new ArrayList<>();
         Map<String, Object> map = new HashMap<>();

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

@@ -0,0 +1,77 @@
+package com.modular.booking.adapter;
+
+/**
+ * Created by Arison on 2017/11/8.
+ */
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+
+import com.modular.booking.R;
+import com.modular.booking.model.ItemsSelectType1;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ItemPopListAdapter extends BaseAdapter {
+
+    private List<ItemsSelectType1> objects = new ArrayList<ItemsSelectType1>();
+
+    private Context context;
+    private LayoutInflater layoutInflater;
+
+    public ItemPopListAdapter(Context context,List<ItemsSelectType1> data) {
+        this.context = context;
+        this.objects=data;
+        this.layoutInflater = LayoutInflater.from(context);
+    }
+
+    @Override
+    public int getCount() {
+        return objects.size();
+    }
+
+    @Override
+    public ItemsSelectType1 getItem(int position) {
+        return objects.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        if (convertView == null) {
+            convertView = layoutInflater.inflate(R.layout.item_pop_list, null);
+            convertView.setTag(new ViewHolder(convertView));
+        }
+        initializeViews((ItemsSelectType1)getItem(position), (ViewHolder) convertView.getTag());
+        return convertView;
+    }
+
+    private void initializeViews(ItemsSelectType1 object, ViewHolder holder) {
+       // holder.tvItemName.setSelected(object.isSelected());
+        holder.tvItemName.setText(object.getName());
+//        if (object.isSelected()){
+//            holder.tvItemName.setTextColor(context.getResources().getColor(R.color.red));
+//        }else{
+//            holder.tvItemName.setTextColor(context.getResources().getColor(R.color.gray));
+//        }
+    }
+
+    protected class ViewHolder {
+//        private LinearLayout llPopTop;
+        private TextView tvItemName;
+
+        public ViewHolder(View view) {
+//            llPopTop = (LinearLayout) view.findViewById(R.id.ll_pop_top);
+            tvItemName = (TextView) view.findViewById(R.id.tv_item_name);
+        }
+    }
+}

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

@@ -0,0 +1,48 @@
+package com.modular.booking.adapter;
+
+import android.app.Activity;
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.SimpleAdapter;
+import android.widget.TextView;
+
+import com.modular.booking.R;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by Arison on 2017/11/7.
+ */
+@Deprecated
+public class SelectSimpleAdapter extends SimpleAdapter {
+    private int mResource;
+    private Context context;
+    private Activity activity;
+    private List<? extends Map<String, ?>> mData;
+
+    public SelectSimpleAdapter(Context context,
+                               List<? extends Map<String, ?>> data, int resource) {
+        super(context, data, resource, null, null);
+        this.mResource = resource;
+        this.context=context;
+        this.activity=(Activity) context;
+        this.mData = data;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup group) {
+        LayoutInflater layoutInflater =activity.getLayoutInflater();
+        View view = layoutInflater.inflate(mResource, null);
+        TextView text = (TextView) view.findViewById(R.id.tv_item_name);
+        text.setText(mData.get(position).get("item_name").toString());
+        if (position == 2) {
+            text.setTextColor(activity.getResources().getColor(R.color.red));
+            text.setSelected(true);
+        }
+
+        return view;
+    }
+}

app_modular/appbooking/src/main/java/com/modular/booking/model/ItemsSelectType1.java

@@ -0,0 +1,26 @@
+package com.modular.booking.model;
+
+/**
+ * Created by Arison on 2017/11/8.
+ */
+public class ItemsSelectType1 {
+    
+    private String name;//名称
+    private boolean selected=false;//是否被选中
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public boolean isSelected() {
+        return selected;
+    }
+
+    public void setSelected(boolean selected) {
+        this.selected = selected;
+    }
+}

app_modular/appbooking/src/main/res/drawable/selector_pop_items.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/icon_select_master" android:state_selected="true"/>
+    <item android:drawable="@color/item_color2" />
+</selector>

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

@@ -466,8 +466,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-      
-            >
+            android:visibility="gone">
 
             <RelativeLayout
                 android:id="@+id/food_peoples_rl"

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

@@ -43,7 +43,7 @@
                  android:layout_alignParentRight="true"
                  android:layout_marginRight="5dp"
                  android:drawableRight="@drawable/icon_distances"
-                 android:padding="5dp"
+                 
                  android:text="距离" />
          </RelativeLayout>
        

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

@@ -73,6 +73,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:text="免费"
+                android:visibility="invisible"
                 android:textColor="@color/light_green" />
 
             <Button

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

@@ -113,14 +113,14 @@ public class BusinessHoursSetting extends BaseActivity implements View.OnClickLi
                             .putExtra("startDate", DateFormatUtil.long2Str(DateFormatUtil.YMD_HMS))
                             .putExtra("endDate", DateFormatUtil.long2Str(DateFormatUtil.YMD_HMS))
                             .putExtra("hasMenu", false)
-                            .putExtra("type", 2)
+                            .putExtra("type", 5)
                     , 0x24);
         }else if (v.getId() == R.id.tv_endTime){
             startActivityForResult(new Intent(mContext, SelectCalendarActivity.class)
                             .putExtra("startDate", DateFormatUtil.long2Str(DateFormatUtil.YMD_HMS))
                             .putExtra("endDate", DateFormatUtil.long2Str(DateFormatUtil.YMD_HMS))
                             .putExtra("hasMenu", false)
-                            .putExtra("type", 2)
+                            .putExtra("type", 5)
                     , 0x24);
         }else if (v.getId() == R.id.period_tv){
             sc_booktype = 1;