Skip to content

R
RvApp
Commit 17cd964e authored by linfeng's avatar linfeng
Browse files
Options

Merge branch 'dev-member-john' of http://113.105.137.151:22280/lify/rvapp

parents c5b840af 904aaa69
Hide whitespace changes
Inline Side-by-side
Showing with 309 additions and 112 deletions
RvClient/src/main/java/com/xxfc/rv/MainActivity.java
View file @ 17cd964e
......@@ -2,6 +2,7 @@ package com.xxfc.rv;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
......@@ -21,10 +22,12 @@ import com.ruiwenliu.wrapper.util.listener.SwitchFragment;
import com.ruiwenliu.wrapper.weight.CustomScrollViewPager;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.camp.CampFragment;
import com.rv.component.utils.Cooker;
import com.rv.home.rv.module.ApiConfig;
import com.rv.home.rv.module.basic.presenter.CommonPresenter;
import com.rv.home.rv.module.ui.main.adapter.TabAdapter;
import com.rv.home.rv.module.ui.main.home.HomeFragment;
import com.rv.home.rv.module.ui.main.home.bean.EffectiveTimeBean;
import com.rv.rvmine.MineFragment;
import com.rv.tourism.R2;
import com.rv.tourism.TourismFragment;
......@@ -104,6 +107,7 @@ public class MainActivity extends BaseActivity<CommonPresenter> {
@Override
protected void loadData(Bundle savedInstanceState, Intent intent) {
checkVersion();
getEffectiveTime();
}
@Override
......@@ -124,6 +128,14 @@ public class MainActivity extends BaseActivity<CommonPresenter> {
}
}
break;
case 1:
EffectiveTimeBean bean = (EffectiveTimeBean) result;
if (bean != null && bean.isRel() && bean.getData() != null) {
Cooker.save(getApplicationContext(), "actRent", bean.getData().getActRent());
Cooker.save(getApplicationContext(), "actTour", bean.getData().getActTour());
Cooker.save(getApplicationContext(), "insurePrice", bean.getData().getInsurePrice());
}
break;
default:
break;
}
......@@ -230,6 +242,10 @@ public class MainActivity extends BaseActivity<CommonPresenter> {
}
}
private void getEffectiveTime() {
mPresenter.getData(1, ApiConfig.HTTP_URL_EFFECTIVE_TIME, EffectiveTimeBean.class, false);
}
/**
* 退出APP
*/
......
component_utils/src/main/java/com/rv/component/utils/Cooker.java 0 → 100644
View file @ 17cd964e
package com.rv.component.utils;
import android.content.Context;
import android.content.SharedPreferences;
public class Cooker {
private final static String COOK_FILE = "cooker";
private static SharedPreferences preferences;
private static SharedPreferences getPreference(Context context) {
if (preferences == null) {
preferences = context.getSharedPreferences(COOK_FILE, Context.MODE_PRIVATE);
}
return preferences;
}
public static void save(Context context, String key, String s) {
getPreference(context).edit().putString(key, s).commit();
}
public static void save(Context context, String key, int i) {
getPreference(context).edit().putInt(key, i).commit();
}
public static void save(Context context, String key, long l) {
getPreference(context).edit().putLong(key, l).commit();
}
public static void save(Context context, String key, boolean b) {
getPreference(context).edit().putBoolean(key, b).commit();
}
public static void save(Context context, String key, float f) {
getPreference(context).edit().putFloat(key, f).commit();
}
public static String getStringValue(Context context, String key) {
return getStringValue(context, key, "");
}
public static String getStringValue(Context context, String key, String def) {
return getPreference(context).getString(key, def);
}
public static int getIntValue(Context context, String key) {
return getIntValue(context, key, -1);
}
public static int getIntValue(Context context, String key, int def) {
return getPreference(context).getInt(key, def);
}
public static long getLongValue(Context context, String key) {
return getLongValue(context, key, 0l);
}
public static long getLongValue(Context context, String key, long def) {
return getPreference(context).getLong(key, def);
}
public static float getFloatValue(Context context, String key) {
return getFloatValue(context, key, 0f);
}
public static float getFloatValue(Context context, String key, float def) {
return getPreference(context).getFloat(key, def);
}
public static boolean getBooleanValue(Context context, String key) {
return getBooleanValue(context, key, false);
}
public static boolean getBooleanValue(Context context, String key, boolean def) {
return getPreference(context).getBoolean(key, def);
}
}
component_utils/src/main/java/com/rv/component/utils/DateUtils.java
View file @ 17cd964e
......@@ -157,6 +157,16 @@ public class DateUtils {
return sdf.format(new Date(time));
}
/**
* 将时间戳转换成yyyy-MM-dd HH:mm:ss字符串
*
* @param time 时间戳
* @return yyyy-MM-dd HH:mm:ss
*/
public static String timestampToString1(long time) {
return sdf7.format(new Date(time));
}
/**
* 获取手机当前时间戳毫秒
*
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/adapter/HotCarTypeAdapter.java
View file @ 17cd964e
......@@ -26,7 +26,7 @@ public class HotCarTypeAdapter extends BaseQuickAdapter<HomeHotGoodListBean.Data
helper.setText(R.id.tv_name,bean.getName());
helper.setText(R.id.tv_content,bean.getName1());
if (!TextUtil.isEmpty(bean.getPrice())) {
helper.setText(R.id.tv_price, String.format("¥%1$s%2$s", bean.getPrice(), mContext.getString(R.string.rv_day)));
helper.setText(R.id.tv_price, String.format("¥%1$s%2$s", bean.getPrice(), mContext.getString(R.string.rv_one_car)));
}else {
helper.setText(R.id.tv_price,"");
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/ForPaymentFragment.java
View file @ 17cd964e
......@@ -126,7 +126,7 @@ public class ForPaymentFragment extends BaseFragment<CommonPresenter> implements
@Override
protected void loadData(Bundle savedInstanceState) {
getEffectiveTime();
}
private Handler handler = new Handler(Looper.getMainLooper()) {
......@@ -177,24 +177,6 @@ public class ForPaymentFragment extends BaseFragment<CommonPresenter> implements
case 1:
pay((OrderPayBean) result);
break;
case 2:
EffectiveTimeBean bean = (EffectiveTimeBean) result;
if (bean != null && bean.isRel() && bean.getData() != null) {
effTime = bean.getData().getActRent();
startTime();
}
break;
}
}
/******
* 开始计时
* @param
*/
private void startTime() {
if (effTime != 0l && mAdapter != null && mAdapter.getData() != null) {
mAdapter.setEffTime(effTime);
}
}
......@@ -230,10 +212,6 @@ public class ForPaymentFragment extends BaseFragment<CommonPresenter> implements
}
}
private void getEffectiveTime() {
mPresenter.getData(2, ApiConfig.HTTP_URL_EFFECTIVE_TIME, EffectiveTimeBean.class, false);
}
private void orderData(int page) {
Map<String, Object> headMap = new LinkedHashMap<>();
if (OkGoUtil.getToken() != null)
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/ForPaymentAdapter.java
View file @ 17cd964e
......@@ -8,9 +8,12 @@ import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
import com.chad.library.adapter.base.entity.MultiItemEntity;
import com.ruiwenliu.wrapper.util.BaseGlideHolder;
import com.ruiwenliu.wrapper.util.TimeManager;
import com.rv.component.utils.Cooker;
import com.rv.home.R;
import com.rv.home.rv.module.ui.main.home.order.bean.OrderListBean;
import com.rv.home.rv.module.ui.main.home.order.view.MyTimerView;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
......@@ -22,10 +25,10 @@ import java.util.List;
*/
public class ForPaymentAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity, BaseGlideHolder> {
public static final int TYPE_FOR_PAYMENT = 1; //1--租车；2--旅游
public static final int TYPE_TO_TRAVEL = 2;
public static final int TYPE_TO_MEMBER = 3;
private long effTime = 0l;
public ForPaymentAdapter(List<MultiItemEntity> data) {
super(data);
......@@ -38,17 +41,13 @@ public class ForPaymentAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity
protected void convert(BaseGlideHolder helper, MultiItemEntity item) {
OrderListBean.DataBeanX.DataBean dataBean;
try {
setTimes(helper, (OrderListBean.DataBeanX.DataBean) item);
} catch (Exception e) {
e.printStackTrace();
}
switch (helper.getItemViewType()) {
case TYPE_FOR_PAYMENT:
dataBean = (OrderListBean.DataBeanX.DataBean) item;
if (dataBean == null) {
return;
}
setTimes(Cooker.getLongValue(mContext, "actRent"), helper, (OrderListBean.DataBeanX.DataBean) item);
helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), dataBean.getCrtTime()));
if (dataBean.getOrderRentVehicleDetail() != null && dataBean.getOrderRentVehicleDetail().getStart_city_name() != null) {
helper.setText(R.id.tv_city, dataBean.getOrderRentVehicleDetail().getStart_city_name());
......@@ -75,6 +74,7 @@ public class ForPaymentAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity
if (dataBean.getOrderTourDetail() == null) {
return;
}
setTimes(Cooker.getLongValue(mContext, "actTour"), helper, (OrderListBean.DataBeanX.DataBean) item);
helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), dataBean.getCrtTime()));
helper.setText(R.id.tv_city, dataBean.getOrderTourDetail().getStartCityName());
helper.loadRoundImage(mContext, dataBean.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 10);
......@@ -101,33 +101,38 @@ public class ForPaymentAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity
helper.setText(R.id.tv_price, String.format("¥%1$s", dataBean.getRealAmount()));
helper.setText(R.id.tv_member_pay, mContext.getString(R.string.rv_to_pay_for));
helper.addOnClickListener(R.id.tv_member_pay);
helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_for_payment));
break;
}
}
private void setTimes(BaseGlideHolder helper, OrderListBean.DataBeanX.DataBean bean) throws Exception {
private void setTimes(long effTime, BaseGlideHolder helper, OrderListBean.DataBeanX.DataBean bean) {
if (bean != null) {
String crtStr = bean.getCrtTime();
if (!TextUtils.isEmpty(crtStr)) {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date date = format.parse(crtStr);
long remain = effTime - (System.currentTimeMillis() - date.getTime());
if (remain <= 0) {
helper.setText(R.id.tv_order_state, mContext.getString(R.string.tv_order_cancel));
switch (bean.getType()) {
case TYPE_FOR_PAYMENT:
helper.itemView.findViewById(R.id.tv_process).setVisibility(View.GONE);
break;
case TYPE_TO_TRAVEL:
helper.itemView.findViewById(R.id.tv_camp_process).setVisibility(View.GONE);
break;
case TYPE_TO_MEMBER:
helper.itemView.findViewById(R.id.tv_member_pay).setVisibility(View.GONE);
break;
try {
Date date = format.parse(crtStr);
long remain = effTime - (System.currentTimeMillis() - date.getTime());
if (remain <= 0) {
helper.setText(R.id.tv_order_state, mContext.getString(R.string.tv_order_cancel));
switch (bean.getType()) {
case TYPE_FOR_PAYMENT:
helper.itemView.findViewById(R.id.tv_process).setVisibility(View.GONE);
break;
case TYPE_TO_TRAVEL:
helper.itemView.findViewById(R.id.tv_camp_process).setVisibility(View.GONE);
break;
case TYPE_TO_MEMBER:
helper.itemView.findViewById(R.id.tv_member_pay).setVisibility(View.GONE);
break;
}
} else {
helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_for_payment));
((MyTimerView) helper.itemView.findViewById(R.id.tv_remain_time)).setTime(effTime, date.getTime(), timerListener);
}
} else {
helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_for_payment));
((MyTimerView) helper.itemView.findViewById(R.id.tv_remain_time)).setTime(effTime, date.getTime(), timerListener);
} catch (ParseException e) {
e.printStackTrace();
}
}
}
......@@ -139,15 +144,6 @@ public class ForPaymentAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity
notifyDataSetChanged();
}
/******
* 设置失效时间
* @param effTime
*/
public void setEffTime(long effTime) {
this.effTime = effTime;
notifyDataSetChanged();
}
public MyTimerView.TimerListener timerListener = new MyTimerView.TimerListener() {
@Override
public void onTimeFinish() {
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/OrderListAdapter.java
View file @ 17cd964e
package com.rv.home.rv.module.ui.main.home.order.adapter;
import android.text.TextUtils;
import android.view.View;
import android.widget.ImageView;
import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
import com.chad.library.adapter.base.entity.MultiItemEntity;
import com.ruiwenliu.wrapper.util.BaseGlideHolder;
import com.ruiwenliu.wrapper.util.TimeManager;
import com.rv.component.utils.Cooker;
import com.rv.home.R;
import com.rv.home.R2;
import com.rv.home.rv.module.ui.main.home.order.bean.ForPaymentBean;
import com.rv.home.rv.module.ui.main.home.order.bean.OrderListBean;
import com.rv.home.rv.module.ui.main.home.order.bean.ToTravelBean;
import com.rv.home.rv.module.ui.main.home.order.view.MyTimerView;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
/**
......@@ -80,6 +86,7 @@ public class OrderListAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_for_payment));
helper.setText(R.id.tv_process, mContext.getString(R.string.rv_to_pay_for));
helper.setVisible(R.id.tv_process, true);
setTimes(Cooker.getLongValue(mContext, "actRent"), helper, (OrderListBean.DataBeanX.DataBean) item);
break;
case 4:
helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_to_travel));
......@@ -145,6 +152,7 @@ public class OrderListAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_for_payment));
helper.setText(R.id.tv_camp_process, mContext.getString(R.string.rv_to_pay_for));
helper.setVisible(R.id.tv_camp_process, true);
setTimes(Cooker.getLongValue(mContext, "actTour"), helper, (OrderListBean.DataBeanX.DataBean) item);
break;
case 4:
helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_to_travel));
......@@ -228,4 +236,43 @@ public class OrderListAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
notifyDataSetChanged();
}
private void setTimes(long effTime, BaseGlideHolder helper, OrderListBean.DataBeanX.DataBean bean) {
if (bean != null) {
String crtStr = bean.getCrtTime();
if (!TextUtils.isEmpty(crtStr)) {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
try {
Date date = format.parse(crtStr);
long remain = effTime - (System.currentTimeMillis() - date.getTime());
if (remain <= 0) {
helper.setText(R.id.tv_order_state, mContext.getString(R.string.tv_order_cancel));
switch (bean.getType()) {
case TYPE_FOR_PAYMENT:
helper.itemView.findViewById(R.id.tv_process).setVisibility(View.GONE);
break;
case TYPE_TO_TRAVEL:
helper.itemView.findViewById(R.id.tv_camp_process).setVisibility(View.GONE);
break;
case TYPE_TO_MEMBER:
helper.itemView.findViewById(R.id.tv_member_pay).setVisibility(View.GONE);
break;
}
} else {
helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_for_payment));
((MyTimerView) helper.itemView.findViewById(R.id.tv_remain_time)).setTime(effTime, date.getTime(), timerListener);
}
} catch (ParseException e) {
e.printStackTrace();
}
}
}
}
public MyTimerView.TimerListener timerListener = new MyTimerView.TimerListener() {
@Override
public void onTimeFinish() {
notifyDataSetChanged();
}
};
}
module_home/src/main/res/values/strings.xml
View file @ 17cd964e
......@@ -38,6 +38,7 @@
<string name="rv_car_type_seat">6剩6坐</string>
<string name="rv_car_type_selected">筛选</string>
<string name="rv_day">/天</string>
<string name="rv_one_car">/辆</string>
<string name="rv_km">km</string>
<string name="rv_km_you">距您</string>
<string name="rv_select_car">选择车型</string>
......
module_mine/src/main/AndroidManifest.xml
View file @ 17cd964e
......@@ -5,7 +5,6 @@
<application>
<activity android:name="com.rv.version.activity.UpdateAppActivity" />
</application>
</manifest>
\ No newline at end of file
module_mine/src/main/java/com/rv/rvmine/MineFragment.java
View file @ 17cd964e
......@@ -256,7 +256,7 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
} else if (id == R.id.rl_item_traveler) {
//出游人
if (isLogin()) return;
startActivity(ChooseAVisitorActivity.getIntent(_mActivity));
startActivity(new Intent(_mActivity, ChooseAVisitorActivity.class));
} else if (id == R.id.rl_item_my_pat) {
//我的拍拍
} else if (id == R.id.tv_view_privileges) {
......
module_mine/src/main/java/com/rv/rvmine/adapter/TravelerListAdapter.java
View file @ 17cd964e
package com.rv.rvmine.adapter;
import android.view.View;
import android.widget.CheckBox;
import android.widget.CompoundButton;
import com.chad.library.adapter.base.BaseQuickAdapter;
......@@ -15,50 +17,75 @@ import java.util.List;
*/
public class TravelerListAdapter extends BaseQuickAdapter<TravelerListBean.DataBean, BaseViewHolder> {
public TravelerListAdapter() {
// private TravelerListBean.DataBean hasSelectBean = null;
private int openType;
public TravelerListAdapter(int openType) {
super(R.layout.rv_item_traveler_list);
this.openType = openType;
}
@Override
protected void convert(BaseViewHolder helper, final TravelerListBean.DataBean item) {
protected void convert(final BaseViewHolder helper, final TravelerListBean.DataBean item) {
helper.setText(R.id.tv_name, item.getName());
helper.setText(R.id.tv_phone, item.getPhone());
helper.setText(R.id.tv_id_card, item.getIdCard());
// if (hasSelectBean == null || hasSelectBean != item) {
// helper.setChecked(R.id.cb_draveler, false);
// } else {
// helper.setChecked(R.id.cb_draveler, true);
// }
helper.addOnClickListener(R.id.tv_edit);
helper.setOnCheckedChangeListener(R.id.cb_draveler, new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
int position =getPosition(item);
setItemState(isChecked, position);
if (openType == 0) {
helper.itemView.findViewById(R.id.cb_draveler).setVisibility(View.GONE);
} else {
if (item.getStatus()) {
helper.setChecked(R.id.cb_draveler, true);
} else {
helper.setChecked(R.id.cb_draveler, false);
}
});
helper.itemView.findViewById(R.id.cb_draveler).setEnabled(false);
// helper.setOnCheckedChangeListener(R.id.cb_draveler, new CompoundButton.OnCheckedChangeListener() {
// @Override
// public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
//
// boolean status = item.getStatus();
// status = !status;
// ((CheckBox) helper.itemView.findViewById(R.id.cb_draveler)).setChecked(status);
// item.setStatus(status);
// if (status) {
// hasSelectBean = item;
// } else {
// hasSelectBean = null;
// }
//// notifyDataSetChanged();
// }
// });
}
}
public int getPosition(TravelerListBean.DataBean item){
public int getPosition(TravelerListBean.DataBean item) {
return mData.indexOf(item);
}
/**
* 设置出游人选中状态
* @param check
* @param position
*/
public void setItemState(boolean check,int position){
mData.get(position).selectType=check==true?1:0;
notifyItemChanged(position);
}
// public TravelerListBean.DataBean getHasSelectBean() {
// return hasSelectBean;
// }
/**
* 获取选中的出游人数据
*
* @return
*/
public List<TravelerListBean.DataBean> getSelectItem(){
List<TravelerListBean.DataBean> list=new ArrayList<>();
for (TravelerListBean.DataBean dataBean:mData){
if(dataBean.selectType==1){
list.add(dataBean);
}
}
public List<TravelerListBean.DataBean> getSelectItem() {
List<TravelerListBean.DataBean> list = new ArrayList<>();
for (TravelerListBean.DataBean dataBean : mData) {
if (dataBean.getStatus()) {
list.add(dataBean);
}
}
return list;
}
......
module_mine/src/main/java/com/rv/rvmine/bean/TravelerListBean.java
View file @ 17cd964e
......@@ -31,7 +31,6 @@ public class TravelerListBean extends BaseBean {
}
public static class DataBean implements Serializable {
public int selectType;//是否选中
private Integer id;//": 5,
private String userid;//": 14,
......@@ -43,15 +42,7 @@ public class TravelerListBean extends BaseBean {
private String updTime;//": 1558766256489,
private String isdel;//": 0,
private Integer isChild;//": 1
public int getSelectType() {
return selectType;
}
public void setSelectType(int selectType) {
this.selectType = selectType;
}
private boolean status = false; // 默认不选中
public Integer getId() {
return id;
}
......@@ -131,5 +122,13 @@ public class TravelerListBean extends BaseBean {
public void setIsChild(Integer isChild) {
this.isChild = isChild;
}
public boolean getStatus() {
return status;
}
public void setStatus(boolean status) {
this.status = status;
}
}
}
module_mine/src/main/java/com/rv/rvmine/traveler/ChooseAVisitorActivity.java
View file @ 17cd964e
......@@ -3,12 +3,14 @@ package com.rv.rvmine.traveler;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.os.Parcelable;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.view.View;
import android.widget.Toast;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.frame.base.url.Constance;
import com.frame.rv.config.RvFrameConfig;
......@@ -48,14 +50,12 @@ public class ChooseAVisitorActivity extends BaseStatusActivity<CommonPresenter>
private int mPage;
private int countPage;
private int visitorType;
private int openType;
private DeletePopupWindow deletePopupWindow;
private List<TravelerListBean.DataBean> visitors = new ArrayList<>();
private TravelerListBean.DataBean deletBean = null;
public static Intent getIntent(Context context) {
return new Intent(context, ChooseAVisitorActivity.class);
}
private String hasChoIdCards; // 传过来的已经选择的身份证
@Override
protected int setLayout() {
......@@ -64,8 +64,10 @@ public class ChooseAVisitorActivity extends BaseStatusActivity<CommonPresenter>
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
visitorType = intent.getIntExtra("visitorType", -1);
visitorType = intent.getIntExtra("visitorType", -1);
openType = intent.getIntExtra("openType", 0);
hasChoIdCards = intent.getStringExtra("hasChoice");
titleView.setTitle("选择出游人");
titleView.setImageResource(R.id.iv_title_right, R.drawable.rv_common_icon_thestaff);
titleView.setChildClickListener(R.id.iv_title_right, new View.OnClickListener() {
......@@ -76,20 +78,26 @@ public class ChooseAVisitorActivity extends BaseStatusActivity<CommonPresenter>
});
mAdapter = new TravelerListAdapter();
mAdapter = new TravelerListAdapter(openType);
recyclerView.setLayoutManager(new LinearLayoutManager(mActivity));
recyclerView.setAdapter(mAdapter);
mAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
TravelerListBean.DataBean item = mAdapter.getItem(position);
Intent intent1 = getIntent();
intent1.putExtra("name", item.getName());
intent1.putExtra("phone", item.getPhone());
intent1.putExtra("idcard", item.getIdCard());
intent1.putExtra("id", item.getId());
setResult(RESULT_OK, intent1);
finish();
if (openType != -0) {
TravelerListBean.DataBean item = mAdapter.getItem(position);
if (item.getStatus()) {
Toast.makeText(getApplicationContext(), "不可重复添加", Toast.LENGTH_SHORT).show();
return;
}
Intent intent1 = getIntent();
intent1.putExtra("name", item.getName());
intent1.putExtra("phone", item.getPhone());
intent1.putExtra("idcard", item.getIdCard());
intent1.putExtra("id", item.getId());
setResult(RESULT_OK, intent1);
finish();
}
}
});
......@@ -128,6 +136,26 @@ public class ChooseAVisitorActivity extends BaseStatusActivity<CommonPresenter>
}
// @Override
// public void finish() {
// if (openType != 0) {
// Intent intent = new Intent();
// ArrayList<TravelerListBean.DataBean> selects;
//// if (selectBean == null) {
//// selectBean = mAdapter.getHasSelectBean();
//// }
//// if (selectBean != null) {
// intent.putExtra("name", selectBean.getName());
// intent.putExtra("phone", selectBean.getPhone());
// intent.putExtra("idcard", selectBean.getIdCard());
// intent.putExtra("id", selectBean.getId());
// setResult(RESULT_OK, intent);
//// }
//
// }
// super.finish();
// }
@Override
protected void loadData(Bundle savedInstanceState, Intent intent) {
super.loadData(savedInstanceState, intent);
......@@ -185,6 +213,9 @@ public class ChooseAVisitorActivity extends BaseStatusActivity<CommonPresenter>
} else {
for (TravelerListBean.DataBean b : bean.getData()) {
if (visitorType == b.getIsChild().intValue()) {
if (hasChoIdCards.contains(b.getIdCard())) {
b.setStatus(true);
}
visitors.add(b);
}
}
......@@ -201,7 +232,7 @@ public class ChooseAVisitorActivity extends BaseStatusActivity<CommonPresenter>
Map<String, Object> headMap = new LinkedHashMap<>();
if (OkGoUtil.getToken() != null)
headMap.put("Authorization", OkGoUtil.getToken());
mPresenter.postBodyData(1, ApiConfig.HTTP_URL_DELETEDRIVER , DeleteVistorBean.class, new DeleteInfo(deletBean.getId()), headMap, true);
mPresenter.postBodyData(1, ApiConfig.HTTP_URL_DELETEDRIVER, DeleteVistorBean.class, new DeleteInfo(deletBean.getId()), headMap, true);
}
}
module_tourism/src/main/java/com/rv/tourism/other/TravelerConfirmOrderActivity.java
View file @ 17cd964e
......@@ -173,8 +173,17 @@ public class TravelerConfirmOrderActivity extends BaseStatusActivity<TourismPres
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
mPosition = position;
tourist = (BeanVisitorInformation) adapter.getItem(position);
StringBuffer buffer = new StringBuffer();
for (BeanVisitorInformation information : mVisitorInformationAdapter.getData()) {
if (information != null && information.getIsChild() == tourist.getIsChild()) {
buffer.append(information.getIdCard())
.append(";");
}
}
ARouter.getInstance().build(Constance.ACTIVITY_URL_CHOOSEAVISITOR)
.withInt("visitorType", Integer.valueOf(tourist.getIsChild()))
.withInt("openType", 1)
.withString("hasChoice", buffer.toString())
.navigation(mActivity, 104);
}
});
......
plugin_member/src/main/java/com/rv.member/ConsumeRecordActivity.java
View file @ 17cd964e
......@@ -91,7 +91,7 @@ public class ConsumeRecordActivity extends BaseStatusActivity<CommonPresenter> i
// bodyMap.put("status", "3");
bodyMap.put("hasMemberRight", 1);
bodyMap.put("type", 1);
bodyMap.put("multiStatus", "4,5,6");
bodyMap.put("multiStatus", "3,4,5,6");
mPresenter.getData(RvFrameConfig.VEHICLE_ORDER, position, ApiConfig.HTTP_URL_ORDER_LIST, OrderListBean.class, bodyMap, headMap, mPage == 1 ? true : false);
}
......
plugin_member/src/main/java/com/rv.member/adapter/ConsumeRecordListAdapter.java
View file @ 17cd964e
......@@ -7,6 +7,7 @@ import android.widget.ImageView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.ruiwenliu.wrapper.util.glide.GlideManager;
import com.rv.component.utils.DateUtils;
import com.rv.home.rv.module.ui.main.home.order.bean.OrderListBean;
import com.rv.member.R;
......@@ -33,6 +34,9 @@ public class ConsumeRecordListAdapter extends BaseQuickAdapter<OrderListBean.Dat
if (bean != null) {
if (!TextUtils.isEmpty(bean.getCrtTime())) {
helper.setText(R.id.tv_consume_time, "下单时间: " + bean.getCrtTime());
if (bean.getStatusX() == 3) {
helper.setText(R.id.tv_state, "待支付");
}
if (bean.getStatusX() == 4) {
helper.setText(R.id.tv_state, "待出行");
} else if (bean.getStatusX() == 5) {
......@@ -53,8 +57,8 @@ public class ConsumeRecordListAdapter extends BaseQuickAdapter<OrderListBean.Dat
OrderListBean.DataBeanX.DataBean.OrderRentVehicleDetail vehicleDetail = bean.getOrderRentVehicleDetail();
if (vehicleDetail != null) {
helper.setText(R.id.tv_location, vehicleDetail.getStart_city_name() + "-" + vehicleDetail.getEnd_city_name());
helper.setText(R.id.tv_get_info, vehicleDetail.getStart_time() + " " + vehicleDetail.getStart_addr());
helper.setText(R.id.tv_return_info, vehicleDetail.getEnd_time() + " " + vehicleDetail.getEnd_addr());
helper.setText(R.id.tv_get_info, DateUtils.timestampToString1(vehicleDetail.getStart_time()) + " " + vehicleDetail.getStart_addr());
helper.setText(R.id.tv_return_info, DateUtils.timestampToString1(vehicleDetail.getEnd_time()) + " " + vehicleDetail.getEnd_addr());
if (vehicleDetail.getFreeDays() > 0) {
helper.setText(R.id.tv_member_right, "免费" + vehicleDetail.getFreeDays() + "天");
} else if (vehicleDetail.getRebate() > 0) {
......
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