1.添加极光推送。

2.优化UI

app/src/main/java/com/quansu/heifengwuliu/App.java

@@ -32,6 +32,13 @@ public class App extends BApp  {
                 .init()
                 .subscribe();
 
+        CCRetrofit.instance()
+                .with(this)
+                .create(IJpush.class)
+                .initPush()
+                .subscribe();
+
+
         //注册微信
         WeChatUtil.Companion.regToWx(this);
 

app/src/main/java/com/quansu/heifengwuliu/activity/EvaluateActivity.kt

@@ -32,4 +32,7 @@ class EvaluateActivity: MBActivity<EvaluateVModel, ActivityEvaluateBinding>(){
     override fun title(): String? {
         return "发表评价"
     }
+
+    override val isRxbus: Boolean
+        get() = true
 }

app/src/main/java/com/quansu/heifengwuliu/activity/InvoiceActivity.kt

@@ -31,6 +31,8 @@ class InvoiceActivity : MBRActivity<InvoiceVModel, InvoiceAdapter, ActivityInvoi
     override fun init(savedInstanceState: Bundle?) {
         super.init(savedInstanceState)
 
+        vm.getInfo()
+
     }
 
     override fun listeners() {

app/src/main/java/com/quansu/heifengwuliu/activity/VehicleListActivity.kt

@@ -1,9 +1,13 @@
 package com.quansu.heifengwuliu.activity
 
 import android.os.Bundle
+import com.hwangjr.rxbus.annotation.Subscribe
+import com.hwangjr.rxbus.annotation.Tag
 import com.quansu.heifengwuliu.adapter.VehicleListAdapter
 import com.quansu.heifengwuliu.base.MBRActivity
+import com.quansu.heifengwuliu.config.ConfigRx
 import com.quansu.heifengwuliu.databinding.ActivityVehiclelistBinding
+import com.quansu.heifengwuliu.model.User
 import com.quansu.heifengwuliu.vmodel.VehicleListVModel
 
 /**
@@ -36,4 +40,14 @@ class VehicleListActivity : MBRActivity<VehicleListVModel, VehicleListAdapter, A
     override fun title(): String? {
         return "接单车辆"
     }
+
+    override val isRxbus: Boolean
+        get() =true
+
+    @Subscribe(tags = [Tag(ConfigRx.REFRESH_LIST)])
+    fun setRefreshList(type: String) {
+       onRefresh()
+    }
+
+
 }

app/src/main/java/com/quansu/heifengwuliu/config/ConfigRx.kt

@@ -23,5 +23,8 @@ object ConfigRx {
 
     const val REFRESH_USER = "REFRESH_USER" //刷新用户信息
 
+    const val REFRESH_LIST = "REFRESH_LIST" //刷新列表
+
+
 
 }

app/src/main/java/com/quansu/heifengwuliu/fragment/DriverOrderListFragment.kt

@@ -5,8 +5,11 @@ import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import com.hwangjr.rxbus.annotation.Subscribe
+import com.hwangjr.rxbus.annotation.Tag
 import com.quansu.heifengwuliu.adapter.DriverOrderListAdapter
 import com.quansu.heifengwuliu.base.MBRFragment
+import com.quansu.heifengwuliu.config.ConfigRx
 import com.quansu.heifengwuliu.config.MIntentAction
 import com.quansu.heifengwuliu.databinding.FragmentDriverOrderListBinding
 import com.quansu.heifengwuliu.vmodel.DriverOrderListVModel
@@ -48,4 +51,12 @@ class DriverOrderListFragment : MBRFragment<DriverOrderListVModel, DriverOrderLi
             onRefresh()
         }
     }
+
+    override val isRxbus: Boolean
+        get() = true
+
+    @Subscribe(tags = [Tag(ConfigRx.REFRESH_LIST)])
+    fun setRefreshList(type: String) {
+        onRefresh()
+    }
 }

app/src/main/java/com/quansu/heifengwuliu/fragment/IndexFragment.kt

@@ -6,9 +6,12 @@ import android.os.Bundle
 import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import com.hwangjr.rxbus.annotation.Subscribe
+import com.hwangjr.rxbus.annotation.Tag
 import com.qmuiteam.qmui.kotlin.onClick
 import com.quansu.heifengwuliu.adapter.IndexAdapter
 import com.quansu.heifengwuliu.base.MBRFragment
+import com.quansu.heifengwuliu.config.ConfigRx
 import com.quansu.heifengwuliu.config.MIntentAction
 import com.quansu.heifengwuliu.databinding.FragmentIndexBinding
 import com.quansu.heifengwuliu.vmodel.IndexVModel
@@ -34,6 +37,10 @@ class IndexFragment :  MBRFragment<IndexVModel, IndexAdapter, FragmentIndexBindi
         binding.flToSearch.onClick {
             binding.drawerLayout.closeDrawers()
         }
+        binding.tvSearch.onClick {
+            onRefresh()
+            binding.drawerLayout.closeDrawers()
+        }
     }
 
 
@@ -66,6 +73,13 @@ class IndexFragment :  MBRFragment<IndexVModel, IndexAdapter, FragmentIndexBindi
         }
     }
 
+    override val isRxbus: Boolean
+        get() =true
 
 
+    @Subscribe(tags = [Tag(ConfigRx.REFRESH_LIST)])
+    fun setRefreshList(type: String) {
+        onRefresh()
+    }
+
 }

app/src/main/java/com/quansu/heifengwuliu/fragment/OrderListFragment.kt

@@ -4,8 +4,11 @@ import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import com.hwangjr.rxbus.annotation.Subscribe
+import com.hwangjr.rxbus.annotation.Tag
 import com.quansu.heifengwuliu.adapter.OrderListAdapter
 import com.quansu.heifengwuliu.base.MBRFragment
+import com.quansu.heifengwuliu.config.ConfigRx
 import com.quansu.heifengwuliu.databinding.FragmentOrderListBinding
 import com.quansu.heifengwuliu.vmodel.OrderListVModel
 
@@ -33,4 +36,12 @@ class OrderListFragment : MBRFragment<OrderListVModel, OrderListAdapter, Fragmen
     override fun vmClass(): Class<OrderListVModel> {
         return OrderListVModel::class.java
     }
+
+    override val isNeedRefresh: Boolean
+        get() = true
+
+    @Subscribe(tags = [Tag(ConfigRx.REFRESH_LIST)])
+    fun setRefreshList(type: String) {
+        onRefresh()
+    }
 }

app/src/main/java/com/quansu/heifengwuliu/fragment/OwnerMoreFragment.kt

@@ -6,15 +6,11 @@ import android.os.Bundle
 import android.text.TextUtils
 import android.util.Log
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
-import android.widget.EditText
-import android.widget.LinearLayout
 import androidx.lifecycle.Observer
 import com.google.gson.Gson
 import com.hwangjr.rxbus.annotation.Subscribe
 import com.hwangjr.rxbus.annotation.Tag
-import com.quansu.heifengwuliu.R
 import com.quansu.heifengwuliu.activity.AddressActivity
 import com.quansu.heifengwuliu.activity.AreaSelectActivity
 import com.quansu.heifengwuliu.activity.CollectionActivity
@@ -77,8 +73,6 @@ class OwnerMoreFragment : MBFragment<OwnerMoreVModel, FragmentOwnermoreBinding>(
 
 
 
-
-
     override fun init(savedInstanceState: Bundle?) {
         super.init(savedInstanceState)
 
@@ -304,6 +298,12 @@ class OwnerMoreFragment : MBFragment<OwnerMoreVModel, FragmentOwnermoreBinding>(
             }
         }
 
+        if(null == info.default_send){
+            //没有装货地-去获取当前位置
+            vm.locationMap()
+
+        }
+
     }
 
     private fun getData() {

app/src/main/java/com/quansu/heifengwuliu/fragment/OwnerSingleFragment.kt

@@ -418,8 +418,18 @@ class OwnerSingleFragment : MBFragment<OwnerSingleVModel, FragmentOwnersingleBin
             }
         }
 
+        if(null==info.default_send){
+            //没有装货地-去获取当前位置
+            vm.locationMap()
+
+        }
     }
 
+
+
+
+
+
     private fun initData() {
 
 

app/src/main/java/com/quansu/heifengwuliu/utils/dialog/ChoseTimeDialog.kt

@@ -0,0 +1,38 @@
+package com.quansu.heifengwuliu.utils.dialog
+
+import android.content.Context
+import com.quansu.heifengwuliu.inte.ChoiceData
+
+/**
+ * 选择时间
+ *Created by shihuiyun
+ *on 2020/9/26
+ */
+object ChoseTimeDialog {
+
+
+    fun choseTime(context: Context,chosedata: ChoiceData){
+        var beginDeadTime="2017-01-01"
+        var defaultWeekBegin:String=""
+        var defaultWeekEnd:String=""
+        var time:String=""
+
+        var mDoubleTimeSelectDialog=DoubleTimeSelectDialog(context,beginDeadTime,defaultWeekBegin,defaultWeekEnd)
+
+        mDoubleTimeSelectDialog.setOnDateSelectFinished { startTime, endTime ->
+
+            time = startTime.replace("-", "-") + "至" + endTime.replace("-", "-")
+            chosedata.onRestuse(time)
+
+        }
+        mDoubleTimeSelectDialog.setOnDismissListener {
+
+        }
+
+        mDoubleTimeSelectDialog.recoverButtonState()
+        mDoubleTimeSelectDialog.show()
+
+    }
+
+
+}

app/src/main/java/com/quansu/heifengwuliu/utils/dialog/DoubleTimeSelectDialog.java

@@ -0,0 +1,680 @@
+package com.quansu.heifengwuliu.utils.dialog;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.text.SpannableString;
+import android.text.Spanned;
+import android.text.TextUtils;
+import android.text.style.ForegroundColorSpan;
+import android.text.style.RelativeSizeSpan;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+import com.quansu.heifengwuliu.R;
+import com.quansu.heifengwuliu.utils.dialog.timewheel.NumericWheelAdapter;
+import com.quansu.heifengwuliu.utils.dialog.timewheel.OnWheelChangedListener;
+import com.quansu.heifengwuliu.utils.dialog.timewheel.TimeIUtils;
+import com.quansu.heifengwuliu.utils.dialog.timewheel.WheelView;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.List;
+import java.util.Locale;
+
+/**
+ * Created by shihuiyun
+ * on 2020/8/26
+ */
+public class DoubleTimeSelectDialog extends Dialog implements View.OnClickListener{
+    private Context mContext;
+
+    /**
+     * 事件选取完毕监听
+     */
+    private OnDateSelectFinished onDateSelectFinished;
+    /**
+     * 开始、结束年份
+     */
+    private static int START_YEAR = 1990, END_YEAR = 2100;
+    /**
+     * 最大年龄
+     */
+    private final int LARGEST_AGE = 119;
+    /**
+     * 年
+     */
+    private WheelView mYearView;
+
+    /**
+     * 选择年
+     */
+    private int choiceYearView;
+
+    /**
+     * 月
+     */
+    private WheelView mMonthView;
+    /**
+     * 日
+     */
+    private WheelView mDayView;
+    /**
+     * 时
+     */
+    private WheelView mHourView;
+    /**
+     * 分
+     */
+    private WheelView mMinuteView;
+
+    /**
+     * 秒
+     */
+    private WheelView mSecondView;
+
+
+    /**
+     * list列表(大月份)
+     */
+    private List<String> mListBig;
+    /**
+     * list列表(小月份)
+     */
+    private List<String> mListLittle;
+
+    /* 是否只选择本年 */
+    private boolean isOnlyThisYear = false;
+
+
+
+    /* 是否只选择本月 */
+    private boolean isOnlyThisMonth = false;
+
+    public static final String YEAR = "year";
+    public static final String MONTH = "month";
+    public static final String DAY = "day";
+    private int year;
+    private int month;
+    private int day;
+    private int hour;
+    private int minute;
+    private int second;
+
+    private int curYear;
+    private int curMonth;
+    private int curDay;
+
+    /**时间容器*/
+    private LinearLayout mTimeContainerLl;
+    /**开始时间*/
+    private TextView mBeginTimeTv;
+    /**结束时间*/
+    private TextView mEndTimeTv;
+
+    /**选择的开始时间*/
+    private String mSelectStartTime;
+    /**选择的结束时间*/
+    private String mSelectEndTime;
+
+    /**当前选择时间模式*/
+    private TIME_TYPE mTimeType = TIME_TYPE.TYPE_START;
+
+    /**最小时间*/
+    private String allowedSmallestTime;
+    /**最大时间*/
+    private String allowedBiggestTime;
+    private enum TIME_TYPE {
+        TYPE_START,
+        TYPE_END
+    }
+
+
+
+    public DoubleTimeSelectDialog(Context context) {
+        super(context, R.style.PopBottomDialogStyle);
+    }
+
+    public DoubleTimeSelectDialog(Context context, String curTime, String startTime) {
+        super(context, R.style.PopBottomDialogStyle);
+        this.mContext = context;
+        this.allowedSmallestTime = startTime;
+        setContentView(R.layout.popwindow_bottom_layout);
+        setCanceledOnTouchOutside(true);
+        Window mDialogWindow = getWindow();
+        mDialogWindow.setGravity(Gravity.BOTTOM);
+        WindowManager.LayoutParams lp = mDialogWindow.getAttributes();
+        lp.y = 0;//设置Dialog距离底部的距离
+        lp.width = ViewGroup.LayoutParams.MATCH_PARENT;
+        mDialogWindow.setAttributes(lp);
+
+        initDialogView();
+
+        init(curTime, false);
+
+        String monthS = String.format("%02d", curMonth);
+        String dayS = String.format("%02d", curDay);
+        String yearS = String.format("%02d", curYear);
+
+//        String hourS = String.format("%02d", hour);
+//        String minuteS = String.format("%02d", minute);
+//        String secondS = String.format("%02d", second);
+
+
+
+        if(!TextUtils.isEmpty(curTime)){
+            mSelectStartTime = curTime;
+            Log.e("-shy-", "d5=: "+mSelectStartTime);
+
+            mBeginTimeTv.setText(makeFormatContent(mContext.getString(R.string.begin_at), curTime.replaceAll("-",".")));
+            mSelectEndTime = curTime;
+            mEndTimeTv.setText(makeFormatContent(mContext.getString(R.string.end_at), curTime.replaceAll("-",".")));
+        }else{
+            mSelectStartTime = yearS + "-" + monthS + "-" + dayS;
+            Log.e("-shy-", "d1=: "+mSelectStartTime);
+
+            mBeginTimeTv.setText(makeFormatContent(mContext.getString(R.string.begin_at), yearS + "." + monthS + "." + dayS));
+            mSelectEndTime = yearS + "-" + monthS + "-" + dayS;
+            mEndTimeTv.setText(makeFormatContent(mContext.getString(R.string.end_at), yearS + "." + monthS + "." + dayS));
+        }
+    }
+
+    public DoubleTimeSelectDialog(Context context, String earliestTime, String startTime, String endTime) {
+        super(context, R.style.PopBottomDialogStyle);
+        this.mContext = context;
+        this.allowedSmallestTime = earliestTime;
+        this.allowedBiggestTime = endTime;
+        setContentView(R.layout.popwindow_bottom_layout);
+        setCanceledOnTouchOutside(true);
+        Window mDialogWindow = getWindow();
+        mDialogWindow.setGravity(Gravity.BOTTOM);
+        WindowManager.LayoutParams lp = mDialogWindow.getAttributes();
+        lp.y = 0;//设置Dialog距离底部的距离
+        lp.width = ViewGroup.LayoutParams.MATCH_PARENT;
+        mDialogWindow.setAttributes(lp);
+
+        initDialogView();
+
+        init(startTime, false);
+
+        String monthS = String.format("%02d", curMonth);
+        String dayS = String.format("%02d", curDay);
+        String yearS = String.format("%02d", curYear);
+
+
+//        String hourS = String.format("%02d", 0);
+//        String minuteS = String.format("%02d", 0);
+//        String secondS = String.format("%02d", 0);
+//
+//
+//        String endhourS = String.format("%02d", 23);
+//        String endminuteS = String.format("%02d", 59);
+//        String endsecondS = String.format("%02d", 59);
+
+        if(!TextUtils.isEmpty(startTime)){
+            mSelectStartTime = startTime;
+            Log.e("-shy-", "d2=: "+mSelectStartTime);
+
+            mBeginTimeTv.setText(makeFormatContent(mContext.getString(R.string.begin_at), startTime.replaceAll("-",".")));
+            mSelectEndTime = endTime;
+            mEndTimeTv.setText(makeFormatContent(mContext.getString(R.string.end_at), endTime.replaceAll("-",".")));
+        }else{
+            mSelectStartTime = yearS + "-" + monthS + "-" + dayS;
+            Log.e("-shy-", "d3=: "+mSelectStartTime);
+
+            mBeginTimeTv.setText(makeFormatContent(mContext.getString(R.string.begin_at), yearS + "." + monthS + "." + dayS));
+            mSelectEndTime = yearS + "-" + monthS + "-" + dayS;
+            mEndTimeTv.setText(makeFormatContent(mContext.getString(R.string.end_at), yearS + "." + monthS + "." + dayS));
+        }
+    }
+
+    private void initDialogView () {
+
+        mTimeContainerLl = (LinearLayout) findViewById(R.id.ll_tclTimeToTime);
+        mBeginTimeTv = (TextView) findViewById(R.id.tv_tclBeginTime);
+        mEndTimeTv = (TextView) findViewById(R.id.tv_tclEndTime);
+
+        findViewById(R.id.tv_tclCancel).setOnClickListener(this);
+        findViewById(R.id.tv_tclOk).setOnClickListener(this);
+        mBeginTimeTv.setOnClickListener(this);
+        mEndTimeTv.setOnClickListener(this);
+
+    }
+
+    /*恢复起始时间按钮的点击状态*/
+    public void recoverButtonState(){
+        mTimeType = TIME_TYPE.TYPE_START;
+        init(mSelectStartTime, false);
+        mTimeContainerLl.setBackgroundResource(R.drawable.begin_time_bg);
+    }
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.tv_tclBeginTime:
+                mTimeType = TIME_TYPE.TYPE_START;
+                init(mSelectStartTime, false);
+                mTimeContainerLl.setBackgroundResource(R.drawable.begin_time_bg);
+                break;
+            case R.id.tv_tclEndTime:
+                mTimeType = TIME_TYPE.TYPE_END;
+                init(mSelectEndTime, false);
+                mTimeContainerLl.setBackgroundResource(R.drawable.end_time_bg);
+                break;
+            case R.id.tv_tclCancel:
+                this.dismiss();
+
+                break;
+            case R.id.tv_tclOk:
+              //  SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA);
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA);
+
+                try {
+                    if (sdf.parse(mSelectStartTime).getTime() > sdf.parse(mSelectEndTime).getTime()) {
+                        Toast.makeText(mContext,R.string.time_start_larger_end_not_allowed,Toast.LENGTH_SHORT).show();
+                    } else {
+                        if (onDateSelectFinished != null) {
+                            onDateSelectFinished.onSelectFinished(mSelectStartTime, mSelectEndTime);
+                        }
+                        this.dismiss();
+                    }
+                } catch (ParseException e) {
+                    e.printStackTrace();
+                }
+
+        }
+    }
+
+    public void init(String date, boolean isShowHour) {
+        Calendar calendar = Calendar.getInstance();
+        curYear = calendar.get(Calendar.YEAR);
+        curMonth = calendar.get(Calendar.MONTH) + 1;
+        curDay = calendar.get(Calendar.DATE);
+//        hour = calendar.get(Calendar.HOUR_OF_DAY);
+//        minute = calendar.get(Calendar.MINUTE);
+//        second=calendar.get(Calendar.SECOND);
+
+        calendar.clear();
+
+        if  (date != null) {
+            String[] ymd = date.split("-");
+            if (ymd.length > 2) {
+                curYear = Integer.parseInt(ymd[0]);
+                curMonth = Integer.parseInt(ymd[1]) - 1;
+                String[] dhm = ymd[2].split(" ");
+                curDay = Integer.parseInt(dhm[0]);
+                if (dhm.length > 1) {
+                    String[] hm = dhm[1].split(":");
+                    if (hm.length > 1) {
+//                        hour = Integer.parseInt(hm[0]);
+//                        minute = Integer.parseInt(hm[1]);
+//                        second= Integer.parseInt(hm[2]);
+                    }
+                }
+            }
+        }
+
+        mYearView = (WheelView) findViewById(R.id.year);
+        mMonthView = (WheelView) findViewById(R.id.month);
+        mDayView = (WheelView) findViewById(R.id.day);
+        mHourView = (WheelView) findViewById(R.id.hour);
+        mMinuteView = (WheelView) findViewById(R.id.minute);
+        mSecondView=(WheelView)findViewById(R.id.second);
+
+        if (!isShowHour) {
+            mHourView.setVisibility(View.GONE);
+            mMinuteView.setVisibility(View.GONE);
+            mSecondView.setVisibility(View.GONE);
+
+        }
+
+//        if (!isShowMinute) {
+//            mMinuteView.setVisibility(View.GONE);
+//        }
+
+
+        /* 年，月，日，时，分 等单位，和值同在 */
+        findViewById(R.id.tv_yearUnit).setVisibility(mYearView.getVisibility());
+
+        findViewById(R.id.tv_monthUnit).setVisibility(mMonthView.getVisibility());
+
+        findViewById(R.id.tv_dayUnit).setVisibility(mDayView.getVisibility());
+        findViewById(R.id.v_dayAndMinute).setVisibility(isShowHour ? View.VISIBLE : View.GONE);
+        findViewById(R.id.v_dayAndSecondTo).setVisibility(isShowHour ? View.VISIBLE : View.GONE);
+        findViewById(R.id.v_dayAndSecond).setVisibility(isShowHour ? View.VISIBLE : View.GONE);
+
+
+        findViewById(R.id.tv_hourUnit).setVisibility(mHourView.getVisibility());
+
+        findViewById(R.id.tv_minuteUnit).setVisibility(mMinuteView.getVisibility());
+
+
+        findViewById(R.id.tv_minuteSecond).setVisibility(mSecondView.getVisibility());
+
+
+        initDatePicker(isShowHour);
+
+        mYearView.removeChangingListener(yearWheelListener);
+        mMonthView.removeChangingListener(monthWheelListener);
+        mDayView.removeChangingListener(dayWheelListener);
+
+        //时分秒的监听
+        mHourView.removeChangingListener(hourWheelListener);
+        mMinuteView.removeChangingListener(minuteWheelListener);
+        mSecondView.removeChangingListener(secondWheelListener);
+
+
+        mYearView.addChangingListener(yearWheelListener);
+        mMonthView.addChangingListener(monthWheelListener);
+        mDayView.addChangingListener(dayWheelListener);
+
+
+        mHourView.addChangingListener(hourWheelListener);
+        mMinuteView.addChangingListener(minuteWheelListener);
+        mSecondView.addChangingListener(secondWheelListener);
+
+
+    }
+    /**
+     * 弹出日期时间选择器
+     */
+    private void initDatePicker(boolean isShowHour) {
+        Calendar calendar = Calendar.getInstance();
+        year = calendar.get(Calendar.YEAR);
+        month = calendar.get(Calendar.MONTH);
+        day = calendar.get(Calendar.DATE);
+//        END_YEAR = year;
+        String[] ymd = allowedSmallestTime.split("-");
+        if(TextUtils.isEmpty(allowedBiggestTime))
+            allowedBiggestTime = TimeIUtils.getCurData();
+        String[] ymdEnd= allowedBiggestTime.split("-");
+
+        if (ymd.length > 2) {
+            START_YEAR = Integer.parseInt(ymd[0]);
+        }
+        if(ymdEnd.length>2){
+            END_YEAR = Integer.parseInt(ymdEnd[0]);
+            month = Integer.parseInt(ymdEnd[1])-1;
+            day= Integer.parseInt(ymdEnd[2]);
+        }
+
+        // 添加大小月月份并将其转换为list,方便之后的判断
+        String[] monthsBig = {"1", "3", "5", "7", "8", "10", "12"};
+        String[] monthsLittle = {"4", "6", "9", "11"};
+
+        mListBig = Arrays.asList(monthsBig);
+        mListLittle = Arrays.asList(monthsLittle);
+
+        // 年
+        mYearView.setAdapter(new NumericWheelAdapter(START_YEAR, END_YEAR));// 设置"年"的显示数据
+        mYearView.setLabel("");// 添加文字
+        int yearPos = isOnlyThisYear ? END_YEAR - START_YEAR : curYear != 0 ? curYear - START_YEAR : END_YEAR - START_YEAR;
+        mYearView.setCurrentItem(yearPos);// 初始化时显示的数据 START_YEAR - END_YEAR
+        mYearView.setCyclic(false);// 循环滚动
+
+
+        // 月
+        int startMonth = 1;
+        if (isOnlyThisMonth) {
+            startMonth = curMonth + 1;
+        }
+
+        //初始年份最大值应该是当年最大月
+        mMonthView.setAdapter(new NumericWheelAdapter(startMonth, year == curYear ? month + 1 : 12));
+        mMonthView.setLabel("");
+        mMonthView.setCurrentItem(isOnlyThisMonth ? 0 : curMonth != 0 ? curMonth : month);
+        mMonthView.setCyclic(false);
+
+        // 日
+        //判断是否属于当前月份，如果不是，需要判断大小月，进行初始化
+        if (curMonth < month){
+            // 判断大小月及是否闰年,用来确定"日"的数据
+            if (mListBig.contains(String.valueOf(curMonth))) {
+                mDayView.setAdapter(new NumericWheelAdapter(1, 31));
+            } else if (mListLittle.contains(String.valueOf(curMonth))) {
+                mDayView.setAdapter(new NumericWheelAdapter(1, 30));
+            } else {
+                if (((mYearView.getCurrentItem() + START_YEAR) % 4 == 0 && (mYearView.getCurrentItem() + START_YEAR) % 100 != 0)
+                        || (mYearView.getCurrentItem() + START_YEAR) % 400 == 0)
+                    mDayView.setAdapter(new NumericWheelAdapter(1, 29));
+                else
+                    mDayView.setAdapter(new NumericWheelAdapter(1, 28));
+            }
+        }else {
+            if(mTimeType == TIME_TYPE.TYPE_END){
+                mDayView.setAdapter(new NumericWheelAdapter(1, Integer.parseInt(ymdEnd[2])));
+            }else if(mTimeType == TIME_TYPE.TYPE_START){
+                mDayView.setAdapter(new NumericWheelAdapter(Integer.parseInt(ymd[2]), day));
+            }else{
+                mDayView.setAdapter(new NumericWheelAdapter(1, day));
+            }
+        }
+
+        mDayView.setLabel("");
+        mDayView.setCurrentItem(curDay == 0 ? day - 1 : curDay - 1);
+        mDayView.setCyclic(true);
+
+        if(isShowHour) {
+            // 时
+            mHourView.setAdapter(new NumericWheelAdapter(0, 23));
+            mHourView.setLabel("");
+            mHourView.setCurrentItem(hour);
+            mHourView.setCyclic(true);
+
+            // 分
+            mMinuteView.setAdapter(new NumericWheelAdapter(0, 59));
+            mMinuteView.setLabel("");
+            mMinuteView.setCurrentItem(minute);
+            mMinuteView.setCyclic(true);
+
+            //秒
+            mSecondView.setAdapter(new NumericWheelAdapter(0, 59));
+            mSecondView.setLabel("");
+            mSecondView.setCurrentItem(second);
+            mSecondView.setCyclic(true);
+
+        }
+
+        // 选择器字体的大小
+        int textSize = mContext.getResources().getDimensionPixelSize(R.dimen.ymd_text_size);
+        mDayView.TEXT_SIZE = textSize;
+        mMonthView.TEXT_SIZE = textSize;
+        mYearView.TEXT_SIZE = textSize;
+        mHourView.TEXT_SIZE = textSize;
+        mSecondView.TEXT_SIZE=textSize;
+        mMinuteView.TEXT_SIZE = textSize;
+    }
+
+
+    /**
+     * 添加对"年"监听
+     */
+    private OnWheelChangedListener yearWheelListener = new OnWheelChangedListener() {
+        public void onChanged(WheelView wheel, int oldValue, int newValue) {
+            int year_num = newValue + START_YEAR;
+            choiceYearView = year_num;
+            if (year_num < year) {
+                mMonthView.setAdapter(new NumericWheelAdapter(1, 12));
+            } else if (year_num >= year) {
+                mMonthView.setAdapter(new NumericWheelAdapter(1, month + 1));
+            }
+            mMonthView.setCurrentItem(0);
+            // 判断大小月及是否闰年,用来确定"日"的数据
+            if (mListBig.contains(String.valueOf(mMonthView.getCurrentItem() + 1))) {
+                mDayView.setAdapter(new NumericWheelAdapter(1, 31));
+            } else if (mListLittle.contains(String.valueOf(mMonthView.getCurrentItem() + 1))) {
+                mDayView.setAdapter(new NumericWheelAdapter(1, 30));
+            } else {
+                if ((year_num % 4 == 0 && year_num % 100 != 0) || year_num % 400 == 0)
+                    mDayView.setAdapter(new NumericWheelAdapter(1, 29));
+                else
+                    mDayView.setAdapter(new NumericWheelAdapter(1, 28));
+            }
+            onScroll();
+            mMonthView.setCurrentItem(mMonthView.getCurrentItem());
+            mDayView.setCurrentItem(mDayView.getCurrentItem());
+        }
+    };
+
+    /**
+     * 添加对"月"监听
+     */
+    private OnWheelChangedListener monthWheelListener = new OnWheelChangedListener() {
+        public void onChanged(WheelView wheel, int oldValue, int newValue) {
+            int month_num = newValue + 1;
+            if (month_num == (month + 1) && choiceYearView == year) {
+                mDayView.setAdapter(new NumericWheelAdapter(1, day));
+            } else {
+                // 判断大小月及是否闰年,用来确定"日"的数据
+                if (mListBig.contains(String.valueOf(month_num))) {
+                    mDayView.setAdapter(new NumericWheelAdapter(1, 31));
+                } else if (mListLittle.contains(String.valueOf(month_num))) {
+                    mDayView.setAdapter(new NumericWheelAdapter(1, 30));
+                } else {
+                    if (((mYearView.getCurrentItem() + START_YEAR) % 4 == 0 && (mYearView.getCurrentItem() + START_YEAR) % 100 != 0)
+                            || (mYearView.getCurrentItem() + START_YEAR) % 400 == 0)
+                        mDayView.setAdapter(new NumericWheelAdapter(1, 29));
+                    else
+                        mDayView.setAdapter(new NumericWheelAdapter(1, 28));
+                }
+            }
+            onScroll();
+            mDayView.setCurrentItem(mDayView.getCurrentItem());
+        }
+    };
+
+    /**
+     * 添加对 日滚动控件 的添加
+     */
+    private OnWheelChangedListener dayWheelListener = new OnWheelChangedListener() {
+        public void onChanged(WheelView wheel, int oldValue, int newValue) {
+            mDayView.setCurrentItem(newValue);
+            onScroll();
+        }
+    };
+
+
+
+    private OnWheelChangedListener  hourWheelListener=new OnWheelChangedListener() {
+        @Override
+        public void onChanged(WheelView wheel, int oldValue, int newValue) {
+            mHourView.setCurrentItem(newValue);
+
+            onScroll();
+        }
+    };
+
+    private OnWheelChangedListener  minuteWheelListener=new OnWheelChangedListener() {
+        @Override
+        public void onChanged(WheelView wheel, int oldValue, int newValue) {
+            mMinuteView.setCurrentItem(newValue);
+            onScroll();
+        }
+    };
+
+    private OnWheelChangedListener  secondWheelListener=new OnWheelChangedListener() {
+        @Override
+        public void onChanged(WheelView wheel, int oldValue, int newValue) {
+            mSecondView.setCurrentItem(newValue);
+
+            onScroll();
+        }
+    };
+
+
+
+
+
+
+    private void onScroll() {
+
+        int year = isOnlyThisYear ? Integer.parseInt(mYearView.getAdapter().getItem(0))
+                : mYearView.getCurrentItem() + START_YEAR;
+        int month = isOnlyThisMonth ? Integer.parseInt(mMonthView.getAdapter().getItem(0))
+                : mMonthView.getCurrentItem() + 1;
+        int day = mDayView.getCurrentItem() + 1;
+
+
+//        int hour=mHourView.getCurrentItem();
+//        int minute=mMinuteView.getCurrentItem();
+//        int second=mSecondView.getCurrentItem();
+
+
+
+        String monthS = String.format("%02d", month);
+        String dayS = String.format("%02d", day);
+        String yearS = String.format("%02d", year);
+
+
+
+//        String hourS = String.format("%02d", hour);
+//        String minuteS = String.format("%02d", minute);
+//        String secondS = String.format("%02d", second);
+
+
+
+
+
+
+
+        if (mTimeType == TIME_TYPE.TYPE_START) {
+            mSelectStartTime = yearS + "-" + monthS + "-" + dayS;
+            Log.e("-shy-", "d4=: "+mSelectStartTime);
+
+            mBeginTimeTv.setText(makeFormatContent(mContext.getString(R.string.begin_at), yearS + "." + monthS + "." + dayS));
+        } else {
+            mSelectEndTime = yearS + "-" + monthS + "-" + dayS;
+            mEndTimeTv.setText(makeFormatContent(mContext.getString(R.string.end_at), yearS + "." + monthS + "." + dayS));
+        }
+    }
+
+    /**
+     * 格式化显示的数据，必须返回SpannableString对象
+     *
+     * @param priFix  前缀
+     * @param content 内容
+     * @return 返回格式化的数据
+     */
+    private SpannableString makeFormatContent(String priFix, String content){
+        SpannableString spannableString = new SpannableString(priFix + content);
+        spannableString.setSpan(new ForegroundColorSpan(mContext.getResources().getColor(R.color.black33)),
+                priFix.length(), spannableString.length(), Spanned.SPAN_EXCLUSIVE_INCLUSIVE);
+        spannableString.setSpan(new RelativeSizeSpan(1.33f),
+                priFix.length(), spannableString.length(), Spanned.SPAN_EXCLUSIVE_INCLUSIVE);
+        return spannableString;
+    }
+
+
+    /**
+     * set监听
+     *
+     * @param onDateSelectFinished 完成监听
+     */
+    public void setOnDateSelectFinished(OnDateSelectFinished onDateSelectFinished) {
+        this.onDateSelectFinished = onDateSelectFinished;
+    }
+
+    /**
+     * 监听接口
+     */
+    public interface OnDateSelectFinished {
+        /**
+         * 监听方法
+         *
+         * @param startTime   开始时间
+         * @param endTime  结束时间
+         */
+        void onSelectFinished(String startTime, String endTime);
+    }
+
+
+
+
+    }
+

app/src/main/java/com/quansu/heifengwuliu/utils/dialog/timewheel/NumericWheelAdapter.java

@@ -0,0 +1,103 @@
+/*
+ *  Copyright 2010 Yuri Kanivets
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package com.quansu.heifengwuliu.utils.dialog.timewheel;
+
+
+/**
+ * Numeric Wheel adapter.
+ */
+public class NumericWheelAdapter implements WheelAdapter {
+
+    /**
+     * The default min value
+     */
+    public static final int DEFAULT_MAX_VALUE = 9;
+
+    /**
+     * The default max value
+     */
+    private static final int DEFAULT_MIN_VALUE = 0;
+
+    // Values
+    private int minValue;
+    private int maxValue;
+
+    // format
+    private String format;
+
+    /**
+     * Default constructor
+     */
+    public NumericWheelAdapter() {
+        this(DEFAULT_MIN_VALUE, DEFAULT_MAX_VALUE);
+    }
+
+    /**
+     * Constructor
+     *
+     * @param minValue the wheel min value
+     * @param maxValue the wheel max value
+     */
+    public NumericWheelAdapter(int minValue, int maxValue) {
+        this(minValue, maxValue, null);
+    }
+
+    /**
+     * Constructor
+     *
+     * @param minValue the wheel min value
+     * @param maxValue the wheel max value
+     * @param format   the format string
+     */
+    public NumericWheelAdapter(int minValue, int maxValue, String format) {
+        this.minValue = minValue;
+        this.maxValue = maxValue;
+        this.format = format;
+    }
+
+    @Override
+    public String getItem(int index) {
+        if (index >= 0 && index < getItemsCount()) {
+            int value = minValue + index;
+            return format != null ? String.format(format, value) : Integer.toString(value);
+        }
+        return null;
+    }
+
+    @Override
+    public int getItemsCount() {
+        return maxValue - minValue + 1;
+    }
+
+    @Override
+    public int getMaximumLength() {
+        int max = Math.max(Math.abs(maxValue), Math.abs(minValue));
+        int maxLen = format != null ? Integer.toString(max).length() + format.length() : Integer.toString(max).length();
+        if (minValue < 0) {
+            maxLen++;
+        }
+        return maxLen;
+    }
+
+    public int getmaxValue() {
+        return maxValue;
+    }
+
+    public int getMinValue() {
+        return minValue;
+    }
+}

app/src/main/java/com/quansu/heifengwuliu/utils/dialog/timewheel/OnWheelChangedListener.java

@@ -0,0 +1,33 @@
+/*
+ *  Copyright 2010 Yuri Kanivets
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package com.quansu.heifengwuliu.utils.dialog.timewheel;
+
+/**
+ * Wheel changed listener interface.
+ * <p>The currentItemChanged() method is called whenever current wheel positions is changed:
+ * <li> New Wheel position is set
+ * <li> Wheel view is scrolled
+ */
+public interface OnWheelChangedListener {
+	/**
+	 * Callback method to be invoked when current item changed
+	 * @param wheel the wheel view whose state has changed
+	 * @param oldValue the old value of current item
+	 * @param newValue the new value of current item
+	 */
+	void onChanged(WheelView wheel, int oldValue, int newValue);
+}

app/src/main/java/com/quansu/heifengwuliu/utils/dialog/timewheel/OnWheelScrollListener.java

@@ -0,0 +1,34 @@
+/*
+ *  Copyright 2010 Yuri Kanivets
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package com.quansu.heifengwuliu.utils.dialog.timewheel;
+
+/**
+ * Wheel scrolled listener interface.
+ */
+public interface OnWheelScrollListener {
+	/**
+	 * Callback method to be invoked when scrolling started.
+	 * @param wheel the wheel view whose state has changed.
+	 */
+	void onScrollingStarted(WheelView wheel);
+	
+	/**
+	 * Callback method to be invoked when scrolling ended.
+	 * @param wheel the wheel view whose state has changed.
+	 */
+	void onScrollingFinished(WheelView wheel);
+}

app/src/main/java/com/quansu/heifengwuliu/utils/dialog/timewheel/TimeIUtils.java

@@ -0,0 +1,177 @@
+package com.quansu.heifengwuliu.utils.dialog.timewheel;
+
+import androidx.annotation.NonNull;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Locale;
+
+/**
+ * Created by shihuiyun
+ * on 2020/8/26
+ */
+public class TimeIUtils {
+    /**
+            * 重一种模式,转换为另一种模式
+     *
+             * @param str
+     * @param oldFormat 旧模式
+     * @param newFormat 新模式
+     * @return
+             */
+    public static String formatTime(@NonNull String str, @NonNull String oldFormat,
+                                    @NonNull String newFormat) {
+        if (str == null || oldFormat == null || newFormat == null) {
+            return null;
+        }
+        SimpleDateFormat oldSDF = new SimpleDateFormat(oldFormat);
+        SimpleDateFormat newSDF = new SimpleDateFormat(newFormat);
+        String formatTime = null;
+        try {
+            Date oldD = oldSDF.parse(str);
+            formatTime = newSDF.format(oldD);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return formatTime;
+    }
+
+    /**
+     * 获取系统当前时间
+     *
+     * @return curTime
+     */
+    public static String getCurTime() {
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date curDate = new Date(System.currentTimeMillis());//获取当前时间
+        String curTime = formatter.format(curDate);
+        return curTime;
+    }
+
+    /**
+     * 获取系统当前日期
+     *
+     * @return curData
+     */
+    public static String getCurData() {
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+        Date curDate = new Date(System.currentTimeMillis());//获取当前时间
+        String curData = formatter.format(curDate);
+        return curData;
+    }
+
+    /**
+     * 获取系统当前日期
+     *
+     * @return curData
+     */
+    public static String getCurData1() {
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
+        Date curDate = new Date(System.currentTimeMillis());//获取当前时间
+        String curData = formatter.format(curDate);
+        return curData;
+    }
+
+    /**
+     * 获取系统当前日期
+     *
+     * @return curData
+     */
+    public static String getCurData2() {
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyyMM");
+        Date curDate = new Date(System.currentTimeMillis());//获取当前时间
+        String curData = formatter.format(curDate);
+        return curData;
+    }
+
+    public static String getCurData3() {
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy");
+        Date curDate = new Date(System.currentTimeMillis());//获取当前时间
+        String curData = formatter.format(curDate);
+        return curData;
+    }
+
+    public static int getCurrentHour() {
+        Calendar calendar = Calendar.getInstance(Locale.CHINA);
+        //创建一个日历引用d，通过静态方法getInstance() 从指定时区 Locale.CHINA 获得一个日期实例
+        Date myDate = new Date();
+        //创建一个Date实例
+        calendar.setTime(myDate);
+        //设置日历的时间，把一个新建Date实例myDate传入
+        int hour = calendar.get(Calendar.HOUR);
+        return hour;
+    }
+
+    public static int getCurrentMinute() {
+        Calendar calendar = Calendar.getInstance();
+        //创建一个日历引用d，通过静态方法getInstance() 从指定时区 Locale.CHINA 获得一个日期实例
+        Date myDate = new Date();
+        //创建一个Date实例
+        calendar.setTime(myDate);
+        //设置日历的时间，把一个新建Date实例myDate传入
+        int minute = calendar.get(Calendar.MINUTE);
+        return minute;
+    }
+
+    /**
+     * 获取上月开始天
+     *
+     * @return curData
+     */
+    public static String getLastMonthBeginDate() {
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        Calendar calendar = Calendar.getInstance();
+        calendar.add(Calendar.MONTH, -1);
+        calendar.set(Calendar.DAY_OF_MONTH, 1);
+        return format.format(calendar.getTime());
+    }
+
+    /**
+     * 获取上月结束天
+     *
+     * @return curData
+     */
+    public static String getLastMonthEndDate() {
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.DAY_OF_MONTH, 0);
+        return format.format(calendar.getTime());
+    }
+
+    /**
+     * 处理endtime(yyyy-mm-dd)，需要穿当前日期的前一天
+     * 如果当前时间是1号，后台返回的月份是上个月，day直接取上个月月末
+     * 如果当时时间不是1号，后台返回当前月份，day需要拿当前日期的前一天
+     */
+    public static String formatDayContent(String year, String month) {
+
+        String currentDate = TimeIUtils.getCurData();
+        String[] time = currentDate.split("-");
+        String day = time[2];
+        /*展示的年月不是当年或者当月，日都需要显示那个月后一天*/
+        if (time[2].equals("1")||!time[0].equals(year)||!time[1].equals(month)) {
+            day = getDayByYearAndMonth(Integer.parseInt(year), Integer.parseInt(month));
+        } else {
+            int dayIntger = Integer.parseInt(day) - 1;
+            day = String.valueOf(dayIntger);
+        }
+        if(day.length()==1){
+            day="0"+day;
+        }
+        return day;
+    }
+
+    /*根据年月获取天数的最大值*/
+    public static String getDayByYearAndMonth(int year, int month) {
+        Calendar time = Calendar.getInstance();
+        time.clear();
+        time.set(Calendar.YEAR, year);
+        //year年
+        time.set(Calendar.MONTH, month - 1);
+        //Calendar对象默认一月为0,month月
+        String day = time.getActualMaximum(Calendar.DAY_OF_MONTH) + "";//本月份的天数
+        return day;
+    }
+}

app/src/main/java/com/quansu/heifengwuliu/utils/dialog/timewheel/WheelAdapter.java

@@ -0,0 +1,41 @@
+/*
+ *  Copyright 2010 Yuri Kanivets
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package com.quansu.heifengwuliu.utils.dialog.timewheel;
+
+public interface WheelAdapter {
+	/**
+	 * Gets items count
+	 * @return the count of wheel items
+	 */
+	public int getItemsCount();
+	
+	/**
+	 * Gets a wheel item by index.
+	 * 
+	 * @param index the item index
+	 * @return the wheel item text or null
+	 */
+	public String getItem(int index);
+	
+	/**
+	 * Gets maximum item length. It is used to determine the wheel width. 
+	 * If -1 is returned there will be used the default wheel width.
+	 * 
+	 * @return the maximum item length or -1
+	 */
+	public int getMaximumLength();
+}

app/src/main/java/com/quansu/heifengwuliu/utils/dialog/timewheel/WheelView.java

@@ -0,0 +1,981 @@
+/*
+ *  Android Wheel Control.
+ *  https://code.google.com/p/android-wheel/
+ *  
+ *  Copyright 2010 Yuri Kanivets
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package com.quansu.heifengwuliu.utils.dialog.timewheel;
+
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.GradientDrawable;
+import android.graphics.drawable.GradientDrawable.Orientation;
+import android.os.Handler;
+import android.os.Message;
+import android.text.Layout;
+import android.text.StaticLayout;
+import android.text.TextPaint;
+import android.util.AttributeSet;
+import android.view.GestureDetector;
+import android.view.GestureDetector.SimpleOnGestureListener;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.animation.Interpolator;
+import android.widget.Scroller;
+
+
+import com.quansu.heifengwuliu.R;
+
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * Numeric wheel view.
+ * @author Yuri Kanivets
+ */
+public class WheelView extends View {
+	 /** 滚动持续的时间 */ 
+    private static final int SCROLLING_DURATION = 400; 
+ 
+    /** 最少滚动的位置 */ 
+    private static final int MIN_DELTA_FOR_SCROLLING = 1; 
+ 
+    /** 当前值和标签的颜色 */ 
+    private static final int VALUE_TEXT_COLOR = 0xFFFFBC00;
+ 
+    /** item文字的颜色 */ 
+    private static final int ITEMS_TEXT_COLOR = 0xFF919191; 
+ 
+    /** 顶部和底部阴影的颜色 */ 
+    private static final int[] SHADOWS_COLORS = new int[] { 0xFF111111, 
+            0x00AAAAAA, 0x00AAAAAA }; 
+ 
+    /** 附加的item的高度 */ 
+    private static final int ADDITIONAL_ITEM_HEIGHT = 60; 
+ 
+    /** 字体大小 */ 
+	public int TEXT_SIZE;
+ 
+    /** 顶部和底部item的偏移值 */ 
+    private final int ITEM_OFFSET = TEXT_SIZE / 3; 
+ 
+    /** item布局的附加宽度 */ 
+    private static final int ADDITIONAL_ITEMS_SPACE = 12; 
+ 
+    /** 标签偏移值 */ 
+    private static final int LABEL_OFFSET = 22; 
+ 
+    /** 左右padding值 */ 
+    private static final int PADDING = 0; 
+ 
+    /** 默认可见的item数目 */ 
+    private static final int DEF_VISIABLE_ITEMS = 3; 
+ 
+    /** 初始化wheeladpater */ 
+    private WheelAdapter adapter = null;
+ 
+    /** 当前item位置 */ 
+    private int currentItem = 0; 
+ 
+    /** item宽度 */ 
+    private int itemsWidth = 0; 
+ 
+    /** 标签宽度 */ 
+    private int labelWidth = 0; 
+ 
+    /** 可见item数目 */ 
+    private int visibleItems = DEF_VISIABLE_ITEMS; 
+ 
+    /** item高度 */ 
+    private int itemHeight = 0; 
+ 
+    /** item的字符串属性对象 */ 
+    private TextPaint itemsPaint;
+ 
+    /** value的字符串属性对象 */ 
+    private TextPaint valuePaint;
+    
+    /** 当前选中颜色 */
+    private int selectColor = VALUE_TEXT_COLOR;
+ 
+    // Layouts 
+    private StaticLayout itemsLayout, labelLayout, valueLayout;
+ 
+    private String label;
+    private Drawable centerDrawableTop;
+    private Drawable centerDrawableBottom;
+ 
+    /** 顶部渐变drawable对象 */ 
+    private GradientDrawable topShadow;
+ 
+    /** 顶部渐变drawable对象 */ 
+    private GradientDrawable bottomShadow;
+ 
+    /** 滚动动作是否执行 */ 
+    private boolean isScrollingPerformed; 
+ 
+    /** 滚动偏移量 */ 
+    private int scrollingOffset; 
+ 
+    /** 手势侦测对象 */ 
+    private GestureDetector gestureDetector;
+ 
+    private Scroller scroller;
+    private int lastScrollY; 
+ 
+    /** 是否可循环 */ 
+    private boolean isCyclic = false; 
+    
+    /** 实例化OnWheelChangedListener */ 
+	private List<OnWheelChangedListener> changingListeners = new LinkedList<OnWheelChangedListener>();
+	 /** 实例化OnWheelScrollListener */ 
+	private List<OnWheelScrollListener> scrollingListeners = new LinkedList<OnWheelScrollListener>();
+
+	/**
+	 * Constructor
+	 */
+	public WheelView(Context context, AttributeSet attrs, int defStyle) {
+		super(context, attrs, defStyle);
+		initData(context);
+	}
+
+	/**
+	 * Constructor
+	 */
+	public WheelView(Context context, AttributeSet attrs) {
+		super(context, attrs);
+		initData(context);
+	}
+
+	/**
+	 * Constructor
+	 */
+	public WheelView(Context context) {
+		super(context);
+		initData(context);
+	}
+
+	private void initData(Context context) {
+        gestureDetector = new GestureDetector(context, gestureListener);
+        gestureDetector.setIsLongpressEnabled(false);// 设置手势长按不起作用 
+ 
+        scroller = new Scroller(context);
+    } 
+ 
+    /** 
+     * 获取滚轮适配器 
+     *  
+     * @return 
+     */ 
+    public WheelAdapter getAdapter() { 
+        return adapter; 
+    } 
+ 
+    /** 
+     * 设置滚轮适配器 
+     *  
+     * @param adapter 
+     */ 
+    public void setAdapter(WheelAdapter adapter) { 
+        this.adapter = adapter; 
+        invalidateLayouts(); 
+        invalidate();// 是视图无效 
+ 
+    } 
+ 
+    /** 
+     * 设置指定的滚轮动画变化率 
+     *  
+     * @param interpolator 
+     */ 
+    public void setInterpolator(Interpolator interpolator) {
+        scroller.forceFinished(true); 
+        scroller = new Scroller(getContext(), interpolator);
+    } 
+ 
+    /** 
+     * 得到可见item的数目 
+     *  
+     * @return the count of visible items 
+     */ 
+    public int getVisibleItems() { 
+        return visibleItems; 
+    } 
+ 
+    /** 
+     * 设置可见item的数目 
+     *  
+     * @param count 
+     *            the new count 
+     */ 
+    public void setVisibleItems(int count) { 
+        visibleItems = count; 
+        invalidate(); 
+    } 
+ 
+    /** 
+     * 得到标签 
+     *  
+     * @return 
+     */ 
+    public String getLabel() {
+        return label; 
+    } 
+ 
+    /** 
+     * 设置标签 
+     *  
+     * @param newLabel 
+     */ 
+    public void setLabel(String newLabel) {
+        if (label == null || !label.equals(newLabel)) { 
+            label = newLabel; 
+            labelLayout = null; 
+            invalidate(); 
+        } 
+    } 
+ 
+    /** 
+     * 增加滚轮变化监听器 
+     *  
+     * @param listener 
+     */ 
+    public void addChangingListener(OnWheelChangedListener listener) { 
+        changingListeners.add(listener); 
+    } 
+ 
+    /** 
+     * 移除滚轮变化监听器 
+     *  
+     * @param listener 
+     */ 
+    public void removeChangingListener(OnWheelChangedListener listener) { 
+        changingListeners.remove(listener); 
+    } 
+ 
+    /** 
+     * 通知改变的监听器 
+     *  
+     * @param oldValue 
+     * @param newValue 
+     */ 
+    protected void notifyChangingListeners(int oldValue, int newValue) { 
+        for (OnWheelChangedListener listener : changingListeners) { 
+            listener.onChanged(this, oldValue, newValue); 
+        } 
+    } 
+ 
+    /** 
+     * 增加滚轮监听器 
+     *  
+     * @param listener 
+     *            the listener 
+     */ 
+    public void addScrollingListener(OnWheelScrollListener listener) { 
+        scrollingListeners.add(listener); 
+    } 
+ 
+    /** 
+     * 移除滚轮监听器 
+     *  
+     * @param listener 
+     *            the listener 
+     */ 
+    public void removeScrollingListener(OnWheelScrollListener listener) { 
+        scrollingListeners.remove(listener); 
+    } 
+ 
+    /** 
+     * 通知监听器开始滚动 
+     */ 
+    protected void notifyScrollingListenersAboutStart() { 
+        for (OnWheelScrollListener listener : scrollingListeners) { 
+            listener.onScrollingStarted(this); 
+        } 
+    } 
+ 
+    /** 
+     * 通知监听器结束滚动 
+     */ 
+    protected void notifyScrollingListenersAboutEnd() { 
+        for (OnWheelScrollListener listener : scrollingListeners) { 
+            listener.onScrollingFinished(this); 
+        } 
+    } 
+ 
+    /** 
+     * 取得当前item 
+     *  
+     * @return 
+     */ 
+    public int getCurrentItem() { 
+        return currentItem; 
+    } 
+ 
+    /** 
+     * 设置当前item 
+     * @param index 
+     * @param animated 
+     */ 
+    public void setCurrentItem(int index, boolean animated) { 
+        if (adapter == null || adapter.getItemsCount() == 0) { 
+            return; 
+        } 
+        if (index < 0 || index >= adapter.getItemsCount()) { 
+            if (isCyclic) { 
+                while (index < 0) { 
+                    index += adapter.getItemsCount(); 
+                } 
+                index %= adapter.getItemsCount(); 
+            } else { 
+                return; 
+            } 
+        } 
+        if (index != currentItem) { 
+            if (animated) { 
+                scroll(index - currentItem, SCROLLING_DURATION); 
+            } else { 
+                invalidateLayouts(); 
+ 
+                int old = currentItem; 
+                currentItem = index; 
+ 
+                notifyChangingListeners(old, currentItem); 
+                invalidate(); 
+            } 
+        } 
+    } 
+ 
+    /** 
+     * 设置当前item w/o 动画. 当index有误是不做任何响应. 
+     *  
+     * @param index 
+     *            the item index 
+     */ 
+    public void setCurrentItem(int index) { 
+        setCurrentItem(index, false); 
+    } 
+ 
+    /** 
+     * 测试滚轮是否可循环. 
+     *  
+     * @return true if wheel is cyclic 
+     */ 
+    public boolean isCyclic() { 
+        return isCyclic; 
+    } 
+ 
+    /** 
+     * 设置滚轮循环标志 
+     *  
+     * @param isCyclic 
+     *            the flag to set 
+     */ 
+    public void setCyclic(boolean isCyclic) { 
+        this.isCyclic = isCyclic; 
+ 
+        invalidate(); 
+        invalidateLayouts(); 
+    } 
+ 
+    /** 
+     * 使布局无效 
+     */ 
+    private void invalidateLayouts() { 
+        itemsLayout = null; 
+        valueLayout = null; 
+        scrollingOffset = 0; 
+    } 
+ 
+    /** 
+     * 初始化资源信息 
+     */ 
+	private void initResourceIfNecessary() { 
+        if (itemsPaint == null) { 
+            itemsPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG);
+            itemsPaint.setTextSize(TEXT_SIZE); 
+        } 
+ 
+        if (valuePaint == null) { 
+            valuePaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DITHER_FLAG);
+            // | Paint.FAKE_BOLD_TEXT_FLAG
+            valuePaint.setTextSize(TEXT_SIZE); 
+            valuePaint.setShadowLayer(0.1f, 0, 0.1f, 0xFFC0C0C0); 
+        } 
+ 
+        if (centerDrawableTop == null) { 
+        	centerDrawableTop = getContext().getResources().getDrawable(R.drawable.wheel_val);
+        } 
+        if (centerDrawableBottom == null) { 
+        	centerDrawableBottom = getContext().getResources().getDrawable(R.drawable.wheel_val); 
+        }
+ 
+        if (topShadow == null) { 
+            topShadow = new GradientDrawable(Orientation.TOP_BOTTOM,
+                    SHADOWS_COLORS); 
+        } 
+ 
+        if (bottomShadow == null) { 
+            bottomShadow = new GradientDrawable(Orientation.BOTTOM_TOP,
+                    SHADOWS_COLORS); 
+        } 
+ 
+//        setBackgroundResource(R.drawable.rectangle_shape); 
+    } 
+ 
+     
+    /** 
+     * 计算layout所需的高度 
+     * @param layout 
+     * @return 
+     */ 
+    private int getDesiredHeight(Layout layout) {
+        if (layout == null) { 
+            return 0; 
+        } 
+ 
+        int desired = getItemHeight() * visibleItems - ITEM_OFFSET * 2 
+                - ADDITIONAL_ITEM_HEIGHT; 
+         
+        desired = Math.max(desired,getSuggestedMinimumHeight());
+        return desired; 
+    } 
+     
+     
+    /** 
+     * 通过index得到text 
+     * @param index 
+     * @return 
+     */ 
+    private String getTextItem(int index){
+        if(adapter == null || adapter.getItemsCount() == 0){ 
+            return null; 
+        } 
+        int count = adapter.getItemsCount(); 
+        if((index < 0 || index >= count) && !isCyclic){ 
+            return null; 
+        }else{ 
+            while(index < 0){ 
+                index += count; 
+            } 
+        } 
+        index %= count; 
+        return adapter.getItem(index); 
+    } 
+     
+    /** 
+     * 根据当前值构建text 
+     *  
+     * @param useCurrentValue 
+     * @return the text 
+     */ 
+    private String buildText(boolean useCurrentValue) {
+        StringBuilder itemsText = new StringBuilder();
+        int addItems = visibleItems / 2 + 1; 
+ 
+        for (int i = currentItem - addItems; i <= currentItem + addItems; i++) { 
+            if (useCurrentValue || i != currentItem) { 
+                String text = getTextItem(i);
+                if (text != null) { 
+                    itemsText.append(text); 
+                } 
+            } 
+            if (i < currentItem + addItems) { 
+                itemsText.append("\n"); 
+            } 
+        } 
+         
+        return itemsText.toString(); 
+    } 
+ 
+    /** 
+     * 返回可以表示的item的最大长度 
+     * @return the max length 
+     */ 
+    private int getMaxTextLength() { 
+        WheelAdapter adapter = getAdapter(); 
+        if (adapter == null) { 
+            return 0; 
+        } 
+         
+        int adapterLength = adapter.getMaximumLength(); 
+        if (adapterLength > 0) { 
+            return adapterLength; 
+        } 
+ 
+        String maxText = null;
+        int addItems = visibleItems / 2; 
+        for (int i = Math.max(currentItem - addItems, 0);
+             i < Math.min(currentItem + visibleItems, adapter.getItemsCount()); i++) {
+            String text = adapter.getItem(i);
+            if (text != null && (maxText == null || maxText.length() < text.length())) { 
+                maxText = text; 
+            } 
+        } 
+ 
+        return maxText != null ? maxText.length() : 0; 
+    } 
+ 
+    /** 
+     * 返回滚轮item的高度 
+     * @return the item height 
+     */ 
+    private int getItemHeight() { 
+        if (itemHeight != 0) { 
+            return itemHeight; 
+        } else if (itemsLayout != null && itemsLayout.getLineCount() > 2) { 
+            itemHeight = itemsLayout.getLineTop(2) - itemsLayout.getLineTop(1); 
+            return itemHeight; 
+        } 
+         
+        return getHeight() / visibleItems; 
+    } 
+ 
+    /** 
+     * 计算控制宽度和创建text布局 
+     * @param widthSize the input layout width 
+     * @param mode the layout mode 
+     * @return the calculated control width 
+     */ 
+    private int calculateLayoutWidth(int widthSize, int mode) { 
+        initResourceIfNecessary(); 
+ 
+        int width = widthSize; 
+ 
+        int maxLength = getMaxTextLength(); 
+        if (maxLength > 0) { 
+            float textWidth = (float) Math.ceil(Layout.getDesiredWidth("0", itemsPaint));
+            itemsWidth = (int) (maxLength * textWidth); 
+        } else { 
+            itemsWidth = 0; 
+        } 
+        itemsWidth += ADDITIONAL_ITEMS_SPACE; // make it some more 
+ 
+        labelWidth = 0; 
+        if (label != null && label.length() > 0) { 
+            labelWidth = (int) Math.ceil(Layout.getDesiredWidth(label, valuePaint));
+        } 
+ 
+        boolean recalculate = false; 
+        if (mode == MeasureSpec.EXACTLY) {
+            width = widthSize; 
+            recalculate = true; 
+        } else { 
+            width = itemsWidth + labelWidth + 2 * PADDING; 
+            if (labelWidth > 0) { 
+                width += LABEL_OFFSET; 
+            } 
+ 
+            // Check against our minimum width 
+            width = Math.max(width, getSuggestedMinimumWidth());
+ 
+            if (mode == MeasureSpec.AT_MOST && widthSize < width) {
+                width = widthSize; 
+                recalculate = true; 
+            } 
+        } 
+ 
+        if (recalculate) { 
+            // recalculate width 
+            int pureWidth = width - LABEL_OFFSET - 2 * PADDING; 
+            if (pureWidth <= 0) { 
+                itemsWidth = labelWidth = 0; 
+            } 
+            if (labelWidth > 0) { 
+                double newWidthItems = (double) itemsWidth * pureWidth 
+                        / (itemsWidth + labelWidth); 
+                itemsWidth = (int) newWidthItems; 
+                labelWidth = pureWidth - itemsWidth; 
+            } else { 
+                itemsWidth = pureWidth + LABEL_OFFSET; // no label 
+            } 
+        } 
+ 
+        if (itemsWidth > 0) { 
+            createLayouts(itemsWidth, labelWidth); 
+        } 
+ 
+        return width; 
+    } 
+ 
+    /** 
+     * 创建布局 
+     * @param widthItems width of items layout 
+     * @param widthLabel width of label layout 
+     */ 
+    private void createLayouts(int widthItems, int widthLabel) { 
+        if (itemsLayout == null || itemsLayout.getWidth() > widthItems) { 
+            itemsLayout = new StaticLayout(buildText(isScrollingPerformed), itemsPaint, widthItems,
+                    widthLabel > 0 ? Layout.Alignment.ALIGN_OPPOSITE : Layout.Alignment.ALIGN_CENTER,
+                    1, ADDITIONAL_ITEM_HEIGHT, false); 
+        } else { 
+            itemsLayout.increaseWidthTo(widthItems); 
+        } 
+ 
+        if (!isScrollingPerformed && (valueLayout == null || valueLayout.getWidth() > widthItems)) { 
+            String text = getAdapter() != null ? getAdapter().getItem(currentItem) : null;
+            valueLayout = new StaticLayout(text != null ? text : "",
+                    valuePaint, widthItems, widthLabel > 0 ? 
+                            Layout.Alignment.ALIGN_OPPOSITE : Layout.Alignment.ALIGN_CENTER,
+                            1, ADDITIONAL_ITEM_HEIGHT, false); 
+        } else if (isScrollingPerformed) { 
+            valueLayout = null; 
+        } else { 
+            valueLayout.increaseWidthTo(widthItems); 
+        } 
+ 
+        if (widthLabel > 0) { 
+            if (labelLayout == null || labelLayout.getWidth() > widthLabel) { 
+                labelLayout = new StaticLayout(label, valuePaint,
+                        widthLabel, Layout.Alignment.ALIGN_NORMAL, 1,
+                        ADDITIONAL_ITEM_HEIGHT, false); 
+            } else { 
+                labelLayout.increaseWidthTo(widthLabel); 
+            } 
+        } 
+    } 
+ 
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { 
+        int widthMode = MeasureSpec.getMode(widthMeasureSpec);
+        int heightMode = MeasureSpec.getMode(heightMeasureSpec);
+        int widthSize = MeasureSpec.getSize(widthMeasureSpec);
+        int heightSize = MeasureSpec.getSize(heightMeasureSpec);
+ 
+        int width = calculateLayoutWidth(widthSize, widthMode); 
+ 
+        int height; 
+        if (heightMode == MeasureSpec.EXACTLY) {
+            height = heightSize; 
+        } else { 
+            height = getDesiredHeight(itemsLayout); 
+ 
+            if (heightMode == MeasureSpec.AT_MOST) {
+                height = Math.min(height, heightSize);
+            } 
+        } 
+ 
+        setMeasuredDimension(width, height); 
+    } 
+ 
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas); 
+         
+        if (itemsLayout == null) { 
+            if (itemsWidth == 0) { 
+                calculateLayoutWidth(getWidth(), MeasureSpec.EXACTLY);
+            } else { 
+                createLayouts(itemsWidth, labelWidth); 
+            } 
+        } 
+ 
+//        drawCenterRect(canvas);
+        if (itemsWidth > 0) { 
+            canvas.save(); 
+            // Skip padding space and hide a part of top and bottom items 
+            canvas.translate(PADDING, -ITEM_OFFSET); 
+            drawItems(canvas); 
+            drawValue(canvas); 
+            canvas.restore(); 
+        } 
+ 
+//        drawShadows(canvas); 
+    } 
+ 
+    /** 
+     * 在顶部和底部画阴影的控制 
+     * @param canvas the canvas for drawing 
+     */ 
+    private void drawShadows(Canvas canvas) {
+        topShadow.setBounds(0, 0, getWidth(), getHeight() / visibleItems); 
+        topShadow.draw(canvas); 
+ 
+        bottomShadow.setBounds(0, getHeight() - getHeight() / visibleItems, 
+                getWidth(), getHeight()); 
+        bottomShadow.draw(canvas); 
+    } 
+ 
+    /** 
+     * 画value和标签的布局 
+     * @param canvas the canvas for drawing 
+     */ 
+    private void drawValue(Canvas canvas) {
+        valuePaint.setColor(selectColor); 
+        valuePaint.drawableState = getDrawableState(); 
+ 
+        Rect bounds = new Rect();
+        itemsLayout.getLineBounds(visibleItems / 2, bounds); 
+ 
+        // draw label 
+        if (labelLayout != null) { 
+            canvas.save(); 
+            canvas.translate(itemsLayout.getWidth() + LABEL_OFFSET, bounds.top); 
+            labelLayout.draw(canvas); 
+            canvas.restore(); 
+        } 
+ 
+        // draw current value 
+        if (valueLayout != null) { 
+            canvas.save(); 
+            canvas.translate(0, bounds.top + scrollingOffset); 
+            valueLayout.draw(canvas); 
+            canvas.restore(); 
+        } 
+    } 
+ 
+    /** 
+     * 画items 
+     * @param canvas the canvas for drawing 
+     */ 
+    private void drawItems(Canvas canvas) {
+        canvas.save(); 
+         
+        int top = itemsLayout.getLineTop(1); 
+        canvas.translate(0, - top + scrollingOffset); 
+         
+        itemsPaint.setColor(ITEMS_TEXT_COLOR); 
+        itemsPaint.drawableState = getDrawableState(); 
+        itemsLayout.draw(canvas); 
+         
+        canvas.restore(); 
+    } 
+ 
+    /** 
+     * 画当前值的矩形 
+     * @param canvas the canvas for drawing 
+     */ 
+    private void drawCenterRect(Canvas canvas) {
+        int center = getHeight() / 2; 
+        int offset = getItemHeight() / 2; 
+       /* centerDrawableTop.setBounds(0, center - offset, getWidth(), center - offset + 3); 
+        centerDrawableTop.draw(canvas);  
+        centerDrawableBottom.setBounds(0, center + offset - 3, getWidth(), center + offset); 
+        centerDrawableBottom.draw(canvas); */
+        centerDrawableTop.setBounds(0, center - offset, getWidth(), center + offset); 
+        centerDrawableTop.draw(canvas);  
+    } 
+ 
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        WheelAdapter adapter = getAdapter(); 
+        if (adapter == null) { 
+            return true; 
+        } 
+         
+            if (!gestureDetector.onTouchEvent(event) && event.getAction() == MotionEvent.ACTION_UP) {
+            justify(); 
+        } 
+        return true; 
+    } 
+     
+    /** 
+     * 滚动滚轮 
+     * @param delta the scrolling value 
+     */ 
+    private void doScroll(int delta) { 
+        scrollingOffset += delta; 
+         
+        int count = scrollingOffset / getItemHeight(); 
+        int pos = currentItem - count; 
+        if (isCyclic && adapter.getItemsCount() > 0) { 
+            // fix position by rotating 
+            while (pos < 0) { 
+                pos += adapter.getItemsCount(); 
+            } 
+            pos %= adapter.getItemsCount(); 
+        } else if (isScrollingPerformed) { 
+            //  
+            if (pos < 0) { 
+                count = currentItem; 
+                pos = 0; 
+            } else if (pos >= adapter.getItemsCount()) { 
+                count = currentItem - adapter.getItemsCount() + 1; 
+                pos = adapter.getItemsCount() - 1; 
+            } 
+        } else { 
+            // fix position 
+            pos = Math.max(pos, 0);
+            pos = Math.min(pos, adapter.getItemsCount() - 1);
+        } 
+         
+        int offset = scrollingOffset; 
+        if (pos != currentItem) { 
+            setCurrentItem(pos, false); 
+        } else { 
+            invalidate(); 
+        } 
+         
+        // update offset 
+        scrollingOffset = offset - count * getItemHeight(); 
+        if (scrollingOffset > getHeight()) { 
+            scrollingOffset = scrollingOffset % getHeight() + getHeight(); 
+        } 
+    } 
+     
+    // gesture listener 
+    private SimpleOnGestureListener gestureListener = new SimpleOnGestureListener() {
+        public boolean onDown(MotionEvent e) {
+            if (isScrollingPerformed) { 
+                scroller.forceFinished(true); 
+                clearMessages(); 
+                return true; 
+            } 
+            return false; 
+        } 
+         
+        public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
+            startScrolling(); 
+            doScroll((int)-distanceY); 
+            return true; 
+        } 
+         
+        public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
+            lastScrollY = currentItem * getItemHeight() + scrollingOffset; 
+            int maxY = isCyclic ? 0x7FFFFFFF : adapter.getItemsCount() * getItemHeight(); 
+            int minY = isCyclic ? -maxY : 0; 
+            scroller.fling(0, lastScrollY, 0, (int) -velocityY / 2, 0, 0, minY, maxY); 
+            setNextMessage(MESSAGE_SCROLL); 
+            return true; 
+        } 
+    }; 
+ 
+ 
+    // Messages 
+    private final int MESSAGE_SCROLL = 0; 
+    private final int MESSAGE_JUSTIFY = 1; 
+     
+    /** 
+     * Set next message to queue. Clears queue before. 
+     *  
+     * @param message the message to set 
+     */ 
+    private void setNextMessage(int message) { 
+        clearMessages(); 
+        animationHandler.sendEmptyMessage(message); 
+    } 
+ 
+    /** 
+     * Clears messages from queue 
+     */ 
+    private void clearMessages() { 
+        animationHandler.removeMessages(MESSAGE_SCROLL); 
+        animationHandler.removeMessages(MESSAGE_JUSTIFY); 
+    } 
+     
+    // animation handler 
+    private Handler animationHandler = new Handler() {
+        public void handleMessage(Message msg) {
+            scroller.computeScrollOffset(); 
+            int currY = scroller.getCurrY(); 
+            int delta = lastScrollY - currY; 
+            lastScrollY = currY; 
+            if (delta != 0) { 
+                doScroll(delta); 
+            } 
+             
+            // scrolling is not finished when it comes to final Y 
+            // so, finish it manually  
+            if (Math.abs(currY - scroller.getFinalY()) < MIN_DELTA_FOR_SCROLLING) {
+                currY = scroller.getFinalY(); 
+                scroller.forceFinished(true); 
+            } 
+            if (!scroller.isFinished()) { 
+                animationHandler.sendEmptyMessage(msg.what); 
+            } else if (msg.what == MESSAGE_SCROLL) { 
+                justify(); 
+            } else { 
+                finishScrolling(); 
+            } 
+        } 
+    }; 
+     
+    /** 
+     * Justifies wheel 
+     */ 
+    private void justify() { 
+        if (adapter == null) { 
+            return; 
+        } 
+         
+        lastScrollY = 0; 
+        int offset = scrollingOffset; 
+        int itemHeight = getItemHeight(); 
+        boolean needToIncrease = offset > 0 ? currentItem < adapter.getItemsCount() : currentItem > 0;  
+        if ((isCyclic || needToIncrease) && Math.abs((float) offset) > (float) itemHeight / 2) {
+            if (offset < 0) 
+                offset += itemHeight + MIN_DELTA_FOR_SCROLLING; 
+            else 
+                offset -= itemHeight + MIN_DELTA_FOR_SCROLLING; 
+        } 
+        if (Math.abs(offset) > MIN_DELTA_FOR_SCROLLING) {
+            scroller.startScroll(0, 0, 0, offset, SCROLLING_DURATION); 
+            setNextMessage(MESSAGE_JUSTIFY); 
+        } else { 
+            finishScrolling(); 
+        } 
+    } 
+     
+    /** 
+     * 开始滚动 
+     */ 
+    private void startScrolling() { 
+        if (!isScrollingPerformed) { 
+            isScrollingPerformed = true; 
+            notifyScrollingListenersAboutStart(); 
+        } 
+    } 
+ 
+    /** 
+     * 停止滚动 
+     */ 
+    void finishScrolling() { 
+        if (isScrollingPerformed) { 
+            notifyScrollingListenersAboutEnd(); 
+            isScrollingPerformed = false; 
+        } 
+        invalidateLayouts(); 
+        invalidate(); 
+    } 
+ 
+    public void scroll(int itemsToScroll, int time) { 
+        scroller.forceFinished(true); 
+ 
+        lastScrollY = scrollingOffset; 
+ 
+        int offset = itemsToScroll * getItemHeight(); 
+ 
+        scroller.startScroll(0, lastScrollY, 0, offset - lastScrollY, time); 
+        setNextMessage(MESSAGE_SCROLL); 
+ 
+        startScrolling(); 
+    }
+
+	/**
+	 * <li>  </li>
+	 * @param selectColor the selectColor to set
+	 */
+	public void setSelectColor(int selectColor) {
+		this.selectColor = selectColor;
+	}
+    
+    
+
+}

app/src/main/java/com/quansu/heifengwuliu/utils/net/ApiService.kt

@@ -636,6 +636,32 @@ interface ApiService {
     suspend fun infoList(@Query("p") p: Int): Resp<List<OrderEva>>
 
 
+    /**
+     * 可开发票金额
+     * @return
+     */
+    @GET("api/invoice/invoiceTotal")
+    suspend fun invoiceTotal(@Query("time") time: String,@Query("p") p: Int): Resp<Any>
+
+
+    /**
+     * 获取验证码-忘记密码发送短信
+     *
+     * @return
+     */
+    @POST("api/index/getPassword")
+    @FormUrlEncoded
+    suspend fun getPassword(@Field("mobile") mobile: String?): Resp<Any>
+
+
+
+    /**
+     * 重置密码
+     * @return
+     */
+    @POST("api/index/setPassword")
+    @FormUrlEncoded
+    suspend  fun setPassword(@Field("newPw") newPw: String?, @Field("code") code: String?): Resp<Any>
 
 
 

app/src/main/java/com/quansu/heifengwuliu/vmodel/AccountAnalysisVModel.kt

@@ -1,6 +1,10 @@
 package com.quansu.heifengwuliu.vmodel
 
 import android.app.Application
+import androidx.lifecycle.MutableLiveData
+import com.quansu.heifengwuliu.inte.ChoiceData
+import com.quansu.heifengwuliu.model.AmountCount
+import com.quansu.heifengwuliu.utils.dialog.ChoseTimeDialog
 import com.ysnows.base.base.BRepository
 import com.ysnows.base.base.BViewModel
 
@@ -9,4 +13,20 @@ import com.ysnows.base.base.BViewModel
  *on 2020/9/25
  */
 class AccountAnalysisVModel(application: Application) : BViewModel<BRepository>(application) {
+
+
+    val timeData: MutableLiveData<String> = MutableLiveData<String>()
+
+
+    fun  choseTime(){//选择时间
+
+        ChoseTimeDialog.choseTime(repository().context!!,object: ChoiceData {
+            override fun onRestuse(time: String?) {
+                timeData.value=time
+            }
+        })
+
+    }
+
+
 }

app/src/main/java/com/quansu/heifengwuliu/vmodel/AccountBillVModel.kt

@@ -34,7 +34,7 @@ class AccountBillVModel(application: Application) : BRViewModel<BRRepository>(ap
 
     fun getAmountCount() {
 
-        repository().rxLreq(NetEngine.service.amountCount())
+        repository().rxPreq(NetEngine.service.amountCount())
                 .doOnNext {
                     if (it.ok(false)) {
                         var bean = it.data() as AmountCount

app/src/main/java/com/quansu/heifengwuliu/vmodel/EvaluateVModel.kt

@@ -6,7 +6,9 @@ import android.content.Intent
 import android.text.TextUtils
 import androidx.databinding.Bindable
 import androidx.lifecycle.MutableLiveData
+import com.hwangjr.rxbus.RxBus
 import com.quansu.heifengwuliu.BR
+import com.quansu.heifengwuliu.config.ConfigRx
 import com.quansu.heifengwuliu.utils.net.NetEngine
 import com.ysnows.base.base.BRepository
 import com.ysnows.base.base.BViewModel
@@ -59,6 +61,8 @@ class EvaluateVModel(application: Application) : BViewModel<BRepository>(applica
                 .doOnNext {
                     if (it.ok(true)) {
 
+                        RxBus.get().post(ConfigRx.REFRESH_LIST, "")
+
                         val intent = Intent()
                         var con = repository().context as Activity
                         con.setResult(Activity.RESULT_OK, intent)

app/src/main/java/com/quansu/heifengwuliu/vmodel/ForgetPasswordVModel.kt

@@ -2,21 +2,36 @@ package com.quansu.heifengwuliu.vmodel
 
 import android.app.Activity
 import android.app.Application
-import android.content.Intent
 import android.text.TextUtils
 import androidx.databinding.Bindable
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.viewModelScope
 import com.quansu.heifengwuliu.BR
-import com.quansu.heifengwuliu.model.BankCard
-import com.quansu.heifengwuliu.model.InfoBean
-import com.quansu.heifengwuliu.utils.ChosePhotoUtils
+import com.quansu.heifengwuliu.R
+import com.quansu.heifengwuliu.config.ConfigMMKV
 import com.quansu.heifengwuliu.utils.net.NetEngine
 import com.ysnows.base.base.BRepository
 import com.ysnows.base.base.BViewModel
+import com.ysnows.base.utils.MMKVManager
+import io.reactivex.Observable
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.disposables.Disposable
+import io.reactivex.schedulers.Schedulers
+import kotlinx.coroutines.launch
+import java.util.concurrent.TimeUnit
 
 class ForgetPasswordVModel(application: Application) : BViewModel<BRepository>(application) {
 
-   // var image: MutableLiveData<String> = MutableLiveData("")
-   var image=""
+    var codeTip: MutableLiveData<String> = MutableLiveData(getCodeStr)
+    private var disposable: Disposable? = null
+
+
+    companion object {
+        const val time = 60
+        var timeStart: Long = 1
+        const val getCodeStr = "获取验证码"
+
+    }
 
     @Bindable
     var phone: String? = null
@@ -47,46 +62,95 @@ class ForgetPasswordVModel(application: Application) : BViewModel<BRepository>(a
         }
 
 
-
-    fun toSubmit(){
-        if(TextUtils.isEmpty(phone)){
+    fun toSubmit() {
+        if (TextUtils.isEmpty(phone)) {
             toast("请输入手机号")
             return
         }
 
-        if(TextUtils.isEmpty(code)){
+        if (TextUtils.isEmpty(code)) {
             toast("请输入验证码")
             return
         }
-        if(TextUtils.isEmpty(passWord)){
+        if (TextUtils.isEmpty(passWord)) {
             toast("请输入登录密码")
             return
         }
 
-        if(TextUtils.isEmpty(passWordTo)){
+        if (TextUtils.isEmpty(passWordTo)) {
             toast("请再次输入登录密码")
             return
         }
 
-        if(!passWord.equals(passWordTo)){
+        if (!passWord.equals(passWordTo)) {
             toast("两次登录密码不一致")
             return
         }
 
-//        repository().rxLreq(NetEngine.service.setCardBank(name, number,bank,kbank, image))
-//                .doOnNext {
-//                    if (it.ok(true)) {
-//                        var con = repository().context as Activity
-//                        con.setResult(Activity.RESULT_OK, Intent())
-//                        con.finish()
-//                    }
-//                }
-//                .subscribe()
+        viewModelScope.launch {
+
+
+            val it = repository().lreq { NetEngine.service.setPassword(passWord, code) }
+            if (it.ok(true)) {
+                var con = repository().context as Activity
+                con.finish()
+            }
+
+        }
+
+
+    }
+
+
+    fun getSmsCode(start: Long = 1) {
+        if (codeTip.value != getCodeStr) {
+            return
+        }
+
+        if (phone.isNullOrEmpty()) {
+            toast(R.string.please_input_user_phone)
+            return
+        }
+
+        viewModelScope.launch {
+
+            val it = repository().lreq { NetEngine.service.getPassword(phone) }
+            if (it.ok(true)) {
+                startTimer(start)
+            }
+
+        }
 
     }
 
+    private fun startTimer(start: Long = 1) {
+        disposeTimer()
+        disposable = Observable.intervalRange(start, time - start + 1, 0, 1, TimeUnit.SECONDS)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .doOnNext {
+                    timeStart = it
+                    codeTip.value = if (time - it > 0) "${time - it}秒后重发" else {
+                        getCodeStr
+                    }
+                }
+                .doOnComplete() {
+                    MMKVManager.instance().encode(ConfigMMKV.REGISTER_TIME_START, 60)
+                }
+                .doOnDispose() {
+                    MMKVManager.instance().encode(ConfigMMKV.REGISTER_TIME_START, 60)
+                }
+                .subscribe()
+    }
 
+    private fun disposeTimer() {
+        disposable?.isDisposed ?: disposable?.dispose()
+    }
 
+    override fun onCleared() {
+        super.onCleared()
+        disposeTimer()
+    }
 
 
 }

app/src/main/java/com/quansu/heifengwuliu/vmodel/GrabDetailsVModel.kt

@@ -6,17 +6,23 @@ import android.app.Activity
 import android.app.Application
 import android.content.Intent
 import android.net.Uri
+import android.os.Bundle
 import android.text.TextUtils
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
+import com.hwangjr.rxbus.RxBus
 import com.qmuiteam.qmui.widget.dialog.QMUIDialog
 import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction
+import com.quansu.heifengwuliu.activity.WaybillDetailsActivity
+import com.quansu.heifengwuliu.config.ConfigRx
+import com.quansu.heifengwuliu.config.MIntentAction
 import com.quansu.heifengwuliu.model.DataInfoBean
 import com.quansu.heifengwuliu.utils.net.NetEngine
 import com.yanzhenjie.permission.Action
 import com.yanzhenjie.permission.AndPermission
 import com.ysnows.base.base.BRepository
 import com.ysnows.base.base.BViewModel
+import com.ysnows.base.utils.UiSwitch
 import kotlinx.coroutines.launch
 
 /**
@@ -92,11 +98,23 @@ open class GrabDetailsVModel(application: Application) : BViewModel<BRepository>
         repository().rxLreq(NetEngine.service.getInfoDriver(info_id))
                 .doOnNext() {
                     if (it.ok(true)) {
+
                         val intent = Intent()
                         var con = repository().context as Activity
                         con.setResult(Activity.RESULT_OK, intent)
                         con.finish()
 
+//                        RxBus.get().post(ConfigRx.REFRESH_LIST, "")
+//
+//                        //跳转到详情
+//                        UiSwitch.bundle(repository().context, WaybillDetailsActivity::class.java, Bundle().apply {
+//                            putString("order_id", order_id)
+//                            putInt("type", 2)
+//                        })
+//
+//                        var con = repository().context as Activity
+//                        con.finish()
+
                     }
                 }
                 .subscribe()

app/src/main/java/com/quansu/heifengwuliu/vmodel/IndexVModel.kt

@@ -2,6 +2,8 @@ package com.quansu.heifengwuliu.vmodel
 
 import android.app.Application
 import android.os.Bundle
+import androidx.databinding.Bindable
+import com.quansu.heifengwuliu.BR
 import com.quansu.heifengwuliu.activity.GrabDetailsActivity
 import com.quansu.heifengwuliu.config.MIntentAction
 import com.quansu.heifengwuliu.fragment.IndexFragment
@@ -16,6 +18,15 @@ class IndexVModel(application: Application) : BRViewModel<BRRepository>(applicat
 
     var indexframent: IndexFragment? = null
 
+
+
+    @Bindable
+    var k: String? = null
+        set(value) {
+            field = value
+            notifyPropertyChanged(BR.k)
+        }
+
     fun setFragment(indexframent: IndexFragment) {
         this.indexframent = indexframent
     }
@@ -31,7 +42,7 @@ class IndexVModel(application: Application) : BRViewModel<BRRepository>(applicat
     }
 
     override fun apiFunc(): suspend () -> IResp<*> {
-        return { NetEngine.service.infoListDriver("", repository().page) }
+        return { NetEngine.service.infoListDriver(k, repository().page) }
     }
 
 

app/src/main/java/com/quansu/heifengwuliu/vmodel/InvoiceVModel.kt

@@ -4,6 +4,7 @@ import android.app.Activity
 import android.app.Application
 import android.app.UiAutomation
 import android.graphics.Color
+import androidx.lifecycle.viewModelScope
 import com.quansu.heifengwuliu.activity.InvoiceListActivity
 import com.quansu.heifengwuliu.utils.net.NetEngine
 import com.ysnows.base.base.BRRepository
@@ -11,9 +12,11 @@ import com.ysnows.base.base.BRViewModel
 import com.ysnows.base.net.IResp
 import com.ysnows.base.utils.UiSwitch
 import io.reactivex.Observable
+import kotlinx.coroutines.launch
 
 class InvoiceVModel(application: Application) : BRViewModel<BRRepository>(application) {
 
+    var time=""
 
     //state：1：开票中 2通过（已邮寄） 3系统拒绝  9取消
     fun getInvoiceStatus(status: Int): String {
@@ -50,5 +53,15 @@ class InvoiceVModel(application: Application) : BRViewModel<BRRepository>(applic
 
     }
 
+    fun getInfo(){//可开票金额
+
+        viewModelScope.launch {
+
+            repository().preq { NetEngine.service.invoiceTotal(time,repository().page) }
+        }
+
+
+    }
+
 
 }

app/src/main/java/com/quansu/heifengwuliu/vmodel/OwnerMoreVModel.kt

@@ -150,6 +150,28 @@ open class OwnerMoreVModel(application: Application) : BViewModel<BRepository>(a
         return if(TextUtils.isEmpty(text)) "" else text
     }
 
+    fun locationMap() {
+        //定位到当前位置
+        AndPermission.with(repository().context)
+                .runtime()
+                .permission(Permission.ACCESS_COARSE_LOCATION,
+                        Permission.ACCESS_FINE_LOCATION,
+                        Permission.WRITE_EXTERNAL_STORAGE,
+                        Permission.READ_EXTERNAL_STORAGE,
+                        Permission.READ_PHONE_STATE
+                )
+                .onGranted { data ->
+                    CCRetrofit.instance()
+                            .with(repository().context)
+                            .create(IGaode::class.java)
+                            .currentLocation()
+                            .subscribe()
+
+                }
+                .start()
+    }
+
+
 
 
 }

app/src/main/java/com/quansu/heifengwuliu/vmodel/OwnerSingleVModel.kt

@@ -7,8 +7,12 @@ import com.quansu.heifengwuliu.activity.SourceDetailsActivity
 import com.quansu.heifengwuliu.model.DataInfoBean
 import com.quansu.heifengwuliu.model.InfoEditBean
 import com.quansu.heifengwuliu.utils.net.NetEngine
+import com.yanzhenjie.permission.AndPermission
+import com.yanzhenjie.permission.runtime.Permission
 import com.ysnows.base.base.BRepository
 import com.ysnows.base.base.BViewModel
+import com.ysnows.base.ccretrofit.CCRetrofit
+import com.ysnows.base.route.IGaode
 import com.ysnows.base.utils.UiSwitch
 
 
@@ -95,6 +99,27 @@ open class OwnerSingleVModel(application: Application) : BViewModel<BRepository>
 
     }
 
+     fun locationMap() {
+        //定位到当前位置
+        AndPermission.with(repository().context)
+                .runtime()
+                .permission(Permission.ACCESS_COARSE_LOCATION,
+                        Permission.ACCESS_FINE_LOCATION,
+                        Permission.WRITE_EXTERNAL_STORAGE,
+                        Permission.READ_EXTERNAL_STORAGE,
+                        Permission.READ_PHONE_STATE
+                )
+                .onGranted { data ->
+                    CCRetrofit.instance()
+                            .with(repository().context)
+                            .create(IGaode::class.java)
+                            .currentLocation()
+                            .subscribe()
+
+                }
+                .start()
+    }
+
 
 
 

app/src/main/java/com/quansu/heifengwuliu/vmodel/WaybillDetailsVModel.kt

@@ -16,6 +16,7 @@ import android.widget.ImageView
 import android.widget.LinearLayout
 import androidx.databinding.Bindable
 import androidx.lifecycle.MutableLiveData
+import com.hwangjr.rxbus.RxBus
 import com.qmuiteam.qmui.layout.QMUIFrameLayout
 import com.qmuiteam.qmui.skin.QMUISkinValueBuilder
 import com.qmuiteam.qmui.util.QMUIDisplayHelper
@@ -28,6 +29,7 @@ import com.quansu.heifengwuliu.BR
 import com.quansu.heifengwuliu.R
 import com.quansu.heifengwuliu.activity.EachOtherActivity
 import com.quansu.heifengwuliu.activity.EvaluateActivity
+import com.quansu.heifengwuliu.config.ConfigRx
 import com.quansu.heifengwuliu.config.MIntentAction
 import com.quansu.heifengwuliu.model.WaybillDetails
 import com.quansu.heifengwuliu.utils.ChosePhotoUtils
@@ -221,7 +223,7 @@ open class WaybillDetailsVModel(application: Application) : BViewModel<BReposito
                         .show()
                 return
             }
-            if (order_state == 20) {//已完成
+            if (order_state == 20) {//运输中--已完成
 
                 isDialogShow.value = true
                 number = ""
@@ -262,6 +264,8 @@ open class WaybillDetailsVModel(application: Application) : BViewModel<BReposito
         repository().rxLreq(NetEngine.service.setStatus(map))
                 .doOnNext() {
                     if (it.ok()) {
+                        RxBus.get().post(ConfigRx.REFRESH_LIST, "")
+
                         order_state = 20//变成运输中
                         tvTitle.value = "已送达"
                     }
@@ -325,6 +329,8 @@ open class WaybillDetailsVModel(application: Application) : BViewModel<BReposito
             repository().rxLreq(NetEngine.service.setStatus(map))
                     .doOnNext() {
                         if (it.ok(true)) {
+                            RxBus.get().post(ConfigRx.REFRESH_LIST, "")
+
                             order_state = 30//变成待结算
                             tvTitle.value = ""
                             isDialogShow.value = false
@@ -457,6 +463,9 @@ open class WaybillDetailsVModel(application: Application) : BViewModel<BReposito
         repository().rxLreq(NetEngine.service.carPay(money, order_id, pay_pwd))
                 .doOnNext() {
                     if (it.ok(true)) {
+
+                        RxBus.get().post(ConfigRx.REFRESH_LIST, "")
+
                         order_state = 40
                         tvTitle.value = "待评价"
                     }

app/src/main/java/com/quansu/heifengwuliu/widget/ShipmentHeadView.kt

@@ -92,14 +92,19 @@ class ShipmentHeadView(context: Context, attrs: AttributeSet) :BaseLinearLayout(
         //设置tab
         binding!!.tabs.setIndicator(QMUITabIndicator(QMUIDisplayHelper.dp2px(context, 2), false, true))
         val space: Int = QMUIDisplayHelper.dp2px(context, 20)
+
+        binding!!.tabs.setItemSpaceInScrollMode(space)
         binding!!.tabs.setPadding(space, 0, space, 0)
         binding!!.tabs.mode = QMUITabSegment.MODE_SCROLLABLE
+        binding!!.tabs.right=space
+
 //        val space: Int = QMUIDisplayHelper.dp2px(context, 16)
 //        binding.tabs.mode = QMUITabSegment.MODE_SCROLLABLE //MODE_SCROLLABLE 自适应宽度+滚动   MODE_FIXED  均分
 //        binding.tabs.setItemSpaceInScrollMode(space)
 //        binding.tabs.setupWithViewPager(binding.qmViewPager, false)
 //        binding.tabs.setPadding(space, 0, space, 0)
 //
+        val size: Int = QMUIDisplayHelper.dp2px(context, 17)
 
         val builder = binding!!.tabs.tabBuilder()
         builder
@@ -107,6 +112,7 @@ class ShipmentHeadView(context: Context, attrs: AttributeSet) :BaseLinearLayout(
                 .setSelectColor(Color.parseColor("#FFBC00"))
                 .setNormalColor(Color.parseColor("#5E5F60"))
                 .setTypeface(Typeface.DEFAULT_BOLD, Typeface.DEFAULT)
+                .setTextSize(size,size)
                 .setDynamicChangeIconColor(false)
 
         val tabs = ArrayList<QMUITab>()

app/src/main/res/anim/popwindow_enter.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="200"
+        android:fromYDelta="100%"
+        android:toYDelta="0" />
+</set>

app/src/main/res/anim/popwindow_exit.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="200"
+        android:fromYDelta="0"
+        android:toYDelta="100%" />
+</set>

app/src/main/res/drawable/bg_but_left.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+android:shape="rectangle" >
+
+<!-- 填充的颜色-->
+
+    <solid android:color="#ED6B3C" />
+
+    <corners
+        android:topLeftRadius="25dp"
+        android:bottomLeftRadius="25dp"
+       >
+    </corners>
+
+</shape >

app/src/main/res/drawable/bg_but_right.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+android:shape="rectangle" >
+
+<!-- 填充的颜色-->
+
+    <solid android:color="#F4B53F" />
+
+    <corners
+        android:topRightRadius="25dp"
+        android:bottomRightRadius="25dp"
+       >
+    </corners>
+
+</shape >

app/src/main/res/drawable/wheel_val.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Android Wheel Control.
+    http://android-devblog.blogspot.com/2010/05/wheel-ui-contol.html
+   
+    Copyright 2010 Yuri Kanivets
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <gradient
+        android:angle="90"
+        android:centerColor="@color/whell_item_bg_select"
+        android:endColor="@color/whell_item_bg_select"
+        android:startColor="@color/whell_item_bg_select" />
+
+    <stroke
+        android:width="0.01dp"
+        android:color="@color/whell_item_bg_select" />
+</shape>

app/src/main/res/layout/activity_evaluate.xml

@@ -90,9 +90,10 @@
                 <com.ysnows.base.widget.DelEditText
                     android:id="@+id/edt_name"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
                     android:background="@color/white"
                     android:hint="评价本次订单的满意度"
+                    android:gravity="top"
                     android:paddingStart="@dimen/dp_4"
                     android:text="@={vm.name}"
                     android:textColor="@color/text_title"

app/src/main/res/layout/activity_forget_password.xml

@@ -44,7 +44,8 @@
                   <TextView
                       android:layout_width="wrap_content"
                       android:textSize="14sp"
-                      android:text="获取验证码"
+                      android:text="@{vm.codeTip,default=@string/get_sms_code}"
+                      android:onClick="@{v->vm.getSmsCode(1)}"
                       android:textColor="#FFBC00"
                       android:layout_height="wrap_content"/>
 

app/src/main/res/layout/activity_invoice_list.xml

@@ -7,7 +7,7 @@
 
         <variable
             name="vm"
-            type="com.quansu.heifengwuliu.vmodel.CommentListVModel" />
+            type="com.quansu.heifengwuliu.vmodel.InvoiceListVModel" />
     </data>
 
 

app/src/main/res/layout/activity_login.xml

@@ -54,8 +54,8 @@
             android:gravity="center_vertical"
             android:paddingStart="20dp"
             android:paddingEnd="25dp"
-            app:qmui_backgroundColor="#BFFFFFFF"
-            app:qmui_borderColor="#BFFFFFFF"
+            app:qmui_backgroundColor="#33FFFFFF"
+            app:qmui_borderColor="#33FFFFFF"
             app:qmui_borderWidth="@dimen/dp_1"
             app:qmui_radius="26dp">
 
@@ -93,8 +93,8 @@
             android:paddingStart="19dp"
             android:paddingEnd="25dp"
             android:visibility="@{vm.codeVisibility}"
-            app:qmui_backgroundColor="#BFFFFFFF"
-            app:qmui_borderColor="#BFFFFFFF"
+            app:qmui_backgroundColor="#33FFFFFF"
+            app:qmui_borderColor="#33FFFFFF"
             app:qmui_borderWidth="@dimen/dp_1"
             app:qmui_radius="26dp"
 
@@ -142,8 +142,8 @@
             android:paddingStart="19dp"
             android:paddingEnd="25dp"
             android:visibility="@{vm.passwordVisiblity}"
-            app:qmui_backgroundColor="#BFFFFFFF"
-            app:qmui_borderColor="#BFFFFFFF"
+            app:qmui_backgroundColor="#33FFFFFF"
+            app:qmui_borderColor="#33FFFFFF"
             app:qmui_borderWidth="@dimen/dp_1"
             app:qmui_radius="26dp"
 

app/src/main/res/layout/activity_register.xml

@@ -53,8 +53,8 @@
             android:gravity="center_vertical"
             android:paddingStart="19dp"
             android:paddingEnd="25dp"
-            app:qmui_backgroundColor="#BFFFFFFF"
-            app:qmui_borderColor="#BFFFFFFF"
+            app:qmui_backgroundColor="#33FFFFFF"
+            app:qmui_borderColor="#33FFFFFF"
             app:qmui_borderWidth="@dimen/dp_1"
             app:qmui_radius="26dp" >
 
@@ -80,8 +80,8 @@
             android:gravity="center_vertical"
             android:paddingStart="20dp"
             android:paddingEnd="25dp"
-            app:qmui_backgroundColor="#BFFFFFFF"
-            app:qmui_borderColor="#BFFFFFFF"
+            app:qmui_backgroundColor="#33FFFFFF"
+            app:qmui_borderColor="#33FFFFFF"
             app:qmui_borderWidth="@dimen/dp_1"
             android:layout_marginTop="13dp"
             app:qmui_radius="26dp" >
@@ -117,8 +117,8 @@
             android:gravity="center_vertical"
             android:paddingStart="20dp"
             android:paddingEnd="25dp"
-            app:qmui_backgroundColor="#BFFFFFFF"
-            app:qmui_borderColor="#BFFFFFFF"
+            app:qmui_backgroundColor="#33FFFFFF"
+            app:qmui_borderColor="#33FFFFFF"
             app:qmui_borderWidth="@dimen/dp_1"
             android:layout_marginTop="13dp"
             app:qmui_radius="26dp"  >

app/src/main/res/layout/activity_sourcedetails.xml

@@ -410,6 +410,7 @@
                 android:layout_width="120dp"
                 android:layout_height="@dimen/dp_40"
                 android:layout_marginStart="@dimen/dp_10"
+                android:layout_marginEnd="@dimen/dp_10"
                 android:onClick="@{v->vm.showPayDialog(vm.info.order.info_id)}"
                 android:text="去支付"
                 android:textColor="@color/white"

app/src/main/res/layout/data_time_layout.xml

@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_below="@+id/tv_time_title"
+    android:layout_centerHorizontal="true"
+    android:layout_marginBottom="12dp"
+    android:layout_marginTop="12dp"
+    android:orientation="horizontal"
+    >
+
+    <com.quansu.heifengwuliu.utils.dialog.timewheel.WheelView
+        android:id="@+id/year"
+        android:layout_width="92dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="0.2" />
+
+    <TextView
+        android:id="@+id/tv_yearUnit"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:gravity="center_vertical"
+        android:text="年" />
+
+    <View
+        android:layout_width="1px"
+        android:layout_height="fill_parent"
+        android:background="#e8e8e8" />
+
+    <com.quansu.heifengwuliu.utils.dialog.timewheel.WheelView
+        android:id="@+id/month"
+        android:layout_width="92dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="0.2" />
+
+    <TextView
+        android:id="@+id/tv_monthUnit"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:gravity="center_vertical"
+        android:text="月" />
+
+    <View
+        android:id="@+id/v_monthAndDay"
+        android:layout_width="1px"
+        android:layout_height="fill_parent"
+        android:background="#e8e8e8" />
+
+    <com.quansu.heifengwuliu.utils.dialog.timewheel.WheelView
+        android:id="@+id/day"
+        android:layout_width="92dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="0.2" />
+
+    <TextView
+        android:id="@+id/tv_dayUnit"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:gravity="center_vertical"
+        android:text="日" />
+
+    <View
+        android:id="@+id/v_dayAndHour"
+        android:layout_width="1px"
+        android:layout_height="fill_parent"
+        android:background="#e8e8e8" />
+
+    <com.quansu.heifengwuliu.utils.dialog.timewheel.WheelView
+        android:id="@+id/hour"
+        android:layout_width="92dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="0.2" />
+
+    <TextView
+        android:id="@+id/tv_hourUnit"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:gravity="center_vertical"
+        android:text="时" />
+
+    <View
+        android:id="@+id/v_dayAndMinute"
+        android:layout_width="1px"
+        android:layout_height="fill_parent"
+        android:background="#e8e8e8" />
+
+    <com.quansu.heifengwuliu.utils.dialog.timewheel.WheelView
+        android:id="@+id/minute"
+        android:layout_width="92dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="0.2" />
+
+    <TextView
+        android:id="@+id/tv_minuteUnit"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:gravity="center_vertical"
+        android:text="分" />
+
+
+    <View
+        android:id="@+id/v_dayAndSecond"
+        android:layout_width="1px"
+        android:layout_height="fill_parent"
+        android:background="#e8e8e8" />
+
+    <com.quansu.heifengwuliu.utils.dialog.timewheel.WheelView
+        android:id="@+id/second"
+        android:layout_width="92dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="0.2" />
+
+    <TextView
+        android:id="@+id/tv_minuteSecond"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:gravity="center_vertical"
+        android:text="秒" />
+
+
+    <View
+        android:id="@+id/v_dayAndSecondTo"
+        android:layout_width="1px"
+        android:layout_height="fill_parent"
+        android:background="#e8e8e8" />
+
+</LinearLayout>

app/src/main/res/layout/fragment_account_analysis.xml

@@ -45,6 +45,7 @@
                     android:textColorHint="#95959A"
                     android:textColor="@color/text_title"
                     android:textSize="12sp"
+                    android:text="@{vm.timeData}"
                     android:gravity="center"
                     android:hint="选择时间"
                     android:layout_height="wrap_content"/>
@@ -53,6 +54,7 @@
                  <ImageView
                      android:layout_width="18dp"
                      android:layout_marginStart="8dp"
+                     android:onClick="@{v->vm.choseTime()}"
                      android:src="@drawable/ic_account_time"
                      android:layout_height="17dp"/>
 

app/src/main/res/layout/fragment_index.xml

@@ -5,6 +5,9 @@
 
     <data>
 
+        <variable
+            name="vm"
+            type="com.quansu.heifengwuliu.vmodel.IndexVModel" />
     </data>
 
     <LinearLayout
@@ -120,6 +123,7 @@
                                 android:layout_marginLeft="15dp"
                                 android:layout_weight="1"
                                 android:background="@null"
+                                android:text="@={vm.k}"
                                 android:gravity="center_vertical"
                                 android:hint="请输入要搜索的内容"
                                 android:imeOptions="actionSearch|flagNoExtractUi"

app/src/main/res/layout/fragment_ownermore.xml

@@ -26,7 +26,8 @@
             <com.quansu.heifengwuliu.widget.ShipmentHeadView
                 android:id="@+id/view_head"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"></com.quansu.heifengwuliu.widget.ShipmentHeadView>
+                android:layout_height="wrap_content"/>
+
 
             <LinearLayout
                 android:id="@+id/ll_operation"
@@ -69,6 +70,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:nestedScrollingEnabled="false"
+                    tools:visibility="gone"
                     app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                     tools:listitem="@layout/item_outcar"/>
 
@@ -259,9 +261,10 @@
                     <EditText
                         android:id="@+id/et_data"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
+                        android:layout_height="match_parent"
                         android:background="@null"
                         android:hint="请输入备注信息"
+                        android:gravity="top"
                         android:textColor="@color/text_title"
                         android:textColorHint="#979899"
                         android:textSize="@dimen/sp_13">

app/src/main/res/layout/fragment_ownersingle.xml

@@ -54,6 +54,7 @@
                     android:orientation="vertical"
                     app:qmui_borderColor="@color/white"
                     app:qmui_backgroundColor="@color/white"
+                    tools:visibility="gone"
                     app:qmui_radius="4dp"
                     >
 
@@ -521,23 +522,28 @@
 
 
 
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/dp_1"
-                    android:background="#C2C2C2" />
-
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/dp_50"
-                    android:gravity="center_vertical"
-                    android:orientation="horizontal">
+                    android:orientation="horizontal"
+                    android:paddingStart="17dp"
+                    android:paddingEnd="16dp"
+                    android:layout_marginTop="20dp"
+                    android:layout_marginBottom="20dp"
+                    android:layout_height="wrap_content">
 
                     <LinearLayout
                         android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1"
-                        android:gravity="center">
+                        android:layout_weight="2"
+                        android:background="@drawable/bg_but_left"
+                        android:orientation="horizontal"
+                        android:gravity="center"
+                        android:layout_height="50dp">
+
+                        <ImageView
+                            android:layout_width="20dp"
+                            android:layout_height="20dp"
+                            android:layout_marginStart="20dp"
+                            android:src="@drawable/need_numbers" />
 
                         <EditText
                             android:id="@+id/et_car_nums"
@@ -545,26 +551,22 @@
                             android:layout_weight="1"
                             android:layout_height="match_parent"
                             android:background="@null"
-                            android:gravity="center"
+                            android:gravity="center|left"
                             android:hint="请输入所需车辆数目"
-                            android:textColor="#101010"
+                            android:textColor="@color/white"
+                            android:paddingStart="@dimen/dp_10"
                             android:text="1"
-                            android:textColorHint="#BBBBBB"
+                            android:textColorHint="@color/white"
                             android:textSize="@dimen/sp_15"></EditText>
 
-                        <ImageView
-                            android:layout_width="20dp"
-                            android:layout_height="20dp"
-                            android:layout_marginStart="@dimen/dp_5"
-                            android:layout_marginEnd="@dimen/dp_10"
-                            android:src="@drawable/need_numbers" />
                     </LinearLayout>
 
                     <TextView
                         android:id="@+id/tv_publish"
-                        android:layout_width="150dp"
-                        android:layout_height="match_parent"
-                        android:background="#F4B43E"
+                        android:layout_width="0dp"
+                        android:layout_weight="3"
+                        android:layout_height="50dp"
+                        android:background="@drawable/bg_but_right"
                         android:gravity="center"
                         android:text="发布货源信息"
                         android:textColor="@color/white"
@@ -573,9 +575,14 @@
                     </TextView>
 
 
+
+
+
                 </LinearLayout>
 
 
+
+
             </LinearLayout>
     </LinearLayout>
 </layout>

app/src/main/res/layout/item_index.xml

@@ -156,13 +156,12 @@
                     />
 
 
-
-
                 <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
                     android:layout_width="60dp"
                     app:layout_constraintBottom_toBottomOf="@id/img_goods"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="@id/img_vehicle"
+                    android:onClick="@{v->vm.gotoInfoDetails(item.info_id)}"
                     android:text="去接单"
                     app:qmui_radius="@dimen/dp_4"
                     android:textColor="#FFBC00"

app/src/main/res/layout/item_outcar.xml

@@ -71,11 +71,24 @@
                 android:orientation="horizontal">
 
 
-                <ImageView
-                    android:id="@+id/img"
+                <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
                     android:layout_width="25dp"
                     android:layout_height="25dp"
-                    android:src="@drawable/ic_enter" />
+                    android:layout_marginEnd="6dp"
+                    android:gravity="center"
+                    app:qmui_backgroundColor="#ED702D"
+                    app:qmui_borderColor="#ED702D"
+                    app:qmui_radius="25dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{@string/discharge+(position+1)}"
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/sp_14" />
+
+                </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
 
 
                 <TextView

app/src/main/res/layout/popwindow_bottom_layout.xml

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:background="#ffffff"
+    android:orientation="vertical"
+    android:layout_height="match_parent">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="64dp"
+        android:gravity="center_vertical"
+        android:padding="12dp">
+
+        <TextView
+            android:id="@+id/tv_tclCancel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:text="@string/cancel"
+            android:textColor="#5E5E5E"
+            android:textSize="17sp" />
+
+        <TextView
+            android:id="@+id/tv_tclOk"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:text="确认"
+            android:textColor="#FFBC00"
+            android:textSize="17sp" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:id="@+id/ll_tclTimeToTime"
+        android:layout_width="match_parent"
+        android:layout_height="55dp"
+        android:background="@drawable/begin_time_bg">
+
+        <TextView
+            android:id="@+id/tv_tclBeginTime"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:text="结束于\n2017.05.08" />
+
+        <TextView
+            android:id="@+id/tv_tclEndTime"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:text="结束于\n2017.05.08" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center">
+
+        <include
+            android:id="@+id/view_dataSelect"
+            layout="@layout/data_time_layout" />
+    </LinearLayout>
+
+</LinearLayout>

app/src/main/res/layout/widget_shipmenthead.xml

@@ -47,6 +47,7 @@
             android:layout_width="match_parent"
             android:layout_height="116dp"
             android:gravity="center_vertical"
+            android:background="@color/white"
             android:orientation="horizontal">
 
             <ImageView

app/src/main/res/values/colors.xml

@@ -213,6 +213,13 @@
     <color name="tv_title" >#333333</color >
     <color name="bg_button_red" >#FF4F66</color >
     <color name="yellow_one">#FFF9E9</color>
+    <color name="black33">#333333</color>
+    <!--wheel 的颜色值-->
+    <color name="whell_item_bg_select">#efefef</color>
+
+    <color name="view1_bg">#d2d2d2</color>
+
+    <color name="bg_loading">#f0f0f3</color>
 
 
 </resources >

app/src/main/res/values/dimens.xml

@@ -176,5 +176,6 @@
     <dimen name="dp_25" >25dp</dimen >
     <dimen name="dp_15" >15dp</dimen >
     <dimen name="dp_48" >48dp</dimen >
+    <dimen name="ymd_text_size">17sp</dimen>
 
 </resources >

app/src/main/res/values/strings.xml

@@ -500,6 +500,16 @@ Api 已达到使用限制
     <string name="about_me">他对我的评价</string>
     <string name="me_about">我对他的评价</string>
 
+    <!--日期选择轮子的title-->
+    <string name="query_time_select_title">请选择日期</string>
+
+    <string name="begin_at">开始于\n</string>
+    <string name="end_at">结束于\n</string>
+
+    <string name="time_start_larger_end_not_allowed">开始时间不能大于结束时间</string>
+
+    <string name="time_left">还有%ss</string>
+
 
 
 

app/src/main/res/values/styles.xml

@@ -265,4 +265,29 @@
     </declare-styleable>
 
 
+    <style name="PopBottomDialogStyle" parent="@android:style/Theme.Dialog">
+        <!-- 背景透明 -->
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <!-- 浮于Activity之上 -->
+        <item name="android:windowIsFloating">true</item>
+        <!-- 边框 -->
+        <item name="android:windowFrame">@null</item>
+        <!-- Dialog以外的区域模糊效果 -->
+        <item name="android:backgroundDimEnabled">true</item>
+        <!-- 无标题 -->
+        <item name="android:windowNoTitle">true</item>
+        <!-- 半透明 -->
+        <item name="android:windowIsTranslucent">true</item>
+        <!-- Dialog进入及退出动画 -->
+        <item name="android:windowAnimationStyle">@style/ActionSheetDialogAnimation</item>
+    </style>
+
+    <!-- ActionSheet进出动画 -->
+    <style name="ActionSheetDialogAnimation" parent="@android:style/Animation.Dialog">
+        <item name="android:windowEnterAnimation">@anim/popwindow_enter</item>
+        <item name="android:windowExitAnimation">@anim/popwindow_exit</item>
+    </style>
+
+
 </resources >

base/src/main/java/com/ysnows/base/base/BFragment.kt

@@ -3,6 +3,7 @@ package com.ysnows.base.base
 import android.content.Context
 import android.os.Bundle
 import android.text.TextUtils
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -64,6 +65,7 @@ abstract class BFragment<VM : BViewModel<*>, B : ViewDataBinding> : RxFragment()
             setSwipeRefreshLayoutStyle()
         }
         var contentView: View? = null
+
         if (provideContainerId() != -1) {
             contentView = view.findViewById(provideContainerId())
         }
@@ -291,4 +293,4 @@ abstract class BFragment<VM : BViewModel<*>, B : ViewDataBinding> : RxFragment()
     override fun exitFromTopAnim(): Boolean {
         return false
     }
-}
+}

base/src/main/java/com/ysnows/base/base/BRRepository.kt

@@ -1,6 +1,7 @@
 package com.ysnows.base.base
 
 import android.annotation.SuppressLint
+import android.util.Log
 import com.ysnows.base.emptyview.callback.EmptyCallback
 import com.ysnows.base.emptyview.callback.LoadingCallback
 import com.ysnows.base.emptyview.callback.TimeoutCallback
@@ -189,4 +190,4 @@ open class BRRepository : BRepository() {
         page += 1
         return page
     }
-}
+}

base/src/main/java/com/ysnows/base/route/IGaode.kt

@@ -16,5 +16,6 @@ interface  IGaode : IRoute {
 
     fun goRouteLocation(@Param("item") item: PositionBean): Observable<CCResult>
 
+    fun currentLocation(): Observable<CCResult>
 
 }

base/src/main/java/com/ysnows/base/route/IJpush.kt

@@ -12,5 +12,6 @@ interface IJpush : IRoute {
 
     fun init(): Observable<CCResult>
     fun isLogin(): Observable<CCResult>
+    fun initPush(): Observable<CCResult>
 
 }

base/src/main/res/layout/emptyview_layout_empty.xml

@@ -7,14 +7,15 @@
               android:orientation="vertical">
 
     <ImageView
-        android:layout_width="80dp"
-        android:layout_height="80dp"
+        android:layout_width="144dp"
+        android:layout_height="108dp"
         android:background="@drawable/empty"/>
 
     <TextView
         android:id="@+id/tv_empty"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="7dp"
         android:text="@string/emptyview_fine_no_data"
         android:textColor="#333333"
         android:textSize="18sp"/>
@@ -22,5 +23,6 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
         android:text="@string/emptyview_click_me_to_retry"/>
 </LinearLayout>

gaode/src/main/java/com/quansu/gaode/componnent/CpGaode.java

@@ -8,13 +8,18 @@ import com.billy.cc.core.component.IComponent;
 import com.google.gson.Gson;
 import com.quansu.gaode.activity.GaodeActivity;
 import com.quansu.gaode.activity.RouteActivity;
+import com.quansu.gaode.utils.CurrentLocationUtils;
 import com.ysnows.base.base.BApp;
 import com.ysnows.base.ccextension.BIComponent;
 import com.ysnows.base.model.PositionBean;
 
 
 public class CpGaode extends BIComponent implements IComponent {
-
+    /**
+     * 选择位置
+     *
+     * @return
+     */
     public boolean selectLocation(CC cc) {
 
         Log.e("-shy-", "---3333- ");
@@ -30,7 +35,26 @@ public class CpGaode extends BIComponent implements IComponent {
 
         return false;
     }
+    /**
+     * 获取当前位置
+     *
+     * @param cc
+     *
+     * @return
+     */
+    public boolean currentLocation(CC cc){
+
+        new CurrentLocationUtils().getStart(cc.getContext());
 
+        CC.sendCCResult(cc.getCallId(), CCResult.success());
+        return false;
+    }
+    /**
+     * 两点轨迹
+     *
+     * @param cc
+     * @return
+     */
 
     public boolean goRouteLocation(CC cc,PositionBean item){
 

gaode/src/main/java/com/quansu/gaode/utils/CurrentLocationUtils.java

@@ -0,0 +1,135 @@
+package com.quansu.gaode.utils;
+
+import android.content.Context;
+import android.util.Log;
+
+import com.amap.api.location.AMapLocation;
+import com.amap.api.location.AMapLocationClient;
+import com.amap.api.location.AMapLocationClientOption;
+import com.amap.api.location.AMapLocationListener;
+import com.yanzhenjie.permission.Action;
+import com.yanzhenjie.permission.AndPermission;
+import com.yanzhenjie.permission.runtime.Permission;
+import com.ysnows.base.ccretrofit.CCRetrofit;
+import com.ysnows.base.model.PositionBean;
+import com.ysnows.base.route.IApp;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Created by shihuiyun
+ * on 2020/6/4
+ */
+public class CurrentLocationUtils {
+
+    public void getStart(Context context){
+        AndPermission.with(context)
+                .runtime()
+                .permission(Permission.ACCESS_COARSE_LOCATION,
+                        Permission.READ_EXTERNAL_STORAGE,
+                        Permission.WRITE_EXTERNAL_STORAGE
+                )
+                .onGranted(new Action<List<String>>() {
+                               /**
+                                * @param data
+                                */
+                               @Override
+                               public void onAction(List<String> data) {
+                                   getCurrentLocation(context);
+                               }
+                           }
+                )
+                .start();
+    }
+
+
+
+    /**
+     * 获取当前位置
+     */
+    AMapLocationClient mLocationClient = null;
+    public AMapLocationClientOption mLocationOption = null;
+
+    private void getCurrentLocation(Context context) {
+
+        //初始化定位
+        mLocationClient = new AMapLocationClient(context);
+        //设置定位回调监听
+        mLocationClient.setLocationListener(mLocationListener);
+        //初始化定位参数
+        mLocationOption = new AMapLocationClientOption();
+        // 同时使用网络定位和GPS定位,优先返回最高精度的定位结果,以及对应的地址描述信息
+        mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Hight_Accuracy);
+        //只会使用网络定位
+        /* mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Battery_Saving);*/
+        //只使用GPS进行定位
+        /*mLocationOption.setLocationMode(AMapLocationMode.Device_Sensors);*/
+        // 设置为单次定位 默认为false
+        mLocationOption.setOnceLocation(true);
+        //设置定位间隔,单位毫秒,默认为2000ms，最低1000ms。默认连续定位 切最低时间间隔为1000ms
+        mLocationOption.setInterval(3500);
+        mLocationClient.setLocationOption(mLocationOption);
+        //启动定位
+        mLocationClient.startLocation();
+
+    }
+
+    public AMapLocationListener mLocationListener = new AMapLocationListener() {
+        @Override
+        public void onLocationChanged(AMapLocation amapLocation) {
+
+            if (amapLocation != null) {
+                if (amapLocation.getErrorCode() == 0) {
+                    //定位成功回调信息，设置相关消息
+                    amapLocation.getLocationType();//获取当前定位结果来源，如网络定位结果，详见定位类型表
+                    amapLocation.getLatitude();//获取纬度
+                    amapLocation.getLongitude();//获取经度
+                    amapLocation.getAccuracy();//获取精度信息
+                    SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                    Date date = new Date(amapLocation.getTime());
+                    df.format(date);//定位时间
+                    amapLocation.getAddress();//地址，如果option中设置isNeedAddress为false，则没有此结果，网络定位结果中会有地址信息，GPS定位不返回地址信息。
+//                    amapLocation.getCountry();//国家信息
+//                    amapLocation.getProvince();//省信息
+//                    amapLocation.getCity();//城市信息
+//                    amapLocation.getDistrict();//城区信息
+//                    amapLocation.getStreet();//街道信息
+//                    amapLocation.getStreetNum();//街道门牌号信息
+//                    amapLocation.getCityCode();//城市编码
+//                    amapLocation.getAdCode();//地区编码
+                    Log.e("AmapError", "amapLocation.getAddress()="+amapLocation.getAddress());
+
+                    String address =amapLocation.getProvince() +
+                            amapLocation.getCity() +
+                            amapLocation.getDistrict() +
+                            amapLocation.getStreet();
+
+                    PositionBean positionBean = new PositionBean(address,
+                            String.valueOf( amapLocation.getLatitude()),  String.valueOf(amapLocation.getLongitude()),
+                            amapLocation.getProvince(), amapLocation.getCity(),
+                            amapLocation.getDistrict(),
+                            amapLocation.getAdCode()
+                    );
+
+                    Log.e("shy", "address="+address);
+
+                    CCRetrofit.instance()
+                            .create(IApp.class)
+                            .setDatas(positionBean)
+                            .subscribe();
+
+                } else {
+                    //显示错误信息ErrCode是错误码，errInfo是错误信息，详见错误码表。
+                    Log.e("AmapError", "location Error, ErrCode:"
+                            + amapLocation.getErrorCode() + ", errInfo:"
+                            + amapLocation.getErrorInfo());
+                }
+            }
+
+        }
+    };
+
+
+}

jpush/build.gradle

@@ -44,6 +44,8 @@ dependencies {
     implementation 'androidx.multidex:multidex:2.0.0'
     implementation project(':base')
 
+    implementation 'cn.jiguang.sdk:jpush:3.7.0'
+    implementation 'cn.jiguang.sdk:jcore:2.4.2'  
 
 
 

jpush/src/main/AndroidManifest.xml

@@ -22,12 +22,39 @@
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
     <uses-permission android:name="android.permission.GET_TASKS" />
 
+    <permission
+        android:name="${applicationId}.permission.JPUSH_MESSAGE"
+        android:protectionLevel="signature" />
+    <!-- 这里com.xiaomi.mipushdemo改成app的包名 -->
+    <uses-permission android:name="${applicationId}.permission.JPUSH_MESSAGE" />
+
+
     <application
         android:allowBackup="true"
         android:label="@string/app_name"
         android:supportsRtl="true"
         >
+        <!--        极光-->
+        <!-- 替换原生极光推送接收器 -->
+        <receiver
+            android:name=".PushMessageReceiver"
+            android:enabled="true"
+            android:exported="false"
+            tools:node="replace">
+            <intent-filter>
+                <action android:name="cn.jpush.android.intent.RECEIVE_MESSAGE" />
+                <category android:name="com.example.jpushdemo" /> <!--JPush上注册的包名 -->
+            </intent-filter>
+        </receiver>
 
+        <service android:name=".PushService"
+            android:enabled="true"
+            android:exported="false"
+            android:process=":pushcore">
+            <intent-filter>
+                <action android:name="cn.jiguang.user.service.action" />
+            </intent-filter>
+        </service>
 
     </application >
 

jpush/src/main/java/com/quansu/jpush/PushMessageReceiver.java

@@ -0,0 +1,108 @@
+package com.quansu.jpush;
+
+import android.content.Context;
+import android.util.Log;
+import cn.jpush.android.api.CustomMessage;
+import cn.jpush.android.api.JPushMessage;
+import cn.jpush.android.api.NotificationMessage;
+import cn.jpush.android.service.JPushMessageReceiver;
+
+public class PushMessageReceiver extends JPushMessageReceiver {
+    /**
+     * TODO 连接极光服务器
+     */
+    @Override
+    public void onConnected(Context context, boolean b) {
+        super.onConnected(context, b);
+        Log.e("连接极光服务器", "onConnected");
+    }
+
+    /**
+     * TODO 注册极光时的回调
+     */
+    @Override
+    public void onRegister(Context context, String s) {
+        super.onRegister(context, s);
+        Log.e("注册极光时的回调", "onRegister" + s);
+    }
+
+    /**
+     * TODO 注册以及解除注册别名时回调
+     */
+    @Override
+    public void onAliasOperatorResult(Context context, JPushMessage jPushMessage) {
+        super.onAliasOperatorResult(context, jPushMessage);
+        Log.e("注册以及解除注册别名时回调", jPushMessage.toString());
+    }
+
+    /**
+     * TODO 接收到推送下来的通知
+     * 可以利用附加字段（notificationMessage.notificationExtras）来区别Notication,指定不同的动作,附加字段是个json字符串
+     * 通知（Notification），指在手机的通知栏（状态栏）上会显示的一条通知信息
+     */
+    @Override
+    public void onNotifyMessageArrived(Context context, NotificationMessage notificationMessage) {
+        super.onNotifyMessageArrived(context, notificationMessage);
+        Log.e("接收到推送下来的通知", notificationMessage.toString());
+    }
+
+    /**
+     * TODO 打开了通知
+     * notificationMessage.notificationExtras(附加字段)的内容处理代码
+     * 比如打开新的Activity， 打开一个网页等..
+     */
+    @Override
+    public void onNotifyMessageOpened(Context context, NotificationMessage notificationMessage) {
+        super.onNotifyMessageOpened(context, notificationMessage);
+//        Intent intent = new Intent(context, MainActivity.class);
+//        context.startActivity(intent);
+//        Log.e("打开了通知", notificationMessage.notificationExtras);
+    }
+
+    /**
+     * TODO 接收到推送下来的自定义消息
+     * 自定义消息不是通知，默认不会被SDK展示到通知栏上，极光推送仅负责透传给SDK。其内容和展示形式完全由开发者自己定义。
+     * 自定义消息主要用于应用的内部业务逻辑和特殊展示需求
+     */
+    @Override
+    public void onMessage(Context context, CustomMessage customMessage) {
+        super.onMessage(context, customMessage);
+        // 收到消息 显示通知
+        Log.d("接收到推送下来的自定义消息", "onMessage: ");
+//        processCustomMessage(context, customMessage.extra);
+    }
+
+//    //通知
+//    private void processCustomMessage(Context context, String message) {
+//
+//        String channelID = "1";
+//        String channelName = "channel_name";
+//
+//        // 跳转的Activity
+//        Intent intent = new Intent(context, MainActivity.class);
+//        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
+//
+//        PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, intent, 0);
+//
+//        NotificationManager notificationManager = (NotificationManager) context.getSystemService(NOTIFICATION_SERVICE);
+//
+//        //适配安卓8.0的消息渠道
+//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+//            NotificationChannel channel = new NotificationChannel(channelID, channelName, NotificationManager.IMPORTANCE_HIGH);
+//            notificationManager.createNotificationChannel(channel);
+//        }
+//
+//        NotificationCompat.Builder notification =
+//                new NotificationCompat.Builder(context, channelID);
+//
+//        notification.setAutoCancel(true)
+//                .setContentText(message)
+//                .setContentTitle("我是Title")
+//                .setSmallIcon(R.drawable.ic_launcher_background)
+//                .setDefaults(Notification.DEFAULT_ALL)
+//                .setContentIntent(pendingIntent);
+//
+//        notificationManager.notify((int) (System.currentTimeMillis() / 1000), notification.build());
+//    }
+
+}

jpush/src/main/java/com/quansu/jpush/PushService.java

@@ -0,0 +1,12 @@
+package com.quansu.jpush;
+
+import cn.jpush.android.service.JCommonService;
+
+/**
+ * Created by shihuiyun
+ * on 2020/4/13
+ */
+public class PushService extends JCommonService {
+
+}
+

jpush/src/main/java/com/quansu/jpush/componnent/CpJpush.kt

@@ -2,6 +2,7 @@ package com.quansu.jpush.componnent
 
 import android.util.Log
 import cn.jiguang.verifysdk.api.*
+import cn.jpush.android.api.JPushInterface
 import com.billy.cc.core.component.CC
 import com.billy.cc.core.component.CCResult
 import com.billy.cc.core.component.IComponent
@@ -93,4 +94,15 @@ class CpJpush : BIComponent() , IComponent  {
         return false
     }
 
+
+    fun initPush(cc: CC): Boolean {//初始化极光推送
+
+        JPushInterface.setDebugMode(true) //打印log
+
+        JPushInterface.init(cc.getContext().getApplicationContext())
+
+        CC.sendCCResult(cc.callId, CCResult.success())
+        return false
+    }
+
 }