Skip to content

R
RvApp
Commit 2ad9e96c authored by jianglx's avatar jianglx
Browse files
Options

Merge branch 'master-video' of http://113.105.137.151:22280/lify/rvapp into dev_im

parents 530c8dd1 0a35441d
Show whitespace changes
Inline Side-by-side
Showing with 282 additions and 116 deletions
module_discovery/src/main/java/com/xxfc/discovery/DiscoveryFragment.java
View file @ 2ad9e96c
......@@ -129,8 +129,8 @@ public class DiscoveryFragment extends BaseFragment<DiscoveryPresenter> {
List<String> list = new ArrayList<>();
list.add(_mActivity.getString(R.string.discovery_recommend));
list.add(_mActivity.getString(R.string.discovery_pat));
list.add(_mActivity.getString(R.string.discovery_short_video));
list.add(_mActivity.getString(R.string.discovery_question_and_answer));
// list.add(_mActivity.getString(R.string.discovery_short_video));
// list.add(_mActivity.getString(R.string.discovery_question_and_answer));
menuAdapter.setNewData(list);
menuAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
......@@ -174,8 +174,8 @@ public class DiscoveryFragment extends BaseFragment<DiscoveryPresenter> {
List<BaseFragment> list = new ArrayList<>();
list.add(RecommendFragment.getInstance(TYPE_RECOMMEND));
list.add(PatFragment.getInstance(TYPE_PAT));
list.add(ShortVideoFragment.getInstance(TYPE_SHORT_VIDEO));
list.add(QuestionAndAnswerFragment.getInstance(TYPE_QUESTION_AND_ANSWER));
// list.add(ShortVideoFragment.getInstance(TYPE_SHORT_VIDEO));
// list.add(QuestionAndAnswerFragment.getInstance(TYPE_QUESTION_AND_ANSWER));
return list;
}
......@@ -201,16 +201,16 @@ public class DiscoveryFragment extends BaseFragment<DiscoveryPresenter> {
int id = view.getId();
if (id == R.id.iv_discovery_content_add) {
//添加
showPopupWindow(ivDiscoveryContentAdd);
// showPopupWindow(ivDiscoveryContentAdd);
//判断是否已经登录
// if (TextUtils.isEmpty(OkGoUtil.getToken())) {
// ARouter.getInstance().build(Constance.ACTIVITY_URL_LOGINRV).navigation();
// return;
// }
//
// ARouter.getInstance()
// .build(Constance.ACTIVITY_URL_POSTPAT)
// .navigation();
if (TextUtils.isEmpty(OkGoUtil.getToken())) {
ARouter.getInstance().build(Constance.ACTIVITY_URL_LOGINRV).navigation();
return;
}
ARouter.getInstance()
.build(Constance.ACTIVITY_URL_POSTPAT)
.navigation();
}
}
......
module_discovery/src/main/java/com/xxfc/discovery/other/ShortVideoActivity.java
View file @ 2ad9e96c
......@@ -321,7 +321,6 @@ public class ShortVideoActivity extends BaseStatusActivity<DiscoveryPresenter> i
*/
private void setCommentData(DiscoveryCommentBean commentBean) {
commentAdapter.setNewData(commentBean.getData());
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/ConfirmOrderActivity.java
View file @ 2ad9e96c
......@@ -607,6 +607,7 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
* @param couponBean
*/
private void couponData(CarCouponBean couponBean) {
selectCouponList.clear();
if (couponBean.getData() != null) {
couponDataList = couponBean.getData().getArray();
if (couponBean.getData().getCoupon() == null) {
......@@ -722,7 +723,7 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
OrderPriceDetailBean.ChildrenBean childrenBean2 = new OrderPriceDetailBean.ChildrenBean();
childrenBean2.setKey("车辆租赁费");
childrenBean2.setDetail("¥" + dayPrice + "/天 *" + dayNum + "天");
childrenBean2.setVal("¥" + new BigDecimal( dayPrice * dayNum).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
childrenBean2.setVal("¥" + new BigDecimal(dayPrice * dayNum).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
childrenBeanList.add(childrenBean2);
} else {
if (memberData != null) {
......@@ -733,7 +734,7 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
OrderPriceDetailBean.ChildrenBean childrenBean1 = new OrderPriceDetailBean.ChildrenBean();
childrenBean1.setKey("车辆租赁费");
childrenBean1.setDetail("¥" + dayPrice + "/天 *" + (dayNum - memberData.getRentFreeDays()) + "天");
childrenBean1.setVal("¥" + new BigDecimal( dayPrice * (dayNum - memberData.getRentFreeDays())).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
childrenBean1.setVal("¥" + new BigDecimal(dayPrice * (dayNum - memberData.getRentFreeDays())).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
childrenBeanList.add(childrenBean1);
} else if (dayNum <= memberData.getRentFreeDays()) {
payMoney = priceBean.getData().getDeposit();
......@@ -756,7 +757,7 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
OrderPriceDetailBean.ChildrenBean childrenBean4 = new OrderPriceDetailBean.ChildrenBean();
childrenBean4.setKey("车损免赔费");
childrenBean4.setDetail("¥" + priceBean.getData().getDamageSafePrice() + "/天 *" + dayNum + "天");
childrenBean4.setVal("¥" + new BigDecimal( priceBean.getData().getDamageSafePrice() * dayNum).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
childrenBean4.setVal("¥" + new BigDecimal(priceBean.getData().getDamageSafePrice() * dayNum).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
childrenBeanList.add(childrenBean4);
}
......
module_home/src/main/res/layout/activity_get_on_the_car_qrcode.xml
View file @ 2ad9e96c
......@@ -66,8 +66,7 @@
android:id="@+id/iv_goods"
android:layout_width="@dimen/size_100"
android:layout_height="@dimen/size_100"
android:scaleType="centerCrop"
android:src="@drawable/common_icon_wechat_pay" />
android:scaleType="centerCrop" />
<LinearLayout
android:layout_width="match_parent"
......
module_home/src/main/res/layout/activity_pick_up_the_car_qrcode.xml
View file @ 2ad9e96c
......@@ -67,8 +67,7 @@
android:id="@+id/iv_goods"
android:layout_width="@dimen/size_100"
android:layout_height="@dimen/size_100"
android:scaleType="centerCrop"
android:src="@drawable/common_icon_wechat_pay" />
android:scaleType="centerCrop" />
<RelativeLayout
android:layout_width="match_parent"
......
module_home/src/main/res/layout/rv_act_evaluation.xml
View file @ 2ad9e96c
......@@ -24,8 +24,7 @@
android:id="@+id/iv_car"
android:layout_width="@dimen/size_60"
android:layout_height="@dimen/size_60"
android:scaleType="centerCrop"
android:src="@drawable/shape_rv_bg_yellow" />
android:scaleType="centerCrop" />
<RelativeLayout
android:layout_width="match_parent"
......@@ -38,7 +37,6 @@
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:text="房车上大街上看到介绍看到了上来ddsdsds"
android:textColor="@color/textGray"
android:textSize="@dimen/text_16" />
......@@ -50,7 +48,6 @@
android:layout_marginTop="@dimen/size_5"
android:ellipsize="end"
android:maxLines="1"
android:text="烧烤.麻将.微波炉"
android:textColor="@color/textLightGrey"
android:textSize="@dimen/text_12" />
</RelativeLayout>
......
module_home/src/main/res/layout/rv_item_order_to_member.xml
View file @ 2ad9e96c
......@@ -51,7 +51,6 @@
android:id="@+id/tv_order_state"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="sss"
android:textColor="@color/textMain"
android:textSize="@dimen/text_12" />
......@@ -99,7 +98,6 @@
android:layout_height="wrap_content"
android:layout_below="@id/tv_car_type"
android:layout_marginTop="@dimen/size_8"
android:text="永久8折租车，免费用车5天"
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
......@@ -116,7 +114,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="¥5000"
android:textColor="@color/colorAuxiliaryRed"
android:textSize="@dimen/text_16" />
......
module_mine/src/main/java/com/rv/rvmine/traveler/MyReleaseActivity.java
View file @ 2ad9e96c
......@@ -109,9 +109,10 @@ public class MyReleaseActivity extends BaseStatusActivity<CommonPresenter> {
GallerySnapHelper snapHelper = new GallerySnapHelper();
snapHelper.attachToRecyclerView(recyclerView);
List<String> list = new ArrayList<>();
list.add("我的拍拍");
list.add("我的短视频");
list.add("我的问答");
// list.add("我的拍拍");
// list.add("我的短视频");
// list.add("我的问答");
menuAdapter.setNewData(list);
menuAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
......@@ -166,8 +167,8 @@ public class MyReleaseActivity extends BaseStatusActivity<CommonPresenter> {
myReleaseAskFragment = MyReleaseAskFragment.getInstance(TYPE_ASK);
List<BaseFragment> list = new ArrayList<>();
list.add(myReleasePatFragment);
list.add(myReleaseVideoFragment);
list.add(myReleaseAskFragment);
// list.add(myReleaseVideoFragment);
// list.add(myReleaseAskFragment);
return list;
}
......
module_mine/src/sit/res/layout/activity_mine.xml
View file @ 2ad9e96c
......@@ -6,8 +6,7 @@
android:background="@color/colorLine"
android:orientation="vertical">
<com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/refresh"
android:layout_width="match_parent"
android:layout_height="match_parent">
......@@ -53,7 +52,8 @@
android:layout_width="@dimen/size_35"
android:layout_height="@dimen/size_35"
android:padding="@dimen/size_8"
android:src="@drawable/mycenter_icon_message" />
android:src="@drawable/mycenter_icon_message"
android:visibility="gone" />
<ImageView
android:id="@+id/iv_item_setting"
......@@ -268,8 +268,7 @@
android:layout_weight="1"
android:clickable="false"
android:gravity="center"
android:orientation="vertical"
>
android:orientation="vertical">
<ImageView
android:layout_width="@dimen/size_25"
......
plugin_wallet/src/main/java/com/xxrv/wallet/activity/ConsumeDetailActivity.java
View file @ 2ad9e96c
......@@ -70,7 +70,7 @@ public class ConsumeDetailActivity extends BaseStatusActivity<CommonPresenter> i
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
titleView.setTitle("消费明细");
titleView.setTitle("账单明细");
recyclerView.setLayoutManager(new LinearLayoutManager(this, LinearLayout.VERTICAL, false));
adapter = new ConsumeListAdapter(new ArrayList<ConsumeListBean.ConsumeItem>());
adapter.setOnLoadMoreListener(this, recyclerView);
......
plugin_wallet/src/main/java/com/xxrv/wallet/activity/SetPayPwdActivity.java
View file @ 2ad9e96c
......@@ -57,20 +57,22 @@ public class SetPayPwdActivity extends BaseStatusActivity<CommonPresenter> {
ImageView imgClearPhone;
private Disposable mDisposable;
private int type;
public static Intent getIntent(Context context) {
return new Intent(context, SetPayPwdActivity.class);
public static Intent getIntent(Context context, int type) {
return new Intent(context, SetPayPwdActivity.class)
.putExtra("type", type);
}
@Override
public void onShowResult(int requestType, BaseBean result) {
switch (requestType){
switch (requestType) {
case 0:
showToast("验证码发送成功！");
break;
case 2:
startActivity(SetPayPwdActivity2.getIntent(mActivity,getPhone(),getCode()));
startActivity(SetPayPwdActivity2.getIntent(mActivity, getPhone(), getCode(), type));
break;
}
}
......@@ -83,12 +85,13 @@ public class SetPayPwdActivity extends BaseStatusActivity<CommonPresenter> {
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
titleView.setTitle("设置支付密码");
type = intent.getIntExtra("type", 0);
editListener(edtPhone);
editListener(edtIdentifyCode);
initRxbus();
BeanUserInfo.UserInfo userInfo = getUserInfo();
if (userInfo !=null){
if (userInfo != null) {
edtPhone.setText(userInfo.getUsername());
edtPhone.setEnabled(false);
}
......@@ -147,13 +150,13 @@ public class SetPayPwdActivity extends BaseStatusActivity<CommonPresenter> {
@OnClick({R2.id.btn_item_send, R2.id.btn_item_next})
public void onViewClicked(View view) {
int id = view.getId();
if (id == R.id.btn_item_send){
if (id == R.id.btn_item_send) {
if (TextUtils.isEmpty(getPhone())) {
showToast(mActivity.getString(com.rv.home.R.string.rv_phone_hint));
return;
}
sendCode(60);
}else if (id == R.id.btn_item_next){
} else if (id == R.id.btn_item_next) {
setNext();
}
}
......@@ -167,7 +170,7 @@ public class SetPayPwdActivity extends BaseStatusActivity<CommonPresenter> {
return;
}
if (TextUtils.isEmpty(getCode())){
if (TextUtils.isEmpty(getCode())) {
showToast("验证码不能为空！");
return;
}
......@@ -179,7 +182,7 @@ public class SetPayPwdActivity extends BaseStatusActivity<CommonPresenter> {
Map<String, Object> map = new LinkedHashMap<>();
map.put("phone", getPhone());
map.put("mobilecode", getCode());
mPresenter.getData(RvFrameConfig.HOST,2, WalletApi.HTTP_URL_CHECK_CHECKCODE, BaseBean.class, map,headMap, true);
mPresenter.getData(RvFrameConfig.HOST, 2, WalletApi.HTTP_URL_CHECK_CHECKCODE, BaseBean.class, map, headMap, true);
}
/**
......
plugin_wallet/src/main/java/com/xxrv/wallet/activity/SetPayPwdActivity2.java
View file @ 2ad9e96c
......@@ -44,18 +44,24 @@ public class SetPayPwdActivity2 extends BaseStatusActivity<CommonPresenter> {
private String phone;
private String mobilecode;
private int type;
public static Intent getIntent(Context context, String phone, String mobilecode) {
public static Intent getIntent(Context context, String phone, String mobilecode, int type) {
return new Intent(context, SetPayPwdActivity2.class)
.putExtra("phone", phone)
.putExtra("mobilecode", mobilecode);
.putExtra("mobilecode", mobilecode)
.putExtra("type", type);
}
@Override
public void onShowResult(int requestType, BaseBean result) {
switch (requestType){
switch (requestType) {
case 0:
if (type == 0) { //1-设置密码；2-修改密码
showToast("密码设置成功！");
} else {
showToast("密码修改成功！");
}
RxBus.post(new SetPasswordSuccessEvent());
finish();
break;
......@@ -72,6 +78,7 @@ public class SetPayPwdActivity2 extends BaseStatusActivity<CommonPresenter> {
titleView.setTitle("设置支付密码");
phone = intent.getStringExtra("phone");
mobilecode = intent.getStringExtra("mobilecode");
type = intent.getIntExtra("type", 0);
edtPwd1.addTextChangedListener(watcher);
edtPwd2.addTextChangedListener(watcher);
......@@ -120,12 +127,12 @@ public class SetPayPwdActivity2 extends BaseStatusActivity<CommonPresenter> {
@OnClick(R2.id.btn_item_confirm)
public void onViewClicked() {
String password = getEdittext(edtPwd1) + getEdittext(edtPwd2) + getEdittext(edtPwd3) + getEdittext(edtPwd4) + getEdittext(edtPwd5) + getEdittext(edtPwd6);
if (TextUtils.isEmpty(password)){
if (TextUtils.isEmpty(password)) {
showToast("密码不能为空！");
return;
}
if (password.length() != 6){
if (password.length() != 6) {
showToast("请输入6位密码");
return;
}
......@@ -138,8 +145,12 @@ public class SetPayPwdActivity2 extends BaseStatusActivity<CommonPresenter> {
map.put("phone", phone);
map.put("mobilecode", mobilecode);
map.put("password", password);
if (type == 0) { //1-设置密码；2-修改密码
map.put("type", 1);
mPresenter.postData(RvFrameConfig.HOST,0, WalletApi.HTTP_URL_WALLET_SETPWD, BaseBean.class, map,headMap, true);
} else {
map.put("type", 2);
}
mPresenter.postData(RvFrameConfig.HOST, 0, WalletApi.HTTP_URL_WALLET_SETPWD, BaseBean.class, map, headMap, true);
}
......
plugin_wallet/src/main/java/com/xxrv/wallet/activity/WalletActivity.java
View file @ 2ad9e96c
......@@ -56,6 +56,7 @@ public class WalletActivity extends BaseStatusActivity<WalletPresenter> {
private BeanUserInfo.UserInfo userInfo;
@Override
protected int setLayout() {
return R.layout.activity_wallet;
......@@ -64,7 +65,7 @@ public class WalletActivity extends BaseStatusActivity<WalletPresenter> {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
StatusBarUtil.setRootViewFitsSystemWindows(mActivity,false);
StatusBarUtil.setRootViewFitsSystemWindows(mActivity, false);
}
@Override
......@@ -153,7 +154,7 @@ public class WalletActivity extends BaseStatusActivity<WalletPresenter> {
} else if (id == R.id.tv_item_withdraw) {
//提现
if (userInfo != null) { ////实名认证状态:0-未认证，1-已认证
if (0==userInfo.getCertificationStatus()) {
if (0 == userInfo.getCertificationStatus()) {
new VerifiedTipsDialog(mActivity) {
@Override
public void helper(ViewHolder helper) {
......@@ -209,7 +210,7 @@ public class WalletActivity extends BaseStatusActivity<WalletPresenter> {
if (bean.isData()) { //true-设置过；false-没有
startActivity(WithdrawActivity.getIntent(mActivity, balance));
} else {
startActivity(SetPayPwdActivity.getIntent(mActivity));
startActivity(SetPayPwdActivity.getIntent(mActivity, 0));
}
}
}
......
plugin_wallet/src/main/java/com/xxrv/wallet/activity/WithdrawActivity.java
View file @ 2ad9e96c
......@@ -67,7 +67,7 @@ public class WithdrawActivity extends BaseStatusActivity<WalletPresenter> {
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
titleView.setTitle("提现");
tvHint.setText("当前账户余额"+intent.getStringExtra("balance")+"元");
tvHint.setText("当前账户余额" + intent.getStringExtra("balance") + "元");
}
@Override
......@@ -111,8 +111,8 @@ public class WithdrawActivity extends BaseStatusActivity<WalletPresenter> {
break;
case 4:
WithdrawBean bean = (WithdrawBean) result;
if (bean !=null){
startActivity(CashWithdrawalDetailsActivity.getIntent(mActivity,String.valueOf(bean.getData())));
if (bean != null) {
startActivity(CashWithdrawalDetailsActivity.getIntent(mActivity, String.valueOf(bean.getData())));
RxBus.post(new WithdrawSuccessEvent());
finish();
}
......@@ -227,6 +227,7 @@ public class WithdrawActivity extends BaseStatusActivity<WalletPresenter> {
@Override
public void onPayForget() {
//忘记密码
startActivity(SetPayPwdActivity.getIntent(mActivity, 1));
payPassDialog.dismiss();
}
});
......
plugin_wallet/src/main/java/com/xxrv/wallet/adapter/commissionListAdapter.java 0 → 100644
View file @ 2ad9e96c
package com.xxrv.wallet.adapter;
import android.support.annotation.Nullable;
import android.text.TextUtils;
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.xxrv.wallet.R;
import com.xxrv.wallet.bean.IncomeRecordsBean;
import java.util.List;
public class commissionListAdapter extends BaseQuickAdapter<IncomeRecordsBean.IncomeItem, BaseViewHolder> {
public commissionListAdapter(@Nullable List<IncomeRecordsBean.IncomeItem> data) {
super(R.layout.item_commission, data);
}
@Override
protected void convert(BaseViewHolder helper, IncomeRecordsBean.IncomeItem item) {
StringBuilder buffer = new StringBuilder();
if (item.getStatus() == 0) { //类别：0-正；1-负(退款时)
buffer.append(dealName(item.getUsername())).append("成交").append(item.getPrice()).append("元");
} else if (item.getStatus() == 1) {
buffer.append(dealName(item.getUsername())).append("退款").append(item.getPrice()).append("元");
}
GlideManager.getInstance(mContext).loadCircleImage(item.getHeadUrl(), (ImageView) helper.getView(R.id.iv_avatar));
helper.setText(R.id.tv_consume_name, buffer.toString());
helper.setText(R.id.tv_income_time, DateUtils.timestampToString1(item.getCrtTime()));
if (item.getWaiting() == 0) {//是否入账：0-未入账；1-已入账
helper.setBackgroundRes(R.id.tv_status, R.drawable.shape_rv_bg_income_not);
helper.setText(R.id.tv_status,"未到账");
} else if (item.getWaiting() == 1) {
helper.setBackgroundRes(R.id.tv_status, R.drawable.shape_rv_bg_income_has);
helper.setText(R.id.tv_status,"已到账");
}
if (item.getStatus() == 0) {
StringBuilder builder = new StringBuilder();
builder.append("+").append(item.getCommission()).append("元");
helper.setText(R.id.tv_amount, builder.toString());
helper.setTextColor(R.id.tv_amount,mContext.getResources().getColor(R.color.textGray));
} else if (item.getStatus() == 1) {
helper.setText(R.id.tv_amount, "取消订单");
helper.setTextColor(R.id.tv_amount,mContext.getResources().getColor(R.color.colorGray));
helper.setBackgroundRes(R.id.tv_status, R.drawable.shape_rv_bg_income_cancel);
helper.setText(R.id.tv_status,"取消");
}
}
private String dealName(String name) {
if (!TextUtils.isEmpty(name)) {
if (name.length() == 11) {
return name.substring(0, 3) + "****" + name.substring(7, name.length());
}
}
return name;
}
}
plugin_wallet/src/main/java/com/xxrv/wallet/bean/WalletcathListBean.java
View file @ 2ad9e96c
......@@ -29,7 +29,7 @@ public class WalletcathListBean extends BaseBean {
}
public static class WalletcathData {
private int totalWithdraw;
private double totalWithdraw;
private int pageNum;
private int pageSize;
private int totalCount;
......@@ -37,11 +37,11 @@ public class WalletcathListBean extends BaseBean {
private List<ItemWalletcath> walletCaths;
public int getTotalWithdraw() {
public double getTotalWithdraw() {
return totalWithdraw;
}
public void setTotalWithdraw(int totalWithdraw) {
public void setTotalWithdraw(double totalWithdraw) {
this.totalWithdraw = totalWithdraw;
}
......@@ -88,9 +88,7 @@ public class WalletcathListBean extends BaseBean {
public static class ItemWalletcath {
private int id;
private String userId;
private int cathType;
private String orderno;
private String cono;
private BigDecimal amount;
private int stauts;
......@@ -105,14 +103,6 @@ public class WalletcathListBean extends BaseBean {
this.id = id;
}
public String getUserId() {
return userId;
}
public void setUserId(String userId) {
this.userId = userId;
}
public int getCathType() {
return cathType;
}
......@@ -121,13 +111,6 @@ public class WalletcathListBean extends BaseBean {
this.cathType = cathType;
}
public String getOrderno() {
return orderno;
}
public void setOrderno(String orderno) {
this.orderno = orderno;
}
public String getCono() {
return cono;
......
plugin_wallet/src/main/java/com/xxrv/wallet/fragment/CommisionAllFragment.java
View file @ 2ad9e96c
......@@ -19,6 +19,7 @@ import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
import com.xxrv.wallet.R;
import com.xxrv.wallet.R2;
import com.xxrv.wallet.adapter.IncomeListAdapter;
import com.xxrv.wallet.adapter.commissionListAdapter;
import com.xxrv.wallet.bean.IncomeRecordsBean;
import com.yuyife.okgo.OkGoUtil;
......@@ -35,7 +36,7 @@ public class CommisionAllFragment extends BaseFragment<CommonPresenter> implemen
@BindView(R2.id.refresh)
SimpleRefreshLayout refreshLayout;
private IncomeListAdapter adapter;
private commissionListAdapter adapter;
private int currentPage = 1;
private int pageSize = 10;
......@@ -54,7 +55,7 @@ public class CommisionAllFragment extends BaseFragment<CommonPresenter> implemen
@Override
protected void initView(Bundle savedInstanceState) {
recyclerView.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayout.VERTICAL, false));
adapter = new IncomeListAdapter(new ArrayList<IncomeRecordsBean.IncomeItem>());
adapter = new commissionListAdapter(new ArrayList<IncomeRecordsBean.IncomeItem>());
adapter.setOnLoadMoreListener(this, recyclerView);
refreshLayout.setHeaderView(new SimpleRefreshView(getContext()));
refreshLayout.setOnSimpleRefreshListener(this);
......
plugin_wallet/src/main/java/com/xxrv/wallet/fragment/CommisionFinishFragment.java
View file @ 2ad9e96c
......@@ -17,6 +17,7 @@ import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
import com.xxrv.wallet.R;
import com.xxrv.wallet.R2;
import com.xxrv.wallet.adapter.IncomeListAdapter;
import com.xxrv.wallet.adapter.commissionListAdapter;
import com.xxrv.wallet.bean.IncomeRecordsBean;
import com.yuyife.okgo.OkGoUtil;
......@@ -33,7 +34,7 @@ public class CommisionFinishFragment extends BaseFragment<CommonPresenter> imple
@BindView(R2.id.refresh)
SimpleRefreshLayout refreshLayout;
private IncomeListAdapter adapter;
private commissionListAdapter adapter;
private int currentPage = 1;
private int pageSize = 10;
......@@ -52,7 +53,7 @@ public class CommisionFinishFragment extends BaseFragment<CommonPresenter> imple
@Override
protected void initView(Bundle savedInstanceState) {
recyclerView.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayout.VERTICAL, false));
adapter = new IncomeListAdapter(new ArrayList<IncomeRecordsBean.IncomeItem>());
adapter = new commissionListAdapter(new ArrayList<IncomeRecordsBean.IncomeItem>());
adapter.setOnLoadMoreListener(this, recyclerView);
refreshLayout.setHeaderView(new SimpleRefreshView(getContext()));
refreshLayout.setOnSimpleRefreshListener(this);
......
plugin_wallet/src/main/java/com/xxrv/wallet/fragment/CommisionUnFinishFragment.java
View file @ 2ad9e96c
......@@ -17,6 +17,7 @@ import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
import com.xxrv.wallet.R;
import com.xxrv.wallet.R2;
import com.xxrv.wallet.adapter.IncomeListAdapter;
import com.xxrv.wallet.adapter.commissionListAdapter;
import com.xxrv.wallet.bean.IncomeRecordsBean;
import com.yuyife.okgo.OkGoUtil;
......@@ -33,7 +34,7 @@ public class CommisionUnFinishFragment extends BaseFragment<CommonPresenter> imp
@BindView(R2.id.refresh)
SimpleRefreshLayout refreshLayout;
private IncomeListAdapter adapter;
private commissionListAdapter adapter;
private int currentPage = 1;
private int pageSize = 10;
......@@ -52,7 +53,7 @@ public class CommisionUnFinishFragment extends BaseFragment<CommonPresenter> imp
@Override
protected void initView(Bundle savedInstanceState) {
recyclerView.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayout.VERTICAL, false));
adapter = new IncomeListAdapter(new ArrayList<IncomeRecordsBean.IncomeItem>());
adapter = new commissionListAdapter(new ArrayList<IncomeRecordsBean.IncomeItem>());
adapter.setOnLoadMoreListener(this, recyclerView);
refreshLayout.setHeaderView(new SimpleRefreshView(getContext()));
refreshLayout.setOnSimpleRefreshListener(this);
......
plugin_wallet/src/main/res/drawable/shape_rv_bg_income_cancel.xml 0 → 100644
View file @ 2ad9e96c
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners
android:bottomRightRadius="6dp"
android:topLeftRadius="6dp" />
<solid android:color="@color/colorGray" />
</shape>
\ No newline at end of file
plugin_wallet/src/main/res/drawable/shape_rv_bg_income_has.xml 0 → 100644
View file @ 2ad9e96c
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners
android:bottomRightRadius="6dp"
android:topLeftRadius="6dp" />
<solid android:color="@color/gray_FDB51C" />
</shape>
\ No newline at end of file
plugin_wallet/src/main/res/drawable/shape_rv_bg_income_not.xml 0 → 100644
View file @ 2ad9e96c
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners
android:bottomRightRadius="6dp"
android:topLeftRadius="6dp" />
<solid android:color="@color/text_Gray" />
</shape>
\ No newline at end of file
plugin_wallet/src/main/res/layout/activity_wallet.xml
View file @ 2ad9e96c
......@@ -116,7 +116,7 @@
android:textSize="@dimen/text_18"
android:textStyle="bold"
android:textColor="@color/colorMain"
android:text="1021"/>
android:text="0"/>
</LinearLayout>
<LinearLayout
......@@ -141,7 +141,7 @@
android:textSize="@dimen/text_18"
android:textStyle="bold"
android:textColor="@color/colorMain"
android:text="108594"/>
android:text="0"/>
</LinearLayout>
<LinearLayout
......@@ -156,7 +156,7 @@
android:layout_height="wrap_content"
android:textSize="@dimen/text_12"
android:textColor="@color/textGray"
android:text="未入账（元）"/>
android:text="待入账（元）"/>
<TextView
android:id="@+id/tv_not_amount"
......@@ -166,7 +166,7 @@
android:textSize="@dimen/text_18"
android:textStyle="bold"
android:textColor="@color/colorMain"
android:text="5290"/>
android:text="0"/>
</LinearLayout>
</LinearLayout>
......@@ -190,7 +190,7 @@
android:textSize="@dimen/text_14"
android:layout_centerVertical="true"
android:textColor="@color/colorMain"
android:text="消费明细"/>
android:text="账单明细"/>
<ImageView
android:layout_width="wrap_content"
......
plugin_wallet/src/main/res/layout/fragment_income_record.xml
View file @ 2ad9e96c
......@@ -4,11 +4,6 @@
android:layout_height="match_parent"
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="8dp"
android:background="@color/white" />
<include layout="@layout/common_refresh" />
</LinearLayout>
plugin_wallet/src/main/res/layout/item_commision.xml
View file @ 2ad9e96c
......@@ -2,21 +2,24 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="@dimen/size_60"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_10"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="59dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_10"
android:layout_marginBottom="@dimen/size_10"
android:gravity="center_vertical"
android:orientation="horizontal">
<LinearLayout
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/size_5"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="vertical">
......@@ -24,33 +27,31 @@
android:id="@+id/tv_consume_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="11"
android:text="欣小新支付1900元"
android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/tv_income_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="11"
android:layout_marginTop="@dimen/size_5"
android:text="2019-06-25 10:00"
android:textColor="@color/colorGray"
android:textSize="@dimen/text_10" />
</LinearLayout>
<TextView
android:id="@+id/tv_amount"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="right"
android:layout_marginRight="@dimen/text_10"
android:drawablePadding="@dimen/size_5"
android:gravity="right|center_vertical"
android:text="11"
android:text="+380元"
android:textColor="@color/gray_707070"
android:textSize="@dimen/sp_14" />
</LinearLayout>
<include layout="@layout/common_line" />
</LinearLayout>
plugin_wallet/src/main/res/layout/item_commission.xml 0 → 100644
View file @ 2ad9e96c
<?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="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_10"
android:layout_marginTop="@dimen/size_10"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shape_rv_edittext_line_input"
android:orientation="vertical">
<TextView
android:id="@+id/tv_status"
android:layout_width="@dimen/size_60"
android:layout_height="@dimen/size_20"
android:background="@drawable/shape_rv_bg_income_not"
android:gravity="center"
android:text=""
android:textColor="@color/colorWrite"
android:textSize="@dimen/text_10" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginTop="@dimen/size_5"
android:layout_marginRight="@dimen/size_15"
android:layout_marginBottom="@dimen/size_15"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:id="@+id/iv_avatar"
android:layout_width="@dimen/size_40"
android:layout_height="@dimen/size_40" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/size_10"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="vertical">
<TextView
android:id="@+id/tv_consume_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textColor="@color/textMain"
android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/tv_income_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_5"
android:text=""
android:textColor="@color/colorGray"
android:textSize="@dimen/text_10" />
</LinearLayout>
<TextView
android:id="@+id/tv_amount"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="right"
android:drawablePadding="@dimen/size_5"
android:gravity="right|center_vertical"
android:text=""
android:textColor="@color/textGray"
android:textSize="@dimen/sp_14" />
</LinearLayout>
</LinearLayout>
<include layout="@layout/common_line" />
</LinearLayout>
plugin_wallet/src/main/res/values/strings.xml
View file @ 2ad9e96c
......@@ -2,7 +2,7 @@
<string name="app_name">plugin_wallet</string>
<string-array name="commision_list">
<item>全部</item>
<item>未到账</item>
<item>待入账</item>
<item>已到账</item>
</string-array>
......
settings.gradle
View file @ 2ad9e96c
include ':RvFrame', ':plugin_im', ':jcvideoplayer-lib'
include ':RvFrame'
include ':RvClient'
include ':RvWrapper'
include ':module_home'
......@@ -29,5 +29,7 @@ include ':plugin_points'
include ':plugin_imcamera'
include ':plugin_wallet'
include ':plugin_video'
include '::plugin_carpurchase'
include '::plugin_poster'
\ No newline at end of file
include ':plugin_carpurchase'
include ':plugin_poster'
include ':plugin_im'
include ':jcvideoplayer-lib'
\ 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