diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..a55e7a1
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index d4bedb5..e75718b 100755
--- a/build.gradle
+++ b/build.gradle
@@ -91,17 +91,15 @@ ext {
gXRecyclerViewVersion = '1.5.9'
//rxview
gRxjavaBindingVersion = '2.1.1'
- gPickerViewVersion = '4.1.6'
wheelVersion = '4.1.0'
gBoomMenu = '2.1.1'
gFilePicker = '1.8.0'
- pickerViewVersion = '4.1.9'
+ gPickerViewVersion = '4.1.9'
//bottomNavBar
supportBottomNavBar = '2.0.5'
eventButsVersion = '3.1.1'
bannerVersion = '2.0.8'
plugVersion = '27.1.1'
- pickerViewVersion = '4.1.6'
xRecyclerViewVersion = '1.5.9'
lfilepickerlibraryVersion = '1.8.0'
mIndicatorVersion = '1.5.0'
diff --git a/cm_utils/build.gradle b/cm_utils/build.gradle
index 76ec12d..28aeb57 100755
--- a/cm_utils/build.gradle
+++ b/cm_utils/build.gradle
@@ -64,8 +64,8 @@ dependencies {
//butterknife
api "com.jakewharton:butterknife:$rootProject.ext.gButterKnifeVersion"
////选择器
- implementation "com.contrarywind:Android-PickerView:${rootProject.ext.pickerViewVersion}"
- implementation "com.contrarywind:wheelview:${rootProject.ext.wheelVersion}"
+ api "com.contrarywind:Android-PickerView:${rootProject.ext.gPickerViewVersion}"
+ api "com.contrarywind:wheelview:${rootProject.ext.wheelVersion}"
//recyclerview
implementation 'androidx.recyclerview:recyclerview:1.2.1'
//选择器
diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java
index 2954ab7..897c220 100755
--- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java
+++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java
@@ -117,8 +117,7 @@ public class PathConfig {
public static final String PATH_MODULE_PLACE_ACTIVITY_PLACEDETAIL = "/moduleplace/activity/placedetail";//场馆详情
public static final String PATH_MODULE_PLACE_ACTIVITY_PLACELIST = "/moduleplace/activity/placelist";//场馆列表
public static final String PATH_MODULE_PLACE_FRAGMENT_MAIN = "/moduleplace/fragment/main";//场馆fragment
- public static final String PATH_MODULE_PLACE_ACTIVITY_PLACE_SUBJECT_DETAIL = "/moduleplace/activity/subjectdetail"
- ;//场馆详情
+ public static final String PATH_MODULE_PLACE_ACTIVITY_PLACE_SUBJECT_DETAIL = "/moduleplace/activity/subjectdetail";//场馆详情
public static final String PATH_MODULE_PLACE_TICKET_DISTINE = "/moduleplace/activity/distineticket";//门票预定
public static final String PATH_MODULE_PLACE_DISTINE_BOOKING = "/moduleplace/activity/distinebooking";//场次预定
@@ -140,8 +139,7 @@ public class PathConfig {
public static final String PATH_MODULE_CULTURAL_VOUNTEER_MANAGE = "/modulecultural/activity/vounteermanage";//志愿团队
public static final String PATH_MODULE_CULTURAL_VOUNTEER_MANAGE_LIST = "/modulecultural/activity" +
"/vounteermanagelsit";//我创建的自愿者团队
- public static final String PATH_MODULE_CULTURAL_VOUNTEER_ACTIVITY_TEAM = "/modulecultural/activity/vounteermember"
- ;//志愿者列表
+ public static final String PATH_MODULE_CULTURAL_VOUNTEER_ACTIVITY_TEAM = "/modulecultural/activity/vounteermember";//志愿者列表
public static final String PATH_MODULE_CULTURAL_VOUNTEER_MEMBER_DETAIL = "/modulecultural/activity" +
"/vounteermemberdetail";//志愿者详情
public static final String PATH_MODULE_CULTURAL_VOUNTEER_MANAGE_MEMBER = "/modulecultural/activity" +
@@ -153,8 +151,7 @@ public class PathConfig {
public static final String PATH_MODULE_CULTURAL_LIVE_LIST = "/modulecultural/activity/livelookbacklist";//直播回看播放列表
public static final String PATH_MODULE_CULTURAL_VOUNTEER_MINE_TEAM_DETAIL = "/modulecultural/activity/vounteer" +
"/detail";//我创建的团队详情
- public static final String PATH_MODULE_CULTURAL_VOUNTEER_MINE_TEAM_EDIT = "/modulecultural/activity/vounteer/edit"
- ;//编辑我创建的团队
+ public static final String PATH_MODULE_CULTURAL_VOUNTEER_MINE_TEAM_EDIT = "/modulecultural/activity/vounteer/edit";//编辑我创建的团队
public static final String PATH_MODULE_CULTURAL_VOUNTEER_ACTIVITY_LIST = "/modulecultural/activity/vounteer" +
"/activitylist";//志愿者活动列表
@@ -265,4 +262,10 @@ public class PathConfig {
public static final String PATH_MODULE_SHOP_ACTIVITY_GOODS_LIST = "/moduleshop/activity/shopGoodsList";//商品列表
public static final String PATH_MODULE_SHOP_ACTIVITY_GOODS_DETAIL = "/moduleshop/activity/shopGoodsDetail";//商品详情
public static final String PATH_MODULE_SHOP_ACTIVITY_SHOP_CAR = "/moduleshop/activity/shopGoodsCar";//购物车
+ public static final String PATH_MODULE_SHOP_ACTIVITY_SHOP_ORDER_CONFIRM =
+ "/moduleshop/activity/shopOrderConfirm";//订单确认
+ public static final String PATH_MODULE_SHOP_ACTIVITY_SHOP_ADDRESS = "/moduleshop/activity/shopGoodsAddress";//收货地址
+ public static final String PATH_MODULE_SHOP_ACTIVITY_SHOP_MINE_ORDER = "/moduleshop/activity/shopOrderList";//我的订单
+ public static final String PATH_MODULE_SHOP_ACTIVITY_SHOP_MINE_ORDER_DETAIL = "/moduleshop/activity/shopOrderDetail";//我的订单
+ public static final String PATH_MODULE_SHOP_ACTIVITY_SHOP_ADD_ADDRESS = "/moduleshop/activity/shopAddAddress";//新增收货地
}
diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/beans/AreaBean.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/beans/AreaBean.java
index 335f6c3..f04a3c5 100755
--- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/beans/AreaBean.java
+++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/beans/AreaBean.java
@@ -1,5 +1,7 @@
package com.sucstepsoft.cm_utils.core.beans;
+import com.contrarywind.interfaces.IPickerViewData;
+
import java.util.List;
/**
@@ -8,7 +10,7 @@ import java.util.List;
* 邮箱: itgaojian@163.com
* 描述:
*/
-public class AreaBean {
+public class AreaBean implements IPickerViewData {
/**
* areaCityCode : string
@@ -174,6 +176,11 @@ public class AreaBean {
this.subArea = subArea;
}
+ @Override
+ public String getPickerViewText() {
+ return areaName;
+ }
+
public static class SubAreaBean {
}
}
diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/api/BaseApiService.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/api/BaseApiService.java
index a91ccf2..28047f2 100755
--- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/api/BaseApiService.java
+++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/api/BaseApiService.java
@@ -290,4 +290,20 @@ public interface BaseApiService {
Call downloadApk(@Url String url);
+ /**
+ * 统一用户-根据pId获取下级
+ *
+ * @param pId
+ * @return
+ */
+ @Headers({"Content-Type:application/json", "Accept:application/json"})
+ @GET("app/area/listbyparentidrelease/{areaParentId}")
+ Observable> getArea(@Path("areaParentId") String pId);
+
+ /**
+ * 统一用户-区域-根据Id获取详情
+ */
+ @Headers({"Content-Type:application/json", "Accept:application/json"})
+ @GET("app/area/getrelease/{areaId}")
+ Observable getAreaDetail(@Path("areaId") String pId);
}
diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/views/BaseCustomHPickerView.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/views/BaseCustomHPickerView.java
deleted file mode 100755
index 07d6bf7..0000000
--- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/views/BaseCustomHPickerView.java
+++ /dev/null
@@ -1,354 +0,0 @@
-package com.sucstepsoft.cm_utils.core.widget.views;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.app.Dialog;
-import android.content.Context;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
-import android.view.Display;
-import android.view.Gravity;
-import android.view.KeyEvent;
-import android.view.LayoutInflater;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.view.WindowManager;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
-import android.widget.FrameLayout;
-
-import com.bigkoo.pickerview.configure.PickerOptions;
-import com.bigkoo.pickerview.listener.OnDismissListener;
-import com.bigkoo.pickerview.utils.PickerViewAnimateUtil;
-import com.sucstepsoft.cm_utils.R;
-
-public class BaseCustomHPickerView {
- private Context context;
- protected ViewGroup contentContainer;
- private ViewGroup rootView;//附加View 的 根View
- private ViewGroup dialogView;//附加Dialog 的 根View
-
- protected PickerOptions mPickerOptions;
- private OnDismissListener onDismissListener;
- private boolean dismissing;
-
- private Animation outAnim;
- private Animation inAnim;
- private boolean isShowing;
-
- protected int animGravity = Gravity.BOTTOM;
-
- private Dialog mDialog;
- protected View clickView;//是通过哪个View弹出的
- private boolean isAnim = true;
-
- public BaseCustomHPickerView(Context context) {
- this.context = context;
- }
-
-
- protected void initViews() {
-
- FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(
- ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.BOTTOM);
-
- LayoutInflater layoutInflater = LayoutInflater.from(context);
- if (isDialog()) {
-
- //如果是对话框模式
- dialogView = (ViewGroup) layoutInflater.inflate(R.layout.layout_basepickerview, null, false);
- //设置界面的背景为透明
- dialogView.setBackgroundColor(Color.TRANSPARENT);
- //这个是真正要加载选择器的父布局
- contentContainer = (ViewGroup) dialogView.findViewById(R.id.content_container);
- //设置对话框 默认左右间距屏幕30
-// params.leftMargin = 10;
-// params.rightMargin = 10;
- contentContainer.setLayoutParams(params);
- //创建对话框
- createDialog();
- //给背景设置点击事件,这样当点击内容以外的地方会关闭界面
- dialogView.setOnClickListener(view -> dismiss());
- } else {
- //如果只是要显示在屏幕的下方
- //decorView是activity的根View,包含 contentView 和 titleView
- if (mPickerOptions.decorView == null) {
- mPickerOptions.decorView = (ViewGroup) ((Activity) context).getWindow().getDecorView();
- }
- //将控件添加到decorView中
- rootView = (ViewGroup) layoutInflater.inflate(R.layout.layout_basepickerview, mPickerOptions.decorView, false);
- rootView.setLayoutParams(new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
- if (mPickerOptions.backgroundId != -1) {
- rootView.setBackgroundColor(mPickerOptions.backgroundId);
- }
- //这个是真正要加载时间选取器的父布局
- contentContainer = (ViewGroup) rootView.findViewById(R.id.content_container);
- contentContainer.setLayoutParams(params);
- }
- setKeyBackCancelable(true);
- }
-
- protected void initAnim() {
- inAnim = getInAnimation();
- outAnim = getOutAnimation();
- }
-
- protected void initEvents() {
- }
-
-
- /**
- * @param v (是通过哪个View弹出的)
- * @param isAnim 是否显示动画效果
- */
- public void show(View v, boolean isAnim) {
- this.clickView = v;
- this.isAnim = isAnim;
- show();
- }
-
- public void show(boolean isAnim) {
- this.isAnim = isAnim;
- show();
- }
-
- public void show(View v) {
- this.clickView = v;
- show();
- }
-
-
- /**
- * 添加View到根视图
- */
- public void show() {
- if (isDialog()) {
- showDialog();
- } else {
- if (isShowing()) {
- return;
- }
- isShowing = true;
- onAttached(rootView);
- rootView.requestFocus();
- }
- }
-
-
- /**
- * show的时候调用
- *
- * @param view 这个View
- */
- private void onAttached(View view) {
- mPickerOptions.decorView.addView(view);
- if (isAnim) {
- contentContainer.startAnimation(inAnim);
- }
- }
-
-
- /**
- * 检测该View是不是已经添加到根视图
- *
- * @return 如果视图已经存在该View返回true
- */
- public boolean isShowing() {
- if (isDialog()) {
- return false;
- } else {
- return rootView.getParent() != null || isShowing;
- }
-
- }
-
- public void dismiss() {
- if (isDialog()) {
- dismissDialog();
- } else {
- if (dismissing) {
- return;
- }
-
- if (isAnim) {
- //消失动画
- outAnim.setAnimationListener(new Animation.AnimationListener() {
- @Override
- public void onAnimationStart(Animation animation) {
-
- }
-
- @Override
- public void onAnimationEnd(Animation animation) {
- dismissImmediately();
- }
-
- @Override
- public void onAnimationRepeat(Animation animation) {
-
- }
- });
- contentContainer.startAnimation(outAnim);
- } else {
- dismissImmediately();
- }
- dismissing = true;
- }
-
-
- }
-
- public void dismissImmediately() {
-
- mPickerOptions.decorView.post(new Runnable() {
- @Override
- public void run() {
- //从根视图移除
- mPickerOptions.decorView.removeView(rootView);
- isShowing = false;
- dismissing = false;
- if (onDismissListener != null) {
- onDismissListener.onDismiss(BaseCustomHPickerView.this);
- }
- }
- });
-
-
- }
-
- private Animation getInAnimation() {
- int res = PickerViewAnimateUtil.getAnimationResource(this.animGravity, true);
- return AnimationUtils.loadAnimation(context, res);
- }
-
- private Animation getOutAnimation() {
- int res = PickerViewAnimateUtil.getAnimationResource(this.animGravity, false);
- return AnimationUtils.loadAnimation(context, res);
- }
-
- public BaseCustomHPickerView setOnDismissListener(OnDismissListener onDismissListener) {
- this.onDismissListener = onDismissListener;
- return this;
- }
-
- public void setKeyBackCancelable(boolean isCancelable) {
-
- ViewGroup View;
- if (isDialog()) {
- View = dialogView;
- } else {
- View = rootView;
- }
-
- View.setFocusable(isCancelable);
- View.setFocusableInTouchMode(isCancelable);
- if (isCancelable) {
- View.setOnKeyListener(onKeyBackListener);
- } else {
- View.setOnKeyListener(null);
- }
- }
-
- private View.OnKeyListener onKeyBackListener = (v, keyCode, event) -> {
- if (keyCode == KeyEvent.KEYCODE_BACK && event.getAction() == MotionEvent.ACTION_DOWN && isShowing()) {
- dismiss();
- return true;
- }
- return false;
- };
-
- protected BaseCustomHPickerView setOutSideCancelable(boolean isCancelable) {
-
- if (rootView != null) {
- View view = rootView.findViewById(R.id.outmost_container);
-
- if (isCancelable) {
- view.setOnTouchListener(onCancelableTouchListener);
- } else {
- view.setOnTouchListener(null);
- }
- }
-
- return this;
- }
-
- /**
- * 设置对话框模式是否可以点击外部取消
- */
- public void setDialogOutSideCancelable() {
- if (mDialog != null) {
- mDialog.setCancelable(mPickerOptions.cancelable);
- }
- }
-
-
- /**
- * Called when the user touch on black overlay, in order to dismiss the dialog.
- */
- @SuppressLint("ClickableViewAccessibility")
- private final View.OnTouchListener onCancelableTouchListener = (v, event) -> {
- if (event.getAction() == MotionEvent.ACTION_DOWN) {
- dismiss();
- }
- return false;
- };
-
- public View findViewById(int id) {
- return contentContainer.findViewById(id);
- }
-
- public void createDialog() {
- if (dialogView != null) {
- mDialog = new Dialog(context, R.style.custom_dialog2);
- mDialog.setCancelable(mPickerOptions.cancelable);//不能点外面取消,也不能点back取消
- mDialog.setContentView(dialogView);
-
- Window dialogWindow = mDialog.getWindow();
- WindowManager m = ((Activity) context).getWindowManager();
- Display d = m.getDefaultDisplay();
- WindowManager.LayoutParams p = dialogWindow.getAttributes();
- p.height = (int) (d.getHeight() * 0.9);
- p.width = (int) (d.getWidth() * 0.3);
- dialogWindow.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
- dialogWindow.setAttributes(p);
- if (dialogWindow != null) {
- dialogWindow.setWindowAnimations(R.style.picker_view_scale_anim);
- dialogWindow.setGravity(Gravity.CENTER);//可以改成Bottom
- }
-
- mDialog.setOnDismissListener(dialog -> {
- if (onDismissListener != null) {
- onDismissListener.onDismiss(BaseCustomHPickerView.this);
- }
- });
- }
- }
-
- private void showDialog() {
- if (mDialog != null) {
- mDialog.show();
- }
- }
-
- private void dismissDialog() {
- if (mDialog != null) {
- mDialog.dismiss();
- }
- }
-
- public ViewGroup getDialogContainerLayout() {
- return contentContainer;
- }
-
-
- public Dialog getDialog() {
- return mDialog;
- }
-
-
- public boolean isDialog() {
- return false;
- }
-}
diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/views/BaseCustomPickerView.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/views/BaseCustomPickerView.java
deleted file mode 100755
index 3f3071d..0000000
--- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/views/BaseCustomPickerView.java
+++ /dev/null
@@ -1,354 +0,0 @@
-package com.sucstepsoft.cm_utils.core.widget.views;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.app.Dialog;
-import android.content.Context;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
-import android.view.Display;
-import android.view.Gravity;
-import android.view.KeyEvent;
-import android.view.LayoutInflater;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.view.WindowManager;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
-import android.widget.FrameLayout;
-
-import com.bigkoo.pickerview.configure.PickerOptions;
-import com.bigkoo.pickerview.listener.OnDismissListener;
-import com.bigkoo.pickerview.utils.PickerViewAnimateUtil;
-import com.sucstepsoft.cm_utils.R;
-
-public class BaseCustomPickerView {
- private Context context;
- protected ViewGroup contentContainer;
- private ViewGroup rootView;//附加View 的 根View
- private ViewGroup dialogView;//附加Dialog 的 根View
-
- protected PickerOptions mPickerOptions;
- private OnDismissListener onDismissListener;
- private boolean dismissing;
-
- private Animation outAnim;
- private Animation inAnim;
- private boolean isShowing;
-
- protected int animGravity = Gravity.BOTTOM;
-
- private Dialog mDialog;
- protected View clickView;//是通过哪个View弹出的
- private boolean isAnim = true;
-
- public BaseCustomPickerView(Context context) {
- this.context = context;
- }
-
-
- protected void initViews() {
-
- FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(
- ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.BOTTOM);
-
- LayoutInflater layoutInflater = LayoutInflater.from(context);
- if (isDialog()) {
-
- //如果是对话框模式
- dialogView = (ViewGroup) layoutInflater.inflate(R.layout.layout_basepickerview, null, false);
- //设置界面的背景为透明
- dialogView.setBackgroundColor(Color.TRANSPARENT);
- //这个是真正要加载选择器的父布局
- contentContainer = (ViewGroup) dialogView.findViewById(R.id.content_container);
- //设置对话框 默认左右间距屏幕30
-// params.leftMargin = 10;
-// params.rightMargin = 10;
- contentContainer.setLayoutParams(params);
- //创建对话框
- createDialog();
- //给背景设置点击事件,这样当点击内容以外的地方会关闭界面
- dialogView.setOnClickListener(view -> dismiss());
- } else {
- //如果只是要显示在屏幕的下方
- //decorView是activity的根View,包含 contentView 和 titleView
- if (mPickerOptions.decorView == null) {
- mPickerOptions.decorView = (ViewGroup) ((Activity) context).getWindow().getDecorView();
- }
- //将控件添加到decorView中
- rootView = (ViewGroup) layoutInflater.inflate(R.layout.layout_basepickerview, mPickerOptions.decorView, false);
- rootView.setLayoutParams(new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
- if (mPickerOptions.backgroundId != -1) {
- rootView.setBackgroundColor(mPickerOptions.backgroundId);
- }
- //这个是真正要加载时间选取器的父布局
- contentContainer = (ViewGroup) rootView.findViewById(R.id.content_container);
- contentContainer.setLayoutParams(params);
- }
- setKeyBackCancelable(true);
- }
-
- protected void initAnim() {
- inAnim = getInAnimation();
- outAnim = getOutAnimation();
- }
-
- protected void initEvents() {
- }
-
-
- /**
- * @param v (是通过哪个View弹出的)
- * @param isAnim 是否显示动画效果
- */
- public void show(View v, boolean isAnim) {
- this.clickView = v;
- this.isAnim = isAnim;
- show();
- }
-
- public void show(boolean isAnim) {
- this.isAnim = isAnim;
- show();
- }
-
- public void show(View v) {
- this.clickView = v;
- show();
- }
-
-
- /**
- * 添加View到根视图
- */
- public void show() {
- if (isDialog()) {
- showDialog();
- } else {
- if (isShowing()) {
- return;
- }
- isShowing = true;
- onAttached(rootView);
- rootView.requestFocus();
- }
- }
-
-
- /**
- * show的时候调用
- *
- * @param view 这个View
- */
- private void onAttached(View view) {
- mPickerOptions.decorView.addView(view);
- if (isAnim) {
- contentContainer.startAnimation(inAnim);
- }
- }
-
-
- /**
- * 检测该View是不是已经添加到根视图
- *
- * @return 如果视图已经存在该View返回true
- */
- public boolean isShowing() {
- if (isDialog()) {
- return false;
- } else {
- return rootView.getParent() != null || isShowing;
- }
-
- }
-
- public void dismiss() {
- if (isDialog()) {
- dismissDialog();
- } else {
- if (dismissing) {
- return;
- }
-
- if (isAnim) {
- //消失动画
- outAnim.setAnimationListener(new Animation.AnimationListener() {
- @Override
- public void onAnimationStart(Animation animation) {
-
- }
-
- @Override
- public void onAnimationEnd(Animation animation) {
- dismissImmediately();
- }
-
- @Override
- public void onAnimationRepeat(Animation animation) {
-
- }
- });
- contentContainer.startAnimation(outAnim);
- } else {
- dismissImmediately();
- }
- dismissing = true;
- }
-
-
- }
-
- public void dismissImmediately() {
-
- mPickerOptions.decorView.post(new Runnable() {
- @Override
- public void run() {
- //从根视图移除
- mPickerOptions.decorView.removeView(rootView);
- isShowing = false;
- dismissing = false;
- if (onDismissListener != null) {
- onDismissListener.onDismiss(BaseCustomPickerView.this);
- }
- }
- });
-
-
- }
-
- private Animation getInAnimation() {
- int res = PickerViewAnimateUtil.getAnimationResource(this.animGravity, true);
- return AnimationUtils.loadAnimation(context, res);
- }
-
- private Animation getOutAnimation() {
- int res = PickerViewAnimateUtil.getAnimationResource(this.animGravity, false);
- return AnimationUtils.loadAnimation(context, res);
- }
-
- public BaseCustomPickerView setOnDismissListener(OnDismissListener onDismissListener) {
- this.onDismissListener = onDismissListener;
- return this;
- }
-
- public void setKeyBackCancelable(boolean isCancelable) {
-
- ViewGroup View;
- if (isDialog()) {
- View = dialogView;
- } else {
- View = rootView;
- }
-
- View.setFocusable(isCancelable);
- View.setFocusableInTouchMode(isCancelable);
- if (isCancelable) {
- View.setOnKeyListener(onKeyBackListener);
- } else {
- View.setOnKeyListener(null);
- }
- }
-
- private View.OnKeyListener onKeyBackListener = (v, keyCode, event) -> {
- if (keyCode == KeyEvent.KEYCODE_BACK && event.getAction() == MotionEvent.ACTION_DOWN && isShowing()) {
- dismiss();
- return true;
- }
- return false;
- };
-
- protected BaseCustomPickerView setOutSideCancelable(boolean isCancelable) {
-
- if (rootView != null) {
- View view = rootView.findViewById(R.id.outmost_container);
-
- if (isCancelable) {
- view.setOnTouchListener(onCancelableTouchListener);
- } else {
- view.setOnTouchListener(null);
- }
- }
-
- return this;
- }
-
- /**
- * 设置对话框模式是否可以点击外部取消
- */
- public void setDialogOutSideCancelable() {
- if (mDialog != null) {
- mDialog.setCancelable(mPickerOptions.cancelable);
- }
- }
-
-
- /**
- * Called when the user touch on black overlay, in order to dismiss the dialog.
- */
- @SuppressLint("ClickableViewAccessibility")
- private final View.OnTouchListener onCancelableTouchListener = (v, event) -> {
- if (event.getAction() == MotionEvent.ACTION_DOWN) {
- dismiss();
- }
- return false;
- };
-
- public View findViewById(int id) {
- return contentContainer.findViewById(id);
- }
-
- public void createDialog() {
- if (dialogView != null) {
- mDialog = new Dialog(context, R.style.custom_dialog2);
- mDialog.setCancelable(mPickerOptions.cancelable);//不能点外面取消,也不能点back取消
- mDialog.setContentView(dialogView);
-
- Window dialogWindow = mDialog.getWindow();
- WindowManager m = ((Activity) context).getWindowManager();
- Display d = m.getDefaultDisplay();
- WindowManager.LayoutParams p = dialogWindow.getAttributes();
- p.height = (int) (d.getHeight() * 0.5);
- p.width = (int) (d.getWidth() * 0.9);
- dialogWindow.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
- dialogWindow.setAttributes(p);
- if (dialogWindow != null) {
- dialogWindow.setWindowAnimations(R.style.picker_view_scale_anim);
- dialogWindow.setGravity(Gravity.CENTER);//可以改成Bottom
- }
-
- mDialog.setOnDismissListener(dialog -> {
- if (onDismissListener != null) {
- onDismissListener.onDismiss(BaseCustomPickerView.this);
- }
- });
- }
- }
-
- private void showDialog() {
- if (mDialog != null) {
- mDialog.show();
- }
- }
-
- private void dismissDialog() {
- if (mDialog != null) {
- mDialog.dismiss();
- }
- }
-
- public ViewGroup getDialogContainerLayout() {
- return contentContainer;
- }
-
-
- public Dialog getDialog() {
- return mDialog;
- }
-
-
- public boolean isDialog() {
- return false;
- }
-}
diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/views/CustomPickerBuilder.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/views/CustomPickerBuilder.java
deleted file mode 100755
index 6509ca2..0000000
--- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/views/CustomPickerBuilder.java
+++ /dev/null
@@ -1,247 +0,0 @@
-package com.sucstepsoft.cm_utils.core.widget.views;
-
-import android.content.Context;
-import android.graphics.Typeface;
-import android.view.ViewGroup;
-
-import com.bigkoo.pickerview.configure.PickerOptions;
-import com.bigkoo.pickerview.listener.CustomListener;
-import com.bigkoo.pickerview.listener.OnOptionsSelectChangeListener;
-import com.bigkoo.pickerview.listener.OnOptionsSelectListener;
-
-public class CustomPickerBuilder {
- //配置类
- private PickerOptions mPickerOptions;
-
-
- //Required
- public CustomPickerBuilder(Context context, OnOptionsSelectListener listener) {
- mPickerOptions = new PickerOptions(PickerOptions.TYPE_PICKER_OPTIONS);
- mPickerOptions.context = context;
- mPickerOptions.optionsSelectListener = listener;
- }
-
- //Option
- public CustomPickerBuilder setSubmitText(String textContentConfirm) {
- mPickerOptions.textContentConfirm = textContentConfirm;
- return this;
- }
-
- public CustomPickerBuilder setCancelText(String textContentCancel) {
- mPickerOptions.textContentCancel = textContentCancel;
- return this;
- }
-
- public CustomPickerBuilder setTitleText(String textContentTitle) {
- mPickerOptions.textContentTitle = textContentTitle;
- return this;
- }
-
- public CustomPickerBuilder isDialog(boolean isDialog) {
- mPickerOptions.isDialog = isDialog;
- return this;
- }
-
- public CustomPickerBuilder setSubmitColor(int textColorConfirm) {
- mPickerOptions.textColorConfirm = textColorConfirm;
- return this;
- }
-
- public CustomPickerBuilder setCancelColor(int textColorCancel) {
- mPickerOptions.textColorCancel = textColorCancel;
- return this;
- }
-
- /**
- * 显示时的外部背景色颜色,默认是灰色
- *
- * @param backgroundId color resId.
- * @return
- */
- public CustomPickerBuilder setBackgroundId(int backgroundId) {
- mPickerOptions.backgroundId = backgroundId;
- return this;
- }
-
- /**
- * ViewGroup 类型
- * 设置PickerView的显示容器
- *
- * @param decorView Parent View.
- * @return
- */
- public CustomPickerBuilder setDecorView(ViewGroup decorView) {
- mPickerOptions.decorView = decorView;
- return this;
- }
-
- public CustomPickerBuilder setLayoutRes(int res, CustomListener listener) {
- mPickerOptions.layoutRes = res;
- mPickerOptions.customListener = listener;
- return this;
- }
-
- public CustomPickerBuilder setBgColor(int bgColorWheel) {
- mPickerOptions.bgColorWheel = bgColorWheel;
- return this;
- }
-
- public CustomPickerBuilder setTitleBgColor(int bgColorTitle) {
- mPickerOptions.bgColorTitle = bgColorTitle;
- return this;
- }
-
- public CustomPickerBuilder setTitleColor(int textColorTitle) {
- mPickerOptions.textColorTitle = textColorTitle;
- return this;
- }
-
- public CustomPickerBuilder setSubCalSize(int textSizeSubmitCancel) {
- mPickerOptions.textSizeSubmitCancel = textSizeSubmitCancel;
- return this;
- }
-
- public CustomPickerBuilder setTitleSize(int textSizeTitle) {
- mPickerOptions.textSizeTitle = textSizeTitle;
- return this;
- }
-
- public CustomPickerBuilder setContentTextSize(int textSizeContent) {
- mPickerOptions.textSizeContent = textSizeContent;
- return this;
- }
-
- public CustomPickerBuilder setOutSideCancelable(boolean cancelable) {
- mPickerOptions.cancelable = cancelable;
- return this;
- }
-
-
- public CustomPickerBuilder setLabels(String label1, String label2, String label3) {
- mPickerOptions.label1 = label1;
- mPickerOptions.label2 = label2;
- mPickerOptions.label3 = label3;
- return this;
- }
-
- /**
- * 设置Item 的间距倍数，用于控制 Item 高度间隔
- *
- * @param lineSpacingMultiplier 浮点型，1.0-4.0f 之间有效,超过则取极值。
- */
- public CustomPickerBuilder setLineSpacingMultiplier(float lineSpacingMultiplier) {
- mPickerOptions.lineSpacingMultiplier = lineSpacingMultiplier;
- return this;
- }
-
- /**
- * Set item divider line type color.
- *
- * @param dividerColor color resId.
- */
- public CustomPickerBuilder setDividerColor(int dividerColor) {
- mPickerOptions.dividerColor = dividerColor;
- return this;
- }
-
-// /**
-// * Set item divider line type.
-// *
-// * @param dividerType enum Type {@link WheelView.DividerType}
-// */
-// public CustomPickerBuilder setDividerType(WheelView.DividerType dividerType) {
-// mPickerOptions.dividerType = dividerType;
-// return this;
-// }
-
- /**
- * Set the textColor of selected item.
- *
- * @param textColorCenter color res.
- */
- public CustomPickerBuilder setTextColorCenter(int textColorCenter) {
- mPickerOptions.textColorCenter = textColorCenter;
- return this;
- }
-
- /**
- * Set the textColor of outside item.
- *
- * @param textColorOut color resId.
- */
- public CustomPickerBuilder setTextColorOut(int textColorOut) {
- mPickerOptions.textColorOut = textColorOut;
- return this;
- }
-
- public CustomPickerBuilder setTypeface(Typeface font) {
- mPickerOptions.font = font;
- return this;
- }
-
- public CustomPickerBuilder setCyclic(boolean cyclic1, boolean cyclic2, boolean cyclic3) {
- mPickerOptions.cyclic1 = cyclic1;
- mPickerOptions.cyclic2 = cyclic2;
- mPickerOptions.cyclic3 = cyclic3;
- return this;
- }
-
- public CustomPickerBuilder setSelectOptions(int option1) {
- mPickerOptions.option1 = option1;
- return this;
- }
-
- public CustomPickerBuilder setSelectOptions(int option1, int option2) {
- mPickerOptions.option1 = option1;
- mPickerOptions.option2 = option2;
- return this;
- }
-
- public CustomPickerBuilder setSelectOptions(int option1, int option2, int option3) {
- mPickerOptions.option1 = option1;
- mPickerOptions.option2 = option2;
- mPickerOptions.option3 = option3;
- return this;
- }
-
- public CustomPickerBuilder setTextXOffset(int xoffset_one, int xoffset_two, int xoffset_three) {
- mPickerOptions.x_offset_one = xoffset_one;
- mPickerOptions.x_offset_two = xoffset_two;
- mPickerOptions.x_offset_three = xoffset_three;
- return this;
- }
-
- public CustomPickerBuilder isCenterLabel(boolean isCenterLabel) {
- mPickerOptions.isCenterLabel = isCenterLabel;
- return this;
- }
-
- /**
- * 切换选项时，是否还原第一项
- *
- * @param isRestoreItem true：还原； false: 保持上一个选项
- * @return TimePickerBuilder
- */
- public CustomPickerBuilder isRestoreItem(boolean isRestoreItem) {
- mPickerOptions.isRestoreItem = isRestoreItem;
- return this;
- }
-
- /**
- * @param listener 切换item项滚动停止时，实时回调监听。
- * @return
- */
- public CustomPickerBuilder setOptionsSelectChangeListener(OnOptionsSelectChangeListener listener) {
- mPickerOptions.optionsSelectChangeListener = listener;
- return this;
- }
-
-
- public CustomPickerView build() {
- return new CustomPickerView<>(mPickerOptions);
- }
-
- public CustomPickerBuilder setDialog(int i, int i1) {
- return null;
- }
-}
diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/views/CustomPickerView.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/views/CustomPickerView.java
deleted file mode 100755
index 680f08a..0000000
--- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/views/CustomPickerView.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package com.sucstepsoft.cm_utils.core.widget.views;
-
-import android.content.Context;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-import com.bigkoo.pickerview.configure.PickerOptions;
-import com.bigkoo.pickerview.view.WheelOptions;
-import com.sucstepsoft.cm_utils.R;
-
-import java.util.List;
-
-public class CustomPickerView extends BaseCustomPickerView implements View.OnClickListener {
- private WheelOptions wheelOptions;
-
- private static final String TAG_SUBMIT = "submit";
- private static final String TAG_CANCEL = "cancel";
-
- public CustomPickerView(PickerOptions pickerOptions) {
- super(pickerOptions.context);
- mPickerOptions = pickerOptions;
- initView(pickerOptions.context);
- }
-
-
- private void initView(Context context) {
- setDialogOutSideCancelable();
- initViews();
- initAnim();
- initEvents();
- if (mPickerOptions.customListener == null) {
- LayoutInflater.from(context).inflate(mPickerOptions.layoutRes, contentContainer);
-
- //顶部标题
- TextView tvTitle = (TextView) findViewById(R.id.tvTitle);
- RelativeLayout rv_top_bar = (RelativeLayout) findViewById(R.id.rv_topbar);
-
- //确定和取消按钮
- Button btnSubmit = (Button) findViewById(R.id.btnSubmit);
- Button btnCancel = (Button) findViewById(R.id.btnCancel);
-
- btnSubmit.setTag(TAG_SUBMIT);
- btnCancel.setTag(TAG_CANCEL);
- btnSubmit.setOnClickListener(this);
- btnCancel.setOnClickListener(this);
-
- //设置文字
- btnSubmit.setText(TextUtils.isEmpty(mPickerOptions.textContentConfirm) ? context.getResources().getString(R.string.pickerview_submit) : mPickerOptions.textContentConfirm);
- btnCancel.setText(TextUtils.isEmpty(mPickerOptions.textContentCancel) ? context.getResources().getString(R.string.pickerview_cancel) : mPickerOptions.textContentCancel);
- tvTitle.setText(TextUtils.isEmpty(mPickerOptions.textContentTitle) ? "" : mPickerOptions.textContentTitle);//默认为空
-
- //设置color
- btnSubmit.setTextColor(mPickerOptions.textColorConfirm);
- btnCancel.setTextColor(mPickerOptions.textColorCancel);
- tvTitle.setTextColor(mPickerOptions.textColorTitle);
- rv_top_bar.setBackgroundColor(mPickerOptions.bgColorTitle);
-
- //设置文字大小
- btnSubmit.setTextSize(mPickerOptions.textSizeSubmitCancel);
- btnCancel.setTextSize(mPickerOptions.textSizeSubmitCancel);
- tvTitle.setTextSize(mPickerOptions.textSizeTitle);
- } else {
- mPickerOptions.customListener.customLayout(LayoutInflater.from(context).inflate(mPickerOptions.layoutRes, contentContainer));
- }
-
- // ----滚轮布局
- final LinearLayout optionsPicker = (LinearLayout) findViewById(R.id.optionspicker);
- optionsPicker.setBackgroundColor(mPickerOptions.bgColorWheel);
-
- wheelOptions = new WheelOptions(optionsPicker, mPickerOptions.isRestoreItem);
- if (mPickerOptions.optionsSelectChangeListener != null) {
- wheelOptions.setOptionsSelectChangeListener(mPickerOptions.optionsSelectChangeListener);
- }
-
- wheelOptions.setTextContentSize(mPickerOptions.textSizeContent);
- wheelOptions.setLabels(mPickerOptions.label1, mPickerOptions.label2, mPickerOptions.label3);
- wheelOptions.setTextXOffset(mPickerOptions.x_offset_one, mPickerOptions.x_offset_two, mPickerOptions.x_offset_three);
- wheelOptions.setCyclic(mPickerOptions.cyclic1, mPickerOptions.cyclic2, mPickerOptions.cyclic3);
- wheelOptions.setTypeface(mPickerOptions.font);
-
- setOutSideCancelable(mPickerOptions.cancelable);
-
- wheelOptions.setDividerColor(mPickerOptions.dividerColor);
-// wheelOptions.setDividerType(mPickerOptions.dividerType);
- wheelOptions.setLineSpacingMultiplier(mPickerOptions.lineSpacingMultiplier);
- wheelOptions.setTextColorOut(mPickerOptions.textColorOut);
- wheelOptions.setTextColorCenter(mPickerOptions.textColorCenter);
- wheelOptions.isCenterLabel(mPickerOptions.isCenterLabel);
- }
-
- /**
- * 动态设置标题
- *
- * @param text 标题文本内容
- */
- public void setTitleText(String text) {
- TextView tvTitle = (TextView) findViewById(R.id.tvTitle);
- if (tvTitle != null) {
- tvTitle.setText(text);
- }
- }
-
- /**
- * 设置默认选中项
- *
- * @param option1
- */
- public void setSelectOptions(int option1) {
- mPickerOptions.option1 = option1;
- reSetCurrentItems();
- }
-
-
- public void setSelectOptions(int option1, int option2) {
- mPickerOptions.option1 = option1;
- mPickerOptions.option2 = option2;
- reSetCurrentItems();
- }
-
- public void setSelectOptions(int option1, int option2, int option3) {
- mPickerOptions.option1 = option1;
- mPickerOptions.option2 = option2;
- mPickerOptions.option3 = option3;
- reSetCurrentItems();
- }
-
- private void reSetCurrentItems() {
- if (wheelOptions != null) {
- wheelOptions.setCurrentItems(mPickerOptions.option1, mPickerOptions.option2, mPickerOptions.option3);
- }
- }
-
- public void setPicker(List optionsItems) {
- this.setPicker(optionsItems, null, null);
- }
-
- public void setPicker(List options1Items, List> options2Items) {
- this.setPicker(options1Items, options2Items, null);
- }
-
- public void setPicker(List options1Items,
- List> options2Items,
- List>> options3Items) {
-
- wheelOptions.setPicker(options1Items, options2Items, options3Items);
- reSetCurrentItems();
- }
-
-
- //不联动情况下调用
- public void setNPicker(List options1Items,
- List options2Items,
- List options3Items) {
-
- wheelOptions.setLinkage(false);
- wheelOptions.setNPicker(options1Items, options2Items, options3Items);
- reSetCurrentItems();
- }
-
- @Override
- public void onClick(View v) {
- String tag = (String) v.getTag();
- if (tag.equals(TAG_SUBMIT)) {
- returnData();
- }
- dismiss();
- }
-
- //抽离接口回调的方法
- public void returnData() {
- if (mPickerOptions.optionsSelectListener != null) {
- int[] optionsCurrentItems = wheelOptions.getCurrentItems();
- mPickerOptions.optionsSelectListener.onOptionsSelect(optionsCurrentItems[0], optionsCurrentItems[1], optionsCurrentItems[2], clickView);
- }
- }
-
-
- @Override
- public boolean isDialog() {
- return mPickerOptions.isDialog;
- }
-}
diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/views/HCustomPickerBuilder.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/views/HCustomPickerBuilder.java
deleted file mode 100755
index c05f8a3..0000000
--- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/views/HCustomPickerBuilder.java
+++ /dev/null
@@ -1,247 +0,0 @@
-package com.sucstepsoft.cm_utils.core.widget.views;
-
-import android.content.Context;
-import android.graphics.Typeface;
-import android.view.ViewGroup;
-
-import com.bigkoo.pickerview.configure.PickerOptions;
-import com.bigkoo.pickerview.listener.CustomListener;
-import com.bigkoo.pickerview.listener.OnOptionsSelectChangeListener;
-import com.bigkoo.pickerview.listener.OnOptionsSelectListener;
-
-public class HCustomPickerBuilder {
- //配置类
- private PickerOptions mPickerOptions;
-
-
- //Required
- public HCustomPickerBuilder(Context context, OnOptionsSelectListener listener) {
- mPickerOptions = new PickerOptions(PickerOptions.TYPE_PICKER_OPTIONS);
- mPickerOptions.context = context;
- mPickerOptions.optionsSelectListener = listener;
- }
-
- //Option
- public HCustomPickerBuilder setSubmitText(String textContentConfirm) {
- mPickerOptions.textContentConfirm = textContentConfirm;
- return this;
- }
-
- public HCustomPickerBuilder setCancelText(String textContentCancel) {
- mPickerOptions.textContentCancel = textContentCancel;
- return this;
- }
-
- public HCustomPickerBuilder setTitleText(String textContentTitle) {
- mPickerOptions.textContentTitle = textContentTitle;
- return this;
- }
-
- public HCustomPickerBuilder isDialog(boolean isDialog) {
- mPickerOptions.isDialog = isDialog;
- return this;
- }
-
- public HCustomPickerBuilder setSubmitColor(int textColorConfirm) {
- mPickerOptions.textColorConfirm = textColorConfirm;
- return this;
- }
-
- public HCustomPickerBuilder setCancelColor(int textColorCancel) {
- mPickerOptions.textColorCancel = textColorCancel;
- return this;
- }
-
- /**
- * 显示时的外部背景色颜色,默认是灰色
- *
- * @param backgroundId color resId.
- * @return
- */
- public HCustomPickerBuilder setBackgroundId(int backgroundId) {
- mPickerOptions.backgroundId = backgroundId;
- return this;
- }
-
- /**
- * ViewGroup 类型
- * 设置PickerView的显示容器
- *
- * @param decorView Parent View.
- * @return
- */
- public HCustomPickerBuilder setDecorView(ViewGroup decorView) {
- mPickerOptions.decorView = decorView;
- return this;
- }
-
- public HCustomPickerBuilder setLayoutRes(int res, CustomListener listener) {
- mPickerOptions.layoutRes = res;
- mPickerOptions.customListener = listener;
- return this;
- }
-
- public HCustomPickerBuilder setBgColor(int bgColorWheel) {
- mPickerOptions.bgColorWheel = bgColorWheel;
- return this;
- }
-
- public HCustomPickerBuilder setTitleBgColor(int bgColorTitle) {
- mPickerOptions.bgColorTitle = bgColorTitle;
- return this;
- }
-
- public HCustomPickerBuilder setTitleColor(int textColorTitle) {
- mPickerOptions.textColorTitle = textColorTitle;
- return this;
- }
-
- public HCustomPickerBuilder setSubCalSize(int textSizeSubmitCancel) {
- mPickerOptions.textSizeSubmitCancel = textSizeSubmitCancel;
- return this;
- }
-
- public HCustomPickerBuilder setTitleSize(int textSizeTitle) {
- mPickerOptions.textSizeTitle = textSizeTitle;
- return this;
- }
-
- public HCustomPickerBuilder setContentTextSize(int textSizeContent) {
- mPickerOptions.textSizeContent = textSizeContent;
- return this;
- }
-
- public HCustomPickerBuilder setOutSideCancelable(boolean cancelable) {
- mPickerOptions.cancelable = cancelable;
- return this;
- }
-
-
- public HCustomPickerBuilder setLabels(String label1, String label2, String label3) {
- mPickerOptions.label1 = label1;
- mPickerOptions.label2 = label2;
- mPickerOptions.label3 = label3;
- return this;
- }
-
- /**
- * 设置Item 的间距倍数，用于控制 Item 高度间隔
- *
- * @param lineSpacingMultiplier 浮点型，1.0-4.0f 之间有效,超过则取极值。
- */
- public HCustomPickerBuilder setLineSpacingMultiplier(float lineSpacingMultiplier) {
- mPickerOptions.lineSpacingMultiplier = lineSpacingMultiplier;
- return this;
- }
-
- /**
- * Set item divider line type color.
- *
- * @param dividerColor color resId.
- */
- public HCustomPickerBuilder setDividerColor(int dividerColor) {
- mPickerOptions.dividerColor = dividerColor;
- return this;
- }
-
-// /**
-// * Set item divider line type.
-// *
-// * @param dividerType enum Type {@link WheelView.DividerType}
-// */
-// public HCustomPickerBuilder setDividerType(WheelView.DividerType dividerType) {
-// mPickerOptions.dividerType = dividerType;
-// return this;
-// }
-
- /**
- * Set the textColor of selected item.
- *
- * @param textColorCenter color res.
- */
- public HCustomPickerBuilder setTextColorCenter(int textColorCenter) {
- mPickerOptions.textColorCenter = textColorCenter;
- return this;
- }
-
- /**
- * Set the textColor of outside item.
- *
- * @param textColorOut color resId.
- */
- public HCustomPickerBuilder setTextColorOut(int textColorOut) {
- mPickerOptions.textColorOut = textColorOut;
- return this;
- }
-
- public HCustomPickerBuilder setTypeface(Typeface font) {
- mPickerOptions.font = font;
- return this;
- }
-
- public HCustomPickerBuilder setCyclic(boolean cyclic1, boolean cyclic2, boolean cyclic3) {
- mPickerOptions.cyclic1 = cyclic1;
- mPickerOptions.cyclic2 = cyclic2;
- mPickerOptions.cyclic3 = cyclic3;
- return this;
- }
-
- public HCustomPickerBuilder setSelectOptions(int option1) {
- mPickerOptions.option1 = option1;
- return this;
- }
-
- public HCustomPickerBuilder setSelectOptions(int option1, int option2) {
- mPickerOptions.option1 = option1;
- mPickerOptions.option2 = option2;
- return this;
- }
-
- public HCustomPickerBuilder setSelectOptions(int option1, int option2, int option3) {
- mPickerOptions.option1 = option1;
- mPickerOptions.option2 = option2;
- mPickerOptions.option3 = option3;
- return this;
- }
-
- public HCustomPickerBuilder setTextXOffset(int xoffset_one, int xoffset_two, int xoffset_three) {
- mPickerOptions.x_offset_one = xoffset_one;
- mPickerOptions.x_offset_two = xoffset_two;
- mPickerOptions.x_offset_three = xoffset_three;
- return this;
- }
-
- public HCustomPickerBuilder isCenterLabel(boolean isCenterLabel) {
- mPickerOptions.isCenterLabel = isCenterLabel;
- return this;
- }
-
- /**
- * 切换选项时，是否还原第一项
- *
- * @param isRestoreItem true：还原； false: 保持上一个选项
- * @return TimePickerBuilder
- */
- public HCustomPickerBuilder isRestoreItem(boolean isRestoreItem) {
- mPickerOptions.isRestoreItem = isRestoreItem;
- return this;
- }
-
- /**
- * @param listener 切换item项滚动停止时，实时回调监听。
- * @return
- */
- public HCustomPickerBuilder setOptionsSelectChangeListener(OnOptionsSelectChangeListener listener) {
- mPickerOptions.optionsSelectChangeListener = listener;
- return this;
- }
-
-
- public HCustomPickerView build() {
- return new HCustomPickerView<>(mPickerOptions);
- }
-
- public HCustomPickerBuilder setDialog(int i, int i1) {
- return null;
- }
-}
diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/views/HCustomPickerView.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/views/HCustomPickerView.java
deleted file mode 100755
index 4b92938..0000000
--- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/views/HCustomPickerView.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package com.sucstepsoft.cm_utils.core.widget.views;
-
-import android.content.Context;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-import com.bigkoo.pickerview.configure.PickerOptions;
-import com.bigkoo.pickerview.view.WheelOptions;
-import com.sucstepsoft.cm_utils.R;
-
-import java.util.List;
-
-public class HCustomPickerView extends BaseCustomHPickerView implements View.OnClickListener {
- private WheelOptions wheelOptions;
-
- private static final String TAG_SUBMIT = "submit";
- private static final String TAG_CANCEL = "cancel";
-
- public HCustomPickerView(PickerOptions pickerOptions) {
- super(pickerOptions.context);
- mPickerOptions = pickerOptions;
- initView(pickerOptions.context);
- }
-
-
- private void initView(Context context) {
- setDialogOutSideCancelable();
- initViews();
- initAnim();
- initEvents();
- if (mPickerOptions.customListener == null) {
- LayoutInflater.from(context).inflate(mPickerOptions.layoutRes, contentContainer);
-
- //顶部标题
- TextView tvTitle = (TextView) findViewById(R.id.tvTitle);
- RelativeLayout rv_top_bar = (RelativeLayout) findViewById(R.id.rv_topbar);
-
- //确定和取消按钮
- Button btnSubmit = (Button) findViewById(R.id.btnSubmit);
- Button btnCancel = (Button) findViewById(R.id.btnCancel);
-
- btnSubmit.setTag(TAG_SUBMIT);
- btnCancel.setTag(TAG_CANCEL);
- btnSubmit.setOnClickListener(this);
- btnCancel.setOnClickListener(this);
-
- //设置文字
- btnSubmit.setText(TextUtils.isEmpty(mPickerOptions.textContentConfirm) ? context.getResources().getString(R.string.pickerview_submit) : mPickerOptions.textContentConfirm);
- btnCancel.setText(TextUtils.isEmpty(mPickerOptions.textContentCancel) ? context.getResources().getString(R.string.pickerview_cancel) : mPickerOptions.textContentCancel);
- tvTitle.setText(TextUtils.isEmpty(mPickerOptions.textContentTitle) ? "" : mPickerOptions.textContentTitle);//默认为空
-
- //设置color
- btnSubmit.setTextColor(mPickerOptions.textColorConfirm);
- btnCancel.setTextColor(mPickerOptions.textColorCancel);
- tvTitle.setTextColor(mPickerOptions.textColorTitle);
- rv_top_bar.setBackgroundColor(mPickerOptions.bgColorTitle);
-
- //设置文字大小
- btnSubmit.setTextSize(mPickerOptions.textSizeSubmitCancel);
- btnCancel.setTextSize(mPickerOptions.textSizeSubmitCancel);
- tvTitle.setTextSize(mPickerOptions.textSizeTitle);
- } else {
- mPickerOptions.customListener.customLayout(LayoutInflater.from(context).inflate(mPickerOptions.layoutRes, contentContainer));
- }
-
- // ----滚轮布局
- final LinearLayout optionsPicker = (LinearLayout) findViewById(R.id.optionspicker);
- optionsPicker.setBackgroundColor(mPickerOptions.bgColorWheel);
-
- wheelOptions = new WheelOptions(optionsPicker, mPickerOptions.isRestoreItem);
- if (mPickerOptions.optionsSelectChangeListener != null) {
- wheelOptions.setOptionsSelectChangeListener(mPickerOptions.optionsSelectChangeListener);
- }
-
- wheelOptions.setTextContentSize(mPickerOptions.textSizeContent);
- wheelOptions.setLabels(mPickerOptions.label1, mPickerOptions.label2, mPickerOptions.label3);
- wheelOptions.setTextXOffset(mPickerOptions.x_offset_one, mPickerOptions.x_offset_two, mPickerOptions.x_offset_three);
- wheelOptions.setCyclic(mPickerOptions.cyclic1, mPickerOptions.cyclic2, mPickerOptions.cyclic3);
- wheelOptions.setTypeface(mPickerOptions.font);
-
- setOutSideCancelable(mPickerOptions.cancelable);
-
- wheelOptions.setDividerColor(mPickerOptions.dividerColor);
-// wheelOptions.setDividerType(mPickerOptions.dividerType);
- wheelOptions.setLineSpacingMultiplier(mPickerOptions.lineSpacingMultiplier);
- wheelOptions.setTextColorOut(mPickerOptions.textColorOut);
- wheelOptions.setTextColorCenter(mPickerOptions.textColorCenter);
- wheelOptions.isCenterLabel(mPickerOptions.isCenterLabel);
- }
-
- /**
- * 动态设置标题
- *
- * @param text 标题文本内容
- */
- public void setTitleText(String text) {
- TextView tvTitle = (TextView) findViewById(R.id.tvTitle);
- if (tvTitle != null) {
- tvTitle.setText(text);
- }
- }
-
- /**
- * 设置默认选中项
- *
- * @param option1
- */
- public void setSelectOptions(int option1) {
- mPickerOptions.option1 = option1;
- reSetCurrentItems();
- }
-
-
- public void setSelectOptions(int option1, int option2) {
- mPickerOptions.option1 = option1;
- mPickerOptions.option2 = option2;
- reSetCurrentItems();
- }
-
- public void setSelectOptions(int option1, int option2, int option3) {
- mPickerOptions.option1 = option1;
- mPickerOptions.option2 = option2;
- mPickerOptions.option3 = option3;
- reSetCurrentItems();
- }
-
- private void reSetCurrentItems() {
- if (wheelOptions != null) {
- wheelOptions.setCurrentItems(mPickerOptions.option1, mPickerOptions.option2, mPickerOptions.option3);
- }
- }
-
- public void setPicker(List optionsItems) {
- this.setPicker(optionsItems, null, null);
- }
-
- public void setPicker(List options1Items, List> options2Items) {
- this.setPicker(options1Items, options2Items, null);
- }
-
- public void setPicker(List options1Items,
- List> options2Items,
- List>> options3Items) {
-
- wheelOptions.setPicker(options1Items, options2Items, options3Items);
- reSetCurrentItems();
- }
-
-
- //不联动情况下调用
- public void setNPicker(List options1Items,
- List options2Items,
- List options3Items) {
-
- wheelOptions.setLinkage(false);
- wheelOptions.setNPicker(options1Items, options2Items, options3Items);
- reSetCurrentItems();
- }
-
- @Override
- public void onClick(View v) {
- String tag = (String) v.getTag();
- if (tag.equals(TAG_SUBMIT)) {
- returnData();
- }
- dismiss();
- }
-
- //抽离接口回调的方法
- public void returnData() {
- if (mPickerOptions.optionsSelectListener != null) {
- int[] optionsCurrentItems = wheelOptions.getCurrentItems();
- mPickerOptions.optionsSelectListener.onOptionsSelect(optionsCurrentItems[0], optionsCurrentItems[1], optionsCurrentItems[2], clickView);
- }
- }
-
-
- @Override
- public boolean isDialog() {
- return mPickerOptions.isDialog;
- }
-}
diff --git a/cm_utils/src/main/res/drawable-xhdpi/ic_cb_checked.png b/cm_utils/src/main/res/drawable-xhdpi/ic_cb_checked.png
new file mode 100644
index 0000000..fec766e
Binary files /dev/null and b/cm_utils/src/main/res/drawable-xhdpi/ic_cb_checked.png differ
diff --git a/cm_utils/src/main/res/drawable-xhdpi/ic_cb_unchecked.png b/cm_utils/src/main/res/drawable-xhdpi/ic_cb_unchecked.png
new file mode 100644
index 0000000..dd6618d
Binary files /dev/null and b/cm_utils/src/main/res/drawable-xhdpi/ic_cb_unchecked.png differ
diff --git a/cm_utils/src/main/res/drawable-xhdpi/ic_divid_line_bottom.png b/cm_utils/src/main/res/drawable-xhdpi/ic_divid_line_bottom.png
new file mode 100644
index 0000000..bc02cf1
Binary files /dev/null and b/cm_utils/src/main/res/drawable-xhdpi/ic_divid_line_bottom.png differ
diff --git a/cm_utils/src/main/res/drawable-xhdpi/ic_edit_icon.png b/cm_utils/src/main/res/drawable-xhdpi/ic_edit_icon.png
new file mode 100644
index 0000000..d691718
Binary files /dev/null and b/cm_utils/src/main/res/drawable-xhdpi/ic_edit_icon.png differ
diff --git a/cm_utils/src/main/res/drawable/sel_radio_checkbox.xml b/cm_utils/src/main/res/drawable/sel_radio_checkbox.xml
new file mode 100755
index 0000000..238163e
--- /dev/null
+++ b/cm_utils/src/main/res/drawable/sel_radio_checkbox.xml
@@ -0,0 +1,5 @@
+
+
+