Skip to content

R
RvApp
Commit 1a6a04c0 authored by linfeng's avatar linfeng
Browse files
Options

租车和日历

parent 941a638e
Show whitespace changes
Inline Side-by-side
Showing with 1055 additions and 452 deletions
MyFrame/src/main/java/com/frame/base/url/Constance.java
View file @ 1a6a04c0
......@@ -24,6 +24,7 @@ public final class Constance {
public static final String ACTIVITY_URL_WEBVIEW ="/module/basic/WebActivity";
public static final String ACTIVITY_URL_CARDETAILMAP ="/main/home/CarDetailMapActivity";
public static final String ACTIVITY_URL_CALENDAR ="/plugin/calendar/CalendarActivity";
}
RvClient/build.gradle
View file @ 1a6a04c0
......@@ -7,8 +7,8 @@ android {
applicationId "com.test.rv"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 101
versionName "1.0.1"
versionCode 103
versionName "1.0.3"
multiDexEnabled true
//新版Gradle 是 implementation 为了兼容compile,写上这句话
......
RvWrapper/src/main/res/values/colors.xml
View file @ 1a6a04c0
......@@ -36,6 +36,7 @@
<color name="gray_50000000">#50000000</color>
<color name="gray_EEEEEE">#EEEEEE</color>
<color name="gray_ba242525">#ba242525</color>
<color name="gray_f8f3c9">#F8F3C9</color>
<!--end-->
......
component_control/src/main/java/com/rv/component/control/WheelView.java 0 → 100644
View file @ 1a6a04c0
package com.rv.component.control;
import android.content.Context;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.ColorFilter;
import android.graphics.Paint;
import android.graphics.PixelFormat;
import android.graphics.drawable.Drawable;
import android.util.AttributeSet;
import android.util.TypedValue;
import android.view.Gravity;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;
import android.widget.ScrollView;
import android.widget.TextView;
import java.util.ArrayList;
import java.util.List;
public class WheelView extends ScrollView {
public static final String TAG = WheelView.class.getSimpleName();
public static class OnWheelViewListener {
public void onSelected(int selectedIndex, String item) {
}
}
private Context context;
private LinearLayout views;
public WheelView(Context context) {
super(context);
init(context);
}
public WheelView(Context context, AttributeSet attrs) {
super(context, attrs);
init(context);
}
public WheelView(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
init(context);
}
List<String> items;
private List<String> getItems() {
return items;
}
public void setItems(List<String> list) {
if (null == items) {
items = new ArrayList<String>();
}
items.clear();
items.addAll(list);
// 前面和后面补全
for (int i = 0; i < offset; i++) {
items.add(0, "");
items.add("");
}
initData();
}
public static final int OFF_SET_DEFAULT = 1;
int offset = OFF_SET_DEFAULT; // 偏移量（需要在最前面和最后面补全）
public int getOffset() {
return offset;
}
public void setOffset(int offset) {
this.offset = offset;
}
int displayItemCount; // 每页显示的数量
int selectedIndex = 1;
private void init(Context context) {
this.context = context;
this.setVerticalScrollBarEnabled(false);
views = new LinearLayout(context);
views.setOrientation(LinearLayout.VERTICAL);
this.addView(views);
scrollerTask = new Runnable() {
public void run() {
int newY = getScrollY();
if (initialY - newY == 0) { // stopped
final int remainder = initialY % itemHeight;
final int divided = initialY / itemHeight;
if (remainder == 0) {
selectedIndex = divided + offset;
onSeletedCallBack();
} else {
if (remainder > itemHeight / 2) {
WheelView.this.post(new Runnable() {
@Override
public void run() {
WheelView.this.smoothScrollTo(0, initialY - remainder + itemHeight);
selectedIndex = divided + offset + 1;
onSeletedCallBack();
}
});
} else {
WheelView.this.post(new Runnable() {
@Override
public void run() {
WheelView.this.smoothScrollTo(0, initialY - remainder);
selectedIndex = divided + offset;
onSeletedCallBack();
}
});
}
}
} else {
initialY = getScrollY();
WheelView.this.postDelayed(scrollerTask, newCheck);
}
}
};
// 默认初始不滑动时执行一次回调
if (null != onWheelViewListener) {
onWheelViewListener.onSelected(selectedIndex, items.get(selectedIndex));
}
}
int initialY;
Runnable scrollerTask;
int newCheck = 50;
public void startScrollerTask() {
initialY = getScrollY();
this.postDelayed(scrollerTask, newCheck);
}
private void initData() {
displayItemCount = offset * 2 + 1;
views.removeAllViews();
for (String item : items) {
views.addView(createView(item));
}
refreshItemView(0);
}
int itemHeight = 0;
private TextView createView(String item) {
TextView tv = new TextView(context);
tv.setLayoutParams(new LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
tv.setSingleLine(true);
tv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 16);
tv.setText(item);
tv.setGravity(Gravity.CENTER);
int padding = dip2px(12);
tv.setPadding(padding, padding, padding, padding);
if (0 == itemHeight) {
itemHeight = getViewMeasuredHeight(tv);
views.setLayoutParams(new LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, itemHeight * displayItemCount, Gravity.CENTER_HORIZONTAL));
views.setGravity(Gravity.CENTER);
LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) this.getLayoutParams();
this.setLayoutParams(new LinearLayout.LayoutParams(lp.width, itemHeight * displayItemCount));
}
return tv;
}
@Override
protected void onScrollChanged(int l, int t, int oldl, int oldt) {
super.onScrollChanged(l, t, oldl, oldt);
refreshItemView(t);
if (t > oldt) {
// Log.d(TAG, "向下滚动");
scrollDirection = SCROLL_DIRECTION_DOWN;
} else {
// Log.d(TAG, "向上滚动");
scrollDirection = SCROLL_DIRECTION_UP;
}
}
private void refreshItemView(int y) {
int position = y / itemHeight + offset;
int remainder = y % itemHeight;
int divided = y / itemHeight;
if (remainder == 0) {
position = divided + offset;
} else {
if (remainder > itemHeight / 2) {
position = divided + offset + 1;
}
}
int childSize = views.getChildCount();
for (int i = 0; i < childSize; i++) {
TextView itemView = (TextView) views.getChildAt(i);
if (null == itemView) {
return;
}
if (position == i) {
itemView.setTextColor(Color.parseColor("#171413"));
} else {
itemView.setTextColor(Color.parseColor("#999999"));
}
}
}
/**
* 获取选中区域的边界
*/
int[] selectedAreaBorder;
private int[] obtainSelectedAreaBorder() {
if (null == selectedAreaBorder) {
selectedAreaBorder = new int[2];
selectedAreaBorder[0] = itemHeight * offset;
selectedAreaBorder[1] = itemHeight * (offset + 1);
}
return selectedAreaBorder;
}
private int scrollDirection = -1;
private static final int SCROLL_DIRECTION_UP = 0;
private static final int SCROLL_DIRECTION_DOWN = 1;
Paint paint;
int viewWidth;
@Override
public void setBackgroundDrawable(Drawable background) {
if (viewWidth == 0) {
// viewWidth = ((Activity) context).getWindowManager().getDefaultDisplay().getWidth();
viewWidth = views.getWidth();
}
if (null == paint) {
paint = new Paint();
paint.setColor(Color.parseColor("#CCCCCC"));
paint.setStrokeWidth(dip2px(1f));
}
background = new Drawable() {
@Override
public void draw(Canvas canvas) {
canvas.drawLine(viewWidth * 1 / 6, obtainSelectedAreaBorder()[0], viewWidth * 5 / 6, obtainSelectedAreaBorder()[0], paint);
canvas.drawLine(viewWidth * 1 / 6, obtainSelectedAreaBorder()[1], viewWidth * 5 / 6, obtainSelectedAreaBorder()[1], paint);
}
@Override
public void setAlpha(int alpha) {
}
@Override
public void setColorFilter(ColorFilter cf) {
}
@Override
public int getOpacity() {
return PixelFormat.UNKNOWN;
}
};
super.setBackgroundDrawable(background);
}
@Override
protected void onSizeChanged(int w, int h, int oldw, int oldh) {
super.onSizeChanged(w, h, oldw, oldh);
viewWidth = w;
setBackgroundDrawable(null);
}
/**
* 选中回调
*/
private void onSeletedCallBack() {
if (null != onWheelViewListener) {
onWheelViewListener.onSelected(selectedIndex, items.get(selectedIndex));
}
}
public void setSeletion(int position) {
final int p = position;
selectedIndex = p + offset;
this.post(new Runnable() {
@Override
public void run() {
WheelView.this.smoothScrollTo(0, p * itemHeight);
}
});
}
public String getSeletedItem() {
return items.get(selectedIndex);
}
public int getSeletedIndex() {
return selectedIndex - offset;
}
@Override
public void fling(int velocityY) {
super.fling(velocityY / 3);
}
@Override
public boolean onTouchEvent(MotionEvent ev) {
if (ev.getAction() == MotionEvent.ACTION_UP) {
startScrollerTask();
}
return super.onTouchEvent(ev);
}
private OnWheelViewListener onWheelViewListener;
public OnWheelViewListener getOnWheelViewListener() {
return onWheelViewListener;
}
public void setOnWheelViewListener(OnWheelViewListener onWheelViewListener) {
this.onWheelViewListener = onWheelViewListener;
// 默认初始不滑动时执行一次回调
onWheelViewListener.onSelected(selectedIndex, items.get(selectedIndex));
}
private int dip2px(float dpValue) {
final float scale = context.getResources().getDisplayMetrics().density;
return (int) (dpValue * scale + 0.5f);
}
private int getViewMeasuredHeight(View view) {
int width = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED);
int expandSpec = View.MeasureSpec.makeMeasureSpec(Integer.MAX_VALUE >> 2,
View.MeasureSpec.AT_MOST);
view.measure(width, expandSpec);
return view.getMeasuredHeight();
}
}
component_utils/src/main/java/com/rv/component/utils/DateUtils.java
View file @ 1a6a04c0
......@@ -624,6 +624,24 @@ public class DateUtils {
return day;
}
/**
* 将yyyy-MM-dd HH:mm格式成MM-dd
*
* @param dateStr yyyy-MM-dd HH:mm
* @return MM-dd hh:mm
*/
public static String formatDate66(String dateStr) {
String day = "";
try {
Date date = sdf7.parse(dateStr);
day = sdf6.format(date);
} catch (Exception e) {
e.printStackTrace();
}
return day;
}
/**
* 将yyMMddHHmmss格式成yyyy-MM-dd HH:mm:ss
*
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/CarRentalActivity.java
View file @ 1a6a04c0
......@@ -626,7 +626,7 @@ public class CarRentalActivity extends BaseStatusActivity<CommonPresenter> {
dataBean.setEndCityName(endCity);
dataBean.setEndAddr(endAddress);
dataBean.setDriverType(checkBox == true ? 1 : 2);
startActivity(CarRentalListActivity.getIntent(mActivity, latLatitude, lonLongitude, checkBox, dataBean, startTime, endTime));
// startActivity(CarRentalListActivity.getIntent(mActivity, latLatitude, lonLongitude, checkBox, dataBean, startTime, endTime));
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/CarRentalListActivity.java
View file @ 1a6a04c0
......@@ -3,6 +3,7 @@ package com.rv.home.rv.module.ui.main.home;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.content.ContextCompat;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.LinearLayoutManager;
......@@ -12,15 +13,19 @@ import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.alibaba.android.arouter.launcher.ARouter;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.frame.base.url.Constance;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.rv.home.R;
import com.rv.home.R2;
import com.rv.home.rv.module.basic.BaseStatusActivity;
import com.ruiwenliu.wrapper.util.TimeManager;
import com.ruiwenliu.wrapper.util.ViewHolder;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.component.utils.DateUtils;
import com.rv.home.R;
import com.rv.home.R2;
import com.rv.home.rv.module.ApiConfig;
import com.rv.home.rv.module.basic.BaseStatusActivity;
import com.rv.home.rv.module.basic.bean.MultiItemBean;
import com.rv.home.rv.module.basic.presenter.CommonPresenter;
import com.rv.home.rv.module.ui.main.home.adapter.AttributeListAdapter;
......@@ -31,12 +36,14 @@ import com.rv.home.rv.module.ui.main.home.bean.OrderDataBean;
import com.rv.home.rv.module.ui.main.home.dialog.CarAttributePw;
import com.rv.home.rv.module.ui.main.home.dialog.SelectAttributeDialog;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
/**
......@@ -45,48 +52,41 @@ import butterknife.OnClick;
* Desc:租车列表
*/
public class CarRentalListActivity extends BaseStatusActivity<CommonPresenter> implements BaseQuickAdapter.RequestLoadMoreListener {
@BindView(R2.id.tv_brand)
TextView tvBrand;
@BindView(R2.id.iv_brand)
ImageView ivBrand;
@BindView(R2.id.tv_price)
TextView tvPrice;
@BindView(R2.id.iv_price)
ImageView ivPrice;
@BindView(R2.id.tv_seat)
TextView tvSeat;
@BindView(R2.id.iv_seat)
ImageView ivSeat;
@BindView(R2.id.tv_selected)
TextView tvSelected;
@BindView(R2.id.iv_selected)
ImageView ivSelected;
@BindView(R2.id.recyclerView)
RecyclerView recyclerView;
@BindView(R2.id.ll_head_menu)
LinearLayout llHeadMenu;
@BindView(R2.id.tv_get_date)
TextView tvGetDate;
@BindView(R2.id.tv_out_date)
TextView tvOutDate;
@BindView(R2.id.tv_get_address)
TextView tvGetAddress;
@BindView(R2.id.tv_out_address)
TextView tvOutAddress;
public CarRentalListAdapter mAdapter;
private int countPage;
private int mPage;
private double mLat;
private double mLon;
private double outLongitude;
private double outLatitude;
private boolean mBool;
private int selectType;
private CarAttributePw mCarPw;
private CarAttributeListBean attributeListBean;
List<Integer> listScreeningId;//获取筛选的ID
private OrderDataBean dataBean;
private String begDate;
private String endDate;
private List<CarAttributeListBean.DataBean.CataBean.ChildrenBean> childrenBeanList1;
private List<CarAttributeListBean.DataBean.CataBean.ChildrenBean> childrenBeanList2;
private List<CarAttributeListBean.DataBean.CataBean.ChildrenBean> childrenBeanList3;
public static Intent getIntent(Context context, double lat, double lon, boolean bool, OrderDataBean bean, String startTime, String endTime) {
public static Intent getIntent(Context context, double lat, double lon, double outLatitude,double outLongitude, boolean bool, OrderDataBean bean, String startTime, String endTime) {
return new Intent(context, CarRentalListActivity.class)
.putExtra("lat", lat)
.putExtra("lon", lon)
.putExtra("outLatitude",outLatitude)
.putExtra("outLongitude",outLongitude)
.putExtra("bean", bean)
.putExtra("bool", bool)
.putExtra("startTime", startTime)
......@@ -104,10 +104,14 @@ public class CarRentalListActivity extends BaseStatusActivity<CommonPresenter> i
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
titleView.setTitle(mActivity.getString(R.string.rv_select_car));
begDate = intent.getStringExtra("startTime");
endDate = intent.getStringExtra("endTime");
dataBean = (OrderDataBean) intent.getSerializableExtra("bean");
listScreeningId = new ArrayList<>();
mLat = intent.getDoubleExtra("lat", 0);
mLon = intent.getDoubleExtra("lon", 0);
outLatitude =intent.getDoubleExtra("outLatitude",0);
outLongitude =intent.getDoubleExtra("outLongitude",0);
mBool = intent.getBooleanExtra("bool", false);
titleView.setImageResource(R.id.iv_title_right, R.drawable.rv_rentingcar_icon_plat);
titleView.setChildClickListener(R.id.iv_title_right, new View.OnClickListener() {
......@@ -116,6 +120,12 @@ public class CarRentalListActivity extends BaseStatusActivity<CommonPresenter> i
startActivity(ShopShowActivity.getIntent(mActivity, 0, 0));
}
});
tvGetDate.setText("取" + DateUtils.formatDate66(begDate));
tvOutDate.setText("还" + DateUtils.formatDate66(endDate));
tvGetAddress.setText(dataBean.getStartAddr());
tvOutAddress.setText(dataBean.getEndAddr());
mAdapter = new CarRentalListAdapter();
mAdapter.setOnLoadMoreListener(this, recyclerView);
recyclerView.setLayoutManager(new LinearLayoutManager(this));
......@@ -155,33 +165,7 @@ public class CarRentalListActivity extends BaseStatusActivity<CommonPresenter> i
}
private void initData(CarAttributeListBean data) {
childrenBeanList1 = new ArrayList<>();
childrenBeanList2 = new ArrayList<>();
childrenBeanList3 = new ArrayList<>();
if (data != null) {
List<CarAttributeListBean.DataBean.CataBean> cata = data.getData().getCata();
if (cata != null && cata.size() > 1) {
CarAttributeListBean.DataBean.CataBean.ChildrenBean childrenBean1 = new CarAttributeListBean.DataBean.CataBean.ChildrenBean();
childrenBean1.setName("全部");
childrenBean1.setShow(true);
childrenBeanList1.add(childrenBean1);
childrenBeanList1.addAll(cata.get(0).getChildren());
CarAttributeListBean.DataBean.CataBean.ChildrenBean childrenBean2 = new CarAttributeListBean.DataBean.CataBean.ChildrenBean();
childrenBean2.setName("全部");
childrenBean2.setShow(true);
childrenBeanList2.add(childrenBean2);
childrenBeanList2.addAll(cata.get(1).getChildren());
CarAttributeListBean.DataBean.CataBean.ChildrenBean childrenBean3 = new CarAttributeListBean.DataBean.CataBean.ChildrenBean();
childrenBean3.setName("全部");
childrenBean3.setShow(true);
childrenBeanList3.add(childrenBean3);
childrenBeanList3.addAll(cata.get(2).getChildren());
}
}
attributeListBean = data;
initAttr();
// .get(0).getChildren();
}
......@@ -203,19 +187,28 @@ public class CarRentalListActivity extends BaseStatusActivity<CommonPresenter> i
super.onDestroy();
}
@OnClick({R2.id.rl_brand, R2.id.rl_price, R2.id.rl_seat, R2.id.rl_selected})
@OnClick({R2.id.ll_item_select_date, R2.id.ll_item_get_address, R2.id.ll_item_out_address, R2.id.ll_item_filter})
public void onViewClicked(View view) {
int id = view.getId();
if (id == R.id.ll_item_select_date) {
//选择时间
ARouter.getInstance()
.build(Constance.ACTIVITY_URL_CALENDAR)
.withString("begDate", begDate)
.withString("endDate", endDate)
.navigation(mActivity, 109);
} else if (id == R.id.ll_item_get_address) {
//取车地址
startActivityForResult(SelectLocationActivity.getIntent(mActivity, 1, dataBean.getStartCityName(), mLat, mLon, ""), 110);
} else if (id == R.id.ll_item_out_address) {
//还车地址
startActivityForResult(SelectLocationActivity.getIntent(mActivity, 2, dataBean.getStartCityName(), outLatitude, outLongitude, ""), 110);
} else if (id == R.id.ll_item_filter) {
if (attributeListBean == null) {
return;
}
if (view.getId() == R.id.rl_brand) {
setMenuSelect(0, view, childrenBeanList1, tvBrand.getText().toString().trim());
} else if (view.getId() == R.id.rl_price) {
setMenuSelect(1, view, childrenBeanList2, tvPrice.getText().toString().trim());
} else if (view.getId() == R.id.rl_seat) {
setMenuSelect(2, view, childrenBeanList3, tvSeat.getText().toString().trim());
} else if (view.getId() == R.id.rl_selected) {
setMenuSelect(3, view, null, null);
List<MultiItemBean> multiList = new ArrayList<>();
for (CarAttributeListBean.DataBean.CataBean bean : attributeListBean.getData().getCata()) {
......@@ -252,8 +245,13 @@ public class CarRentalListActivity extends BaseStatusActivity<CommonPresenter> i
map.put("limit", 10);
map.put("lat", mLat);
map.put("lon", mLon);
map.put("startDateTamp", dataBean.getStartTime());
map.put("endDateTamp", dataBean.getEndTime());
try {
map.put("startDateTamp", TimeManager.dateToStamp(begDate));
map.put("endDateTamp", TimeManager.dateToStamp(endDate));
} catch (ParseException e) {
e.printStackTrace();
}
mPresenter.getData(RvFrameConfig.VEHICLE_POST, 1, ApiConfig.HTTP_URL_CAR_TYPE_LIST, CarTypeListBean.class, map, true);
}
......@@ -295,17 +293,6 @@ public class CarRentalListActivity extends BaseStatusActivity<CommonPresenter> i
}
}
/**
* 初始化筛选数据
*/
private void initAttr() {
if (attributeListBean != null && attributeListBean.getData().getCata().size() > 0) {
tvBrand.setText(attributeListBean.getData().getCata().get(0).getName());
tvPrice.setText(attributeListBean.getData().getCata().get(1).getName());
tvSeat.setText(attributeListBean.getData().getCata().get(2).getName());
}
}
private void setMenuSelect(int index, View view, List<CarAttributeListBean.DataBean.CataBean.ChildrenBean> list, String attrName) {
// if(mCarPw!=null && mCarPw.isShowing()){
......@@ -345,17 +332,6 @@ public class CarRentalListActivity extends BaseStatusActivity<CommonPresenter> i
public void onItemClick(BaseQuickAdapter adapter, View views, int position) {
// mCarPw.attributeAdapter.setSelectItem(position);
CarAttributeListBean.DataBean.CataBean.ChildrenBean childrenBean = mCarPw.attributeAdapter.getItem(position);
switch (type) {
case 0:
tvBrand.setText(childrenBean.getName());
break;
case 1:
tvPrice.setText(childrenBean.getName());
break;
case 2:
tvSeat.setText(childrenBean.getName());
break;
}
if (listScreeningId != null && listScreeningId.indexOf(childrenBean.getId()) == -1) {
listScreeningId.add(childrenBean.getId());
}
......@@ -386,7 +362,6 @@ public class CarRentalListActivity extends BaseStatusActivity<CommonPresenter> i
public void onClick(View v) {
if (listScreeningId != null) {
listScreeningId.clear();
initAttr();
adapter.resetData();
}
......@@ -398,7 +373,6 @@ public class CarRentalListActivity extends BaseStatusActivity<CommonPresenter> i
if (listScreeningId != null) {
listScreeningId.clear();
listScreeningId = adapter.getSelectId(listScreeningId);
initAttr();
onFresh();
dismiss();
}
......@@ -426,4 +400,22 @@ public class CarRentalListActivity extends BaseStatusActivity<CommonPresenter> i
}
@Override
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (resultCode == 200 && requestCode == 109) {
begDate = data.getStringExtra("begDate");
endDate = data.getStringExtra("endDate");
tvGetDate.setText("取" + DateUtils.formatDate66(begDate));
tvOutDate.setText("还" + DateUtils.formatDate66(endDate));
onFresh();
}
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// TODO: add setContentView(...) invocation
ButterKnife.bind(this);
}
}
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/HomeFragment.java
View file @ 1a6a04c0
......@@ -33,6 +33,7 @@ import com.baidu.mapapi.search.geocode.GeoCodeResult;
import com.baidu.mapapi.search.geocode.GeoCoder;
import com.baidu.mapapi.search.geocode.OnGetGeoCoderResultListener;
import com.baidu.mapapi.search.geocode.ReverseGeoCodeResult;
import com.base.utils.ui.datetime.selector.util.DateUtil;
import com.base.utils.ui.datetime.selector.util.TextUtil;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.frame.base.url.Constance;
......@@ -256,9 +257,11 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
tvGetWeek.setText("周" + MyUtils.getWeek(DateUtils.getCurDate()));
tvOutTime.setText(MyUtils.getFetureDate2(1));
tvOutWeek.setText("周" + MyUtils.getWeek(MyUtils.getFetureDate(1)));
begDate = DateUtils.getCurDate();
endDate = MyUtils.getFetureDate(1);
copyDay = DateUtils.compareDateDay(endDate, begDate) + 1;
begDate = DateUtils.formatDate8(DateUtils.getCurDateTime());
endDate = MyUtils.getFetureDate2(1);
copyDay = DateUtils.compareDateDay(MyUtils.getFetureDate(1), DateUtils.getCurDate()) + 1;
llItemHotRvtour.setSelected(true);
tvItemRvTour.setSelected(true);
......@@ -277,8 +280,6 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
}
});
mAdapter = new HotCarTypeAdapter();
recyclerViewContent.setLayoutManager(new GridLayoutManager(getContext(), 2));
recyclerViewContent.addItemDecoration(new AbSpacesItemDecoration(10));// 分割线。
......@@ -580,7 +581,13 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
// } else {
startActivityForResult(SelectLocationActivity.getIntent(getContext(), 2, outCity, outLatitude, outLongitude, nowCity), TYPE_REQUEST_ADDRESS);
} else if (id == R.id.ll_item_select_data) {
startActivityForResult(CalendarActivity.getIntent(_mActivity), 108);
//选择日期
ARouter.getInstance()
.build(Constance.ACTIVITY_URL_CALENDAR)
.withString("begDate",begDate)
.withString("endDate",endDate)
.navigation(_mActivity,108);
} else if (id == R.id.tv_select_car) {
if (copyDay < 1) {
showToast(getContext().getString(R.string.rv_day_toast));
......@@ -776,11 +783,9 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
} else if (resultCode == 200 && requestCode == 108) {
begDate = data.getStringExtra("begDate");
endDate = data.getStringExtra("endDate");
String begTime = data.getStringExtra("begTime");
String endTime = data.getStringExtra("endTime");
copyDay = DateUtils.compareDateDay(endDate, begDate) + 1;
tvGetTime.setText(begDate + " " + begTime);
tvOutTime.setText(endDate + " " + endTime);
tvGetTime.setText(begDate);
tvOutTime.setText(endDate);
tvGetWeek.setText("周" + MyUtils.getWeek(begDate));
tvOutWeek.setText("周" + MyUtils.getWeek(endDate));
tvDay.setText(String.format("%1$s%2$s", copyDay, getContext().getString(R.string.rv_days)));
......@@ -962,7 +967,7 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
dataBean.setEndCityName(endCity);
dataBean.setEndAddr(endAddress);
dataBean.setDriverType(2);
startActivity(CarRentalListActivity.getIntent(getContext(), latLatitude, lonLongitude, false, dataBean, startTime, endTime));
startActivity(CarRentalListActivity.getIntent(getContext(), latLatitude, lonLongitude,outLatitude,outLongitude, false, dataBean, startTime, endTime));
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/HomePageFragment.java
View file @ 1a6a04c0
......@@ -587,6 +587,6 @@ public class HomePageFragment extends BaseFragment<CommonPresenter> {
dataBean.setEndCityName(endCity);
dataBean.setEndAddr(endAddress);
dataBean.setDriverType(checkBox == true ? 1 : 2);
startActivity(CarRentalListActivity.getIntent(getContext(), latLatitude, lonLongitude, checkBox, dataBean, startTime, endTime));
// startActivity(CarRentalListActivity.getIntent(getContext(), latLatitude, lonLongitude, checkBox, dataBean, startTime, endTime));
}
}
module_home/src/main/res/layout/rv_act_car_rental_list.xml
View file @ 1a6a04c0
......@@ -5,117 +5,175 @@
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".rv.module.ui.main.home.CarRentalListActivity">
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:id="@+id/ll_head_menu"
android:layout_height="wrap_content">
<RelativeLayout
android:id="@+id/rl_brand"
android:layout_weight="1"
android:layout_width="match_parent"
android:layout_height="@dimen/size_50">
android:layout_height="wrap_content"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/ll_item_select_date"
android:layout_width="0dp"
android:layout_height="@dimen/size_50"
android:layout_weight="2"
android:paddingLeft="@dimen/size_2"
android:paddingRight="@dimen/size_2"
android:gravity="center"
android:orientation="vertical">
<TextView
android:layout_centerInParent="true"
android:id="@+id/tv_get_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/text_14"
android:maxLength="4"
android:id="@+id/tv_brand"
android:textColor="@color/textMain"
android:text="@string/rv_car_type_brand"
/>
<ImageView
android:padding="@dimen/size_5"
android:layout_toRightOf="@id/tv_brand"
android:layout_centerInParent="true"
android:id="@+id/iv_brand"
android:src="@drawable/selector_rv_selected"
android:layout_width="@dimen/size_25"
android:layout_height="@dimen/size_25" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_price"
android:layout_weight="1"
android:layout_width="match_parent"
android:layout_height="@dimen/size_50">
android:text="取07/06 11:30"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_10" />
<TextView
android:layout_centerInParent="true"
android:id="@+id/tv_out_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/text_14"
android:id="@+id/tv_price"
android:textColor="@color/textMain"
android:text="@string/rv_car_type_price"
android:maxLength="4"
/>
android:text="还07/06 11:30"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_10" />
</LinearLayout>
<View
android:layout_width="@dimen/size_1"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/size_10"
android:layout_marginBottom="@dimen/size_10"
android:background="@color/colorLine" />
<LinearLayout
android:id="@+id/ll_item_get_address"
android:layout_width="0dp"
android:layout_height="@dimen/size_50"
android:layout_weight="2.5"
android:gravity="center"
android:paddingLeft="@dimen/size_2"
android:paddingRight="@dimen/size_2"
android:orientation="horizontal">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="取车地址"
android:textColor="@color/text_Gray"
android:textSize="@dimen/text_10" />
<TextView
android:id="@+id/tv_get_address"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxEms="8"
android:singleLine="true"
android:ellipsize="end"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_10" />
</LinearLayout>
<ImageView
android:padding="@dimen/size_5"
android:layout_toRightOf="@id/tv_price"
android:layout_centerInParent="true"
android:id="@+id/iv_price"
android:src="@drawable/selector_rv_selected"
android:layout_width="@dimen/size_25"
android:layout_height="@dimen/size_25" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_seat"
android:layout_weight="1"
android:layout_width="match_parent"
android:layout_height="@dimen/size_50">
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/common_icon_rig_black"/>
</LinearLayout>
<View
android:layout_width="@dimen/size_1"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/size_10"
android:layout_marginBottom="@dimen/size_10"
android:background="@color/colorLine" />
<LinearLayout
android:id="@+id/ll_item_out_address"
android:layout_width="0dp"
android:layout_height="@dimen/size_50"
android:layout_weight="2.5"
android:paddingLeft="@dimen/size_2"
android:paddingRight="@dimen/size_2"
android:gravity="center"
android:orientation="horizontal">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_centerInParent="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/text_14"
android:id="@+id/tv_seat"
android:textColor="@color/textMain"
android:text="@string/rv_car_type_seat"
/>
android:text="还车地址"
android:textColor="@color/text_Gray"
android:textSize="@dimen/text_10" />
<TextView
android:id="@+id/tv_out_address"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxEms="8"
android:singleLine="true"
android:ellipsize="end"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_10" />
</LinearLayout>
<ImageView
android:padding="@dimen/size_5"
android:layout_toRightOf="@id/tv_seat"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/common_icon_rig_black"/>
</LinearLayout>
<View
android:layout_width="@dimen/size_1"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/size_10"
android:layout_marginBottom="@dimen/size_10"
android:background="@color/colorLine" />
<LinearLayout
android:id="@+id/ll_item_filter"
android:layout_width="0dp"
android:layout_height="@dimen/size_50"
android:layout_weight="1"
android:paddingLeft="@dimen/size_2"
android:paddingRight="@dimen/size_2"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="@dimen/size_22"
android:layout_height="@dimen/size_22"
android:layout_centerInParent="true"
android:adjustViewBounds="true"
android:maxLength="4"
android:id="@+id/iv_seat"
android:src="@drawable/selector_rv_selected"
android:layout_width="@dimen/size_25"
android:layout_height="@dimen/size_25" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_selected"
android:layout_weight="1"
android:layout_width="match_parent"
android:layout_height="@dimen/size_50">
android:padding="@dimen/size_5"
android:src="@drawable/rv_rentingcar_icon_screen" />
<TextView
android:layout_centerInParent="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/text_14"
android:id="@+id/tv_selected"
android:textColor="@color/textMain"
android:text="@string/rv_car_type_selected"
/>
<ImageView
android:padding="@dimen/size_5"
android:layout_toRightOf="@id/tv_selected"
android:layout_centerInParent="true"
android:id="@+id/iv_selected"
android:maxLength="4"
android:adjustViewBounds="true"
android:src="@drawable/rv_rentingcar_icon_screen"
android:layout_width="@dimen/size_22"
android:layout_height="@dimen/size_22" />
</RelativeLayout>
android:text="@string/rv_car_type_selected"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_10" />
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/size_half"
android:background="@color/colorLine"
/>
android:background="@color/colorLine" />
<android.support.v7.widget.RecyclerView
android:layout_width="match_parent"
android:id="@+id/recyclerView"
android:layout_height="match_parent"/>
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
module_mine/build.gradle
View file @ 1a6a04c0
......@@ -46,4 +46,5 @@ dependencies {
api project(':plugin_version')
//动态权限申请库
implementation 'pub.devrel:easypermissions:1.3.0'
implementation 'com.alibaba:fastjson:1.2.21'
}
module_mine/src/main/java/com/rv/rvmine/MineFragment.java
View file @ 1a6a04c0
......@@ -13,6 +13,8 @@ import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.base.utils.tools.android.IntentUtil;
import com.base.utils.ui.image.round.RoundImageView;
import com.frame.base.browse.ActivityImageBrowseInt;
......@@ -372,7 +374,7 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simp
GlideManager.getInstance(_mActivity).loadImage(info.getHeadimgurl(), ivAvatar);
tvNickname.setText(info.getUsername());
//更新实名信息
UtilsManager.getInstance(_mActivity).setSharePreferencesSave(SPConstance.USER_JSON).putString(SPConstance.USER_JSON_ISCERTIFICATIONSTATUS, String.valueOf(info.getCertificationStatus())).commit();
UtilsManager.getInstance(OkGoUtil.application).setSharePreferencesSave(SPConstance.USER_JSON).putString(SPConstance.USER_JSON_USERINFO, JSON.toJSONString(info)).commit();
if (info.getCertificationStatus() == 0) { //实名认证状态:0-未认证，1-已认证
tvVerified.setText("未实名认证");
tvVerified.setEnabled(true);
......
plugin_calendar/build.gradle
View file @ 1a6a04c0
......@@ -40,5 +40,6 @@ dependencies {
api project(':RvWrapper')
api project(':component_resource')
api project(':component_utils')
api project(':component_control')
}
plugin_calendar/src/main/java/com/rv/plugin/calendar/CalendarActivity.java
View file @ 1a6a04c0
......@@ -6,55 +6,53 @@ import android.graphics.Color;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.alibaba.android.arouter.facade.annotation.Autowired;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.frame.base.url.Constance;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseStatusActivity;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.component.control.WheelView;
import com.rv.component.utils.DateUtils;
import com.rv.component.utils.MyUtils;
import com.rv.plugin.calendar.bean.DateInfo;
import com.rv.plugin.calendar.presenter.CalendarPresenter;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
/**
* 日历
*/
@Route(path = Constance.ACTIVITY_URL_CALENDAR)
public class CalendarActivity extends BaseStatusActivity<CalendarPresenter> {
@BindView(R2.id.v_calendarView)
CalendarView2 vCalendarView;
@BindView(R2.id.tv_calendar_inday)
TextView tvCalendarInday;
@BindView(R2.id.tv_calendar_inweek)
TextView tvCalendarInweek;
@BindView(R2.id.tv_calendar_intime)
TextView tvCalendarIntime;
@BindView(R2.id.tv_calendar_night)
TextView tvCalendarNight;
@BindView(R2.id.tv_calendar_outday)
TextView tvCalendarOutday;
@BindView(R2.id.tv_calendar_outweek)
TextView tvCalendarOutweek;
@BindView(R2.id.tv_calendar_outtime)
TextView tvCalendarOuttime;
@BindView(R2.id.tv_calendar_sl_intime)
TextView tvCalendarSlIntime;
@BindView(R2.id.ll_selecter_intime)
LinearLayout llSelecterIntime;
@BindView(R2.id.ll_selecter_outday)
LinearLayout llSelecterOutday;
@BindView(R2.id.tv_selecter_outday)
TextView tvSelecterOutday;
@BindView(R2.id.tv_get_date)
TextView tvGetDate;
@BindView(R2.id.tv_get_time)
TextView tvGetTime;
@BindView(R2.id.tv_out_date)
TextView tvOutDate;
@BindView(R2.id.tv_out_time)
TextView tvOutTime;
@BindView(R2.id.wheelView_left)
WheelView wheelViewLeft;
@BindView(R2.id.wheelView_right)
WheelView wheelViewRight;
private List<DateInfo> listCalendarDay;
private String begDate, endDate, s_begDate, s_endDate, s_begTime, s_endTime, begDay, begTime, endDay, endTime;
private String s_begDate, s_endDate, s_begTime, s_endTime, begDay, begTime, endDay, endTime;
private Context context;
/**
* 最大的日历期限
......@@ -63,11 +61,17 @@ public class CalendarActivity extends BaseStatusActivity<CalendarPresenter> {
private int spanIndex = 1;
private TimePopView inTime;
private TimePopView2 outTime;
private ArrayList<String> timeList = new ArrayList<>();
@Autowired()
String begDate;
@Autowired()
String endDate;
@Autowired()
int begSelected;
@Autowired()
int endSelected;
public static Intent getIntent(Context context) {
return new Intent(context, CalendarActivity.class);
......@@ -77,12 +81,7 @@ public class CalendarActivity extends BaseStatusActivity<CalendarPresenter> {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
ButterKnife.bind(this);
// setMyTitle("选择日期");
// ibActivityTitleRight.setText("确定");
context = this;
Intent intent = this.getIntent();
begDate = intent.getStringExtra("begDate");
endDate = intent.getStringExtra("endDate");
begDay = DateUtils.formatDate16(begDate);
begTime = DateUtils.formatDate17(begDate);
......@@ -94,17 +93,10 @@ public class CalendarActivity extends BaseStatusActivity<CalendarPresenter> {
s_endTime = endTime;
initTime();
initView();
tvCalendarInday.setText(begDay);
tvCalendarInweek.setText("周" + MyUtils.getWeek(begDay));
tvCalendarIntime.setText(begTime);
tvCalendarSlIntime.setText(begTime);
tvCalendarNight.setText(String.valueOf(DateUtils.compareDateDay(endDay, begDay) +1));
tvCalendarOutday.setText(DateUtils.formatDate15(endDay));
tvCalendarOutweek.setText("周" + MyUtils.getWeek(endDay));
tvCalendarOuttime.setText(endTime);
tvSelecterOutday.setText(endTime);
tvGetTime.setText(begTime);
tvGetDate.setText(DateUtils.formatDate(s_begDate) + "\t星期" + MyUtils.getWeek(s_begDate));
tvOutTime.setText(endTime);
tvOutDate.setText(DateUtils.formatDate(s_endDate) + "\t星期" + MyUtils.getWeek(s_endDate));
listCalendarDay = initDate();
......@@ -112,36 +104,19 @@ public class CalendarActivity extends BaseStatusActivity<CalendarPresenter> {
@Override
public void inClick(DateInfo date) {
s_begDate = date.getDay();
tvCalendarInday.setText(DateUtils.formatDate15(s_begDate));
tvCalendarInweek.setText("周" + MyUtils.getWeek(s_begDate));
tvCalendarNight.setText("0");
String content = DateUtils.formatDate(s_begDate) + "\t星期" + MyUtils.getWeek(s_begDate);
tvGetDate.setText(content);
s_endDate = date.getDay();
tvCalendarOutday.setText(DateUtils.formatDate15(s_endDate));
tvCalendarOutweek.setText("周" + MyUtils.getWeek(s_endDate));
s_endTime = DateUtils.formatDate19(s_begTime);
tvCalendarOuttime.setText(s_endTime);
tvSelecterOutday.setText(s_endTime);
String content2 = DateUtils.formatDate(s_endDate) + "\t星期" + MyUtils.getWeek(s_endDate);
tvOutDate.setText(content2);
}
@Override
public void outClick(DateInfo date) {
s_endDate = date.getDay();
tvCalendarOutday.setText(DateUtils.formatDate15(s_endDate));
tvCalendarOutweek.setText("周" + MyUtils.getWeek(s_endDate));
tvCalendarNight.setText(String.valueOf(DateUtils.compareDateDay(s_endDate, s_begDate) +1));
//如果不是同一天 租和还时间是酒店默认的
if (!s_begDate.equals(s_endDate)) {
// s_begTime = getSaveData(MyConstant.checkinTime);
tvCalendarIntime.setText(s_begTime);
tvCalendarSlIntime.setText(s_begTime);
// s_endTime = getSaveData(MyConstant.checkoutTime);
tvCalendarOuttime.setText(s_endTime);
tvSelecterOutday.setText(s_endTime);
}
String content = DateUtils.formatDate(s_endDate) + "\t星期" + MyUtils.getWeek(s_endDate);
tvOutDate.setText(content);
}
});
......@@ -150,123 +125,82 @@ public class CalendarActivity extends BaseStatusActivity<CalendarPresenter> {
@Override
protected int setLayout() {
return R.layout.activity_calendar;
return R.layout.activity_calendar2;
}
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
titleView.setTitle("选择日期");
titleView.setText(R.id.tv_title_right, "确定");
titleView.setChildClickListener(R.id.tv_title_right, new View.OnClickListener() {
@Override
public void onClick(View v) {
if (TextUtils.isEmpty(s_begDate)){
showToast("请选择租车日期！");
return;
}
if (TextUtils.isEmpty(s_endDate)){
showToast("请选择还车日期！");
return;
}
if (TextUtils.isEmpty(s_begTime)){
showToast("请选择租车时间！");
return;
}
if (TextUtils.isEmpty(s_endTime)){
showToast("请选择还车时间！");
return;
}
Intent intent = new Intent();
intent.putExtra("begDate", s_begDate);
intent.putExtra("endDate", s_endDate );
intent.putExtra("begTime",s_begTime);
intent.putExtra("endTime",s_endTime);
setResult(200, intent);
finish();
}
});
showTitle(false);
}
private void initView() {
//租车时间
inTime = new TimePopView(CalendarActivity.this, timeList, new TimePopView.OnTimeSelectListener() {
@Override
public void onTimeSelect(String date) {
s_begTime = date;
tvCalendarIntime.setText(date);
tvCalendarSlIntime.setText(date);
//如果是同一天，离店时间小于入住时间
if (s_begDate.equals(s_endDate) && DateUtils.formatDate20(s_endTime) <= DateUtils.formatDate20(date)) {
s_endTime = DateUtils.formatDate19(s_begTime);
tvCalendarOuttime.setText(s_endTime);
tvSelecterOutday.setText(s_endTime);
}
wheelViewLeft.setOffset(1);// 对话框中当前项上面和下面的项数
wheelViewLeft.setItems(timeList);// 设置数据源
wheelViewLeft.setOnWheelViewListener(new WheelView.OnWheelViewListener() {
@Override
public void onSelected(int selectedIndex, String item) {
begSelected = selectedIndex;
s_begTime = item;
tvGetTime.setText(item);
}
});
inTime.setCyclic(true);
inTime.setCancelable(true);
inTime.setTitle("租车时间");
//还车时间
outTime = new TimePopView2(CalendarActivity.this, timeList, new TimePopView2.OnTimeSelectListener() {
wheelViewRight.setOffset(1);// 对话框中当前项上面和下面的项数
wheelViewRight.setItems(timeList);// 设置数据源
wheelViewRight.setOnWheelViewListener(new WheelView.OnWheelViewListener() {
@Override
public void onTimeSelect(String date) {
//如果是同一天，离店时间小于入住时间
if (s_begDate.equals(s_endDate) && DateUtils.formatDate20(s_begTime) >= DateUtils.formatDate20(date)) {
return;
public void onSelected(int selectedIndex, String item) {
if (s_begDate.equals(s_endDate) && DateUtils.formatDate20(s_endTime) <= DateUtils.formatDate20(s_begTime)) {
s_endTime = DateUtils.formatDate19(s_begTime);
wheelViewRight.setSeletion(begSelected);
endSelected = begSelected;
tvOutTime.setText(s_endTime);
} else {
s_endTime = item;
tvOutTime.setText(item);
endSelected = selectedIndex;
}
s_endTime = date;
tvCalendarOuttime.setText(date);
tvSelecterOutday.setText(date);
}
});
outTime.setCyclic(true);
outTime.setCancelable(true);
outTime.setTitle("还车时间");
//租车时间选择
llSelecterIntime.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (inTime != null) {
if (timeList != null) {
for (int i = 0; i < timeList.size(); i++) {
if (s_begTime.equals(timeList.get(i))) {
inTime.setCurrentItem(i);
break;
if (timeList.get(i).equals(begTime)){
wheelViewLeft.setSeletion(i);
s_begTime = begTime;
}
if (timeList.get(i).equals(endTime)){
wheelViewRight.setSeletion(i);
s_endTime = endTime;
}
inTime.show();
}
}
});
//还车时间选择
llSelecterOutday.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (outTime != null) {
for (int i = 0; i < timeList.size(); i++) {
if (s_endTime.equals(timeList.get(i))) {
outTime.setCurrentItem(i);
break;
}
}
outTime.show();
}
@OnClick({R2.id.iv_close, R2.id.tv_ok})
public void onViewClicked(View view) {
int id = view.getId();
if (id == R.id.iv_close){
finish();
}else if (id == R.id.tv_ok) {
if (TextUtils.isEmpty(s_begDate)) {
showToast("请选择租车日期！");
return;
}
});
if (TextUtils.isEmpty(s_endDate)) {
showToast("请选择还车日期！");
return;
}
/**
* 初始化时间数据
*/
private void initTime() {
for (int i = 0; i < 24; i++) {
;
timeList.add(String.format("%02d", i) + ":00");
timeList.add(String.format("%02d", i) + ":30");
Intent intent = new Intent();
intent.putExtra("begDate", s_begDate + " " + s_begTime);
intent.putExtra("endDate", s_endDate + " " + s_endTime);
setResult(200, intent);
finish();
}
}
......@@ -347,7 +281,7 @@ public class CalendarActivity extends BaseStatusActivity<CalendarPresenter> {
}
// 公历
day.setDefTextColor(context.getResources().getColor(R.color.ri_mlv));
day.setDefTextColor(context.getResources().getColor(R.color.gren_171413));
// 周末字体颜色
if ((j + firstWeek) % 7 == 0 || (j + firstWeek - 1) % 7 == 0) {
day.setDefTextColor(context.getResources().getColor(R.color.ri_dhong));
......@@ -408,4 +342,15 @@ public class CalendarActivity extends BaseStatusActivity<CalendarPresenter> {
public void onShowResult(int requestType, BaseBean result) {
}
/**
* 初始化时间数据
*/
private void initTime() {
for (int i = 0; i < 24; i++) {
timeList.add(String.format("%02d", i) + ":00");
timeList.add(String.format("%02d", i) + ":30");
}
}
}
plugin_calendar/src/main/java/com/rv/plugin/calendar/InertiaTimerTask.java
View file @ 1a6a04c0
......@@ -7,9 +7,9 @@ final class InertiaTimerTask extends TimerTask
float a;
final float velocityY;
final WheelView loopView;
final WheelView3 loopView;
InertiaTimerTask(WheelView loopview, float velocityY)
InertiaTimerTask(WheelView3 loopview, float velocityY)
{
super();
loopView = loopview;
......
plugin_calendar/src/main/java/com/rv/plugin/calendar/MessageHandler.java
View file @ 1a6a04c0
......@@ -8,9 +8,9 @@ final class MessageHandler extends Handler {
public static final int WHAT_SMOOTH_SCROLL = 2000;
public static final int WHAT_ITEM_SELECTED = 3000;
final WheelView loopview;
final WheelView3 loopview;
MessageHandler(WheelView loopview) {
MessageHandler(WheelView3 loopview) {
this.loopview = loopview;
}
......@@ -22,7 +22,7 @@ final class MessageHandler extends Handler {
break;
case WHAT_SMOOTH_SCROLL:
loopview.smoothScroll(WheelView.ACTION.FLING);
loopview.smoothScroll(WheelView3.ACTION.FLING);
break;
case WHAT_ITEM_SELECTED:
......
plugin_calendar/src/main/java/com/rv/plugin/calendar/OnItemSelectedRunnable.java
View file @ 1a6a04c0
package com.rv.plugin.calendar;
final class OnItemSelectedRunnable implements Runnable {
final WheelView loopView;
final WheelView3 loopView;
OnItemSelectedRunnable(WheelView loopview) {
OnItemSelectedRunnable(WheelView3 loopview) {
loopView = loopview;
}
......
plugin_calendar/src/main/java/com/rv/plugin/calendar/SmoothScrollTimerTask.java
View file @ 1a6a04c0
......@@ -7,9 +7,9 @@ final class SmoothScrollTimerTask extends TimerTask {
int realTotalOffset;
int realOffset;
int offset;
final WheelView loopView;
final WheelView3 loopView;
SmoothScrollTimerTask(WheelView loopview, int offset) {
SmoothScrollTimerTask(WheelView3 loopview, int offset) {
this.loopView = loopview;
this.offset = offset;
realTotalOffset = Integer.MAX_VALUE;
......
plugin_calendar/src/main/java/com/rv/plugin/calendar/WheelTime2.java
View file @ 1a6a04c0
......@@ -10,7 +10,7 @@ import java.util.ArrayList;
public class WheelTime2
{
private View view;
private WheelView wv_hours;
private WheelView3 wv_hours;
private ArrayList<String> timeList;
private String time;
......@@ -29,7 +29,7 @@ public class WheelTime2
public void setPicker(int h)
{
wv_hours = (WheelView) view.findViewById(R.id.hour);
wv_hours = (WheelView3) view.findViewById(R.id.hour);
wv_hours.setAdapter(new ArrayWheelAdapter(timeList,timeList.size()));
/*wv_hours.setCurrentItem(h);
time = timeList.get(h);*/
......
plugin_calendar/src/main/java/com/rv/plugin/calendar/WheelView.java → plugin_calendar/src/main/java/com/rv/plugin/calendar/WheelView3.java
View file @ 1a6a04c0
......@@ -27,7 +27,7 @@ import java.util.concurrent.TimeUnit;
/**
* 3d滚轮控件
*/
public class WheelView extends View
public class WheelView3 extends View
{
public enum ACTION
......@@ -109,12 +109,12 @@ public class WheelView extends View
private static final float CENTERCONTENTOFFSET = 6;// 中间文字文字居中需要此偏移值
private static final String GETPICKERVIEWTEXT = "getPickerViewText";// 反射的方法名
public WheelView(Context context)
public WheelView3(Context context)
{
this(context, null);
}
public WheelView(Context context, AttributeSet attrs)
public WheelView3(Context context, AttributeSet attrs)
{
super(context, attrs);
textColorOut = getResources().getColor(R.color.pickerview_wheelview_textcolor_out);
......
plugin_calendar/src/main/java/com/rv/plugin/calendar/listener/LoopViewGestureListener.java
View file @ 1a6a04c0
......@@ -2,13 +2,13 @@ package com.rv.plugin.calendar.listener;
import android.view.MotionEvent;
import com.rv.plugin.calendar.WheelView;
import com.rv.plugin.calendar.WheelView3;
public final class LoopViewGestureListener extends android.view.GestureDetector.SimpleOnGestureListener {
final WheelView loopView;
final WheelView3 loopView;
public LoopViewGestureListener(WheelView loopview) {
public LoopViewGestureListener(WheelView3 loopview) {
loopView = loopview;
}
......
plugin_calendar/src/main/res/drawable/shape_calender_selectbg.xml
View file @ 1a6a04c0
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="300dp"/>
<solid android:color="@color/colorYellow"/>
<solid android:color="@color/gray_FFB74B"/>
</shape>
\ No newline at end of file
plugin_calendar/src/main/res/layout/activity_calendar2.xml 0 → 100644
View file @ 1a6a04c0
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/size_150"
android:background="@color/gray_FFB74B"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/iv_close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:paddingLeft="@dimen/size_15"
android:paddingTop="@dimen/size_20"
android:paddingRight="@dimen/size_15"
android:paddingBottom="@dimen/size_10"
android:src="@drawable/common_icon_close_white" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginRight="@dimen/size_15"
android:layout_weight="1"
android:orientation="horizontal">
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="取车时间"
android:textColor="@color/gray_f8f3c9"
android:textSize="@dimen/text_12" />
<TextView
android:id="@+id/tv_get_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_5"
android:text="07-10 星期三"
android:textColor="@color/colorWrite"
android:textSize="@dimen/text_16" />
<TextView
android:id="@+id/tv_get_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_5"
android:text="上午10:00"
android:textColor="@color/colorWrite"
android:textSize="@dimen/text_14" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="还车时间"
android:textColor="@color/gray_f8f3c9"
android:textSize="@dimen/text_12" />
<TextView
android:id="@+id/tv_out_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_5"
android:text="07-10 星期三"
android:textColor="@color/colorWrite"
android:textSize="@dimen/text_16" />
<TextView
android:id="@+id/tv_out_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_5"
android:text="上午10:00"
android:textColor="@color/colorWrite"
android:textSize="@dimen/text_14" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="@dimen/size_5"
android:paddingTop="@dimen/size_5"
android:orientation="horizontal" >
<TextView
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="日"
android:textColor="@color/gray_f8f3c9"
android:textSize="@dimen/text_12" />
<TextView
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="一"
android:textColor="@color/gray_f8f3c9"
android:textSize="@dimen/text_12" />
<TextView
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="二"
android:textColor="@color/gray_f8f3c9"
android:textSize="@dimen/text_12" />
<TextView
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="三"
android:textColor="@color/gray_f8f3c9"
android:textSize="@dimen/text_12" />
<TextView
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="四"
android:textColor="@color/gray_f8f3c9"
android:textSize="@dimen/text_12" />
<TextView
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="五"
android:textColor="@color/gray_f8f3c9"
android:textSize="@dimen/text_12" />
<TextView
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="六"
android:textColor="@color/gray_f8f3c9"
android:textSize="@dimen/text_12" />
</LinearLayout>
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_15"
android:background="@color/colorWrite"
android:paddingTop="@dimen/size_5"
android:paddingBottom="@dimen/size_5"
android:text="日期选择"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_16" />
<com.rv.plugin.calendar.CalendarView2
android:id="@+id/v_calendarView"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/size_15"
android:background="@color/gray_f5f5f5" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/size_220"
android:background="@color/colorWrite"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginTop="@dimen/size_15"
android:text="时刻选择"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_16" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="center"
android:orientation="horizontal">
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ems="1"
android:text="取车时刻"
android:textSize="@dimen/text_12" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_10"
android:src="@drawable/common_icon_calendar_righe" />
<com.rv.component.control.WheelView
android:id="@+id/wheelView_left"
android:layout_width="wrap_content"
android:layout_height="wrap_content"></com.rv.component.control.WheelView>
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:orientation="horizontal">
<com.rv.component.control.WheelView
android:id="@+id/wheelView_right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"></com.rv.component.control.WheelView>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/common_icon_calendar_left" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_10"
android:ems="1"
android:text="还车时刻"
android:textSize="@dimen/text_12" />
</LinearLayout>
</LinearLayout>
<TextView
android:id="@+id/tv_ok"
android:layout_width="match_parent"
android:layout_height="@dimen/size_50"
android:background="@color/gray_FFB74B"
android:gravity="center"
android:text="确定"
android:textColor="@color/colorWrite"
android:textSize="@dimen/text_16" />
</LinearLayout>
</LinearLayout>
plugin_calendar/src/main/res/layout/item_calendar_header.xml
View file @ 1a6a04c0
......@@ -21,77 +21,4 @@
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="30dip"
android:orientation="horizontal" >
<TextView
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="日"
android:textColor="@color/ri_dhong"
android:textSize="@dimen/text_12" />
<TextView
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="一"
android:textColor="@color/ri_mlv"
android:textSize="@dimen/text_12" />
<TextView
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="二"
android:textColor="@color/ri_mlv"
android:textSize="@dimen/text_12" />
<TextView
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="三"
android:textColor="@color/ri_mlv"
android:textSize="@dimen/text_12" />
<TextView
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="四"
android:textColor="@color/ri_mlv"
android:textSize="@dimen/text_12" />
<TextView
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="五"
android:textColor="@color/ri_mlv"
android:textSize="@dimen/text_12" />
<TextView
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="六"
android:textColor="@color/ri_dhong"
android:textSize="@dimen/text_12" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
plugin_calendar/src/main/res/layout/popview_time2.xml
View file @ 1a6a04c0
......@@ -16,7 +16,7 @@
android:background="@android:color/white"
android:orientation="horizontal">
<com.rv.plugin.calendar.WheelView
<com.rv.plugin.calendar.WheelView3
android:id="@+id/hour"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
......
plugin_calendar/src/main/res/values/colors.xml
View file @ 1a6a04c0
......@@ -20,4 +20,6 @@
<color name="ri_lhui">#FFCCCCCC</color>
<color name="greenC7FFED">#c7ffed</color>
<color name="gren_171413">#171413</color>
</resources>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment