车队（邀请，同意，拒绝）功能完善

mylibrary/src/main/java/com/dahe/mylibrary/base/BaseActivity.java

@@ -221,6 +221,34 @@ public abstract class BaseActivity<VB extends ViewBinding> extends AppCompatActi
         mToolbar.setNavigationOnClickListener(listener);
     }
 
+
+    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+    protected void setTitleBar(String title, boolean isWhite,boolean isBack, String right, View.OnClickListener rightListener) {
+
+        mToolbar = (Toolbar) findViewById(R.id.common_toolbar);
+        mToolbar.setBackgroundColor(statusColor == -1 ? Color.TRANSPARENT : ContextCompat.getColor(mContext, statusColor));
+
+        if (isBack) {
+            mToolbar.setNavigationIcon(isWhite ? R.drawable.left : R.drawable.left_black);
+            mToolbar.setNavigationOnClickListener(view -> finish());
+        }
+        if (!TextUtils.isEmpty(title)) {//
+            ((TextView) findViewById(R.id.common_toolBar_title)).setTextColor(isWhite ? getColor(R.color.colorWhite) : getColor(R.color.black));
+            ((TextView) findViewById(R.id.common_toolBar_title)).setText(title);
+        }
+
+        if (!TextUtils.isEmpty(right)) {
+            TextView mTextRight = (TextView) findViewById(R.id.common_toolBar_text_right);
+            mTextRight.setTextColor(isWhite ? getColor(R.color.colorWhite) : getColor(R.color.black));
+            mTextRight.setVisibility(View.VISIBLE);
+            mTextRight.setText(right);
+            mTextRight.setOnClickListener(rightListener);
+        }
+        if (isWhite) {
+            StatusBar.cancelLightStatusBar(this);//图标文字白色
+        }
+    }
+
     /**
      * 设置距离顶部距离
      */

mylibrary/src/main/java/com/dahe/mylibrary/utils/ActivityUtils.java

@@ -285,6 +285,31 @@ public class ActivityUtils {
         return false;
     }
 
+
+    /**
+     * 结束到指定Activity,并进入指定页面
+     *
+     * @param isIncludeSelf 是否结束该activity自己
+     */
+    public static boolean finishToActivity(Context ctx ,@NonNull final Class<?> clz,@NonNull final Class<?> newclz,
+                                           final boolean isIncludeSelf) {
+        List<Activity> activities = CommonBaseLibrary.activityList;
+        for (int i = activities.size() - 1; i >= 0; --i) {
+            Activity aActivity = activities.get(i);
+            if (aActivity.getClass().equals(clz)) {
+                if (isIncludeSelf) {
+                    finishActivity(aActivity);
+                }
+                startActivity(ctx,newclz);
+                return true;
+            } else {
+                finishActivity(aActivity);
+            }
+//            finishActivity(aActivity);
+        }
+        return false;
+    }
+
     /**
      * 结束除最新之外的同类型Activity
      * <p>也就是让栈中最多只剩下一种类型的Activity</p>

mylibrary/src/main/java/com/dahe/mylibrary/utils/PickerUtils.kt

@@ -10,6 +10,8 @@ import com.github.gzuliyujiang.wheelpicker.annotation.DateMode
 import com.github.gzuliyujiang.wheelpicker.contract.OnDatePickedListener
 import com.github.gzuliyujiang.wheelpicker.contract.OnOptionPickedListener
 import com.github.gzuliyujiang.wheelpicker.entity.DateEntity
+import com.github.gzuliyujiang.wheelview.contract.TextProvider
+import java.util.ArrayList
 
 /**
  * @ClassName PickUtils
@@ -57,7 +59,7 @@ class PickerUtils private constructor() {
      */
     fun showDateSim(
         activity: AppCompatActivity,
-        title: String = "",
+        title: String = "日期选择",
         listener: OnMyDatePickedListener
     ) {
         val picker = DatePicker(activity)
@@ -93,4 +95,28 @@ class PickerUtils private constructor() {
                 show()
             }
     }
+
+    /**
+     * 底部弹框-单选
+     * @param activity AppCompatActivity
+     * @param title String
+     * @param listener OnOptionPickedListener
+     */
+    fun <T:TextProvider> showSelectCarColor(
+        activity: AppCompatActivity,
+        title: String = "",
+        default: String = "",
+        datas: MutableList<T>,
+        listener: OnOptionPickedListener
+    ) {
+        OptionPicker(activity)
+            .run {
+                setData(datas)
+                setDefaultValue(default)
+                setTitle(title)
+                setOnOptionPickedListener(listener)
+                show()
+            }
+    }
+
 }

mylibrary/src/main/java/com/dahe/mylibrary/utils/TimeUtil.java

@@ -659,6 +659,21 @@ public final class TimeUtil {
         return "";
     }
 
+    /**
+     * 转换数据类型
+     * @param date
+     * @param formart 原始数据类型
+     * @return yyyy-MM-dd
+     */
+    public static String changeDateNoneFormat(String date, String formart) {
+        long l = string2Millis(date,new SimpleDateFormat(formart, Locale.getDefault()));
+        if (l != -1) {
+            return millis2String(l, DEFAULT_FORMAT_DATE);
+        }
+        return "";
+    }
+
+
     /**
      * 获取合适型与当前时间的差
      *