Skip to content

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

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

parents 022800f8 9e9e5333
Show whitespace changes
Inline Side-by-side
Showing with 249 additions and 111 deletions
RvWrapper/src/main/java/com/ruiwenliu/wrapper/base/BaseActivity.java
View file @ da5481a6
......@@ -80,8 +80,8 @@ public abstract class BaseActivity<P extends MvpPresenter> extends BaseWrapperAc
@Override
public void onShowError(String errorMsg, int errorType) {
if(!TextUtils.isEmpty(errorMsg)){
showToast(errorMsg+errorType);
if (!TextUtils.isEmpty(errorMsg)) {
showToast(errorMsg);
}
}
......
RvWrapper/src/main/java/com/ruiwenliu/wrapper/http/RxRequestResult.java
View file @ da5481a6
......@@ -42,7 +42,7 @@ public class RxRequestResult<T extends BaseBean, V extends BaseView<T>> extends
if (response.isSuccessful()) {
try {
String result = response.body().string();
T bean = new Gson().fromJson(result,baseBean);
T bean = new Gson().fromJson(result, baseBean);
switch (bean.status) {
case RvFrameConstant.HTTP_STATE_SUCCESS:
baseView.onShowResult(position, bean);
......@@ -54,6 +54,7 @@ public class RxRequestResult<T extends BaseBean, V extends BaseView<T>> extends
baseView.onShowError("", RvFrameConstant.HTTP_STATE_NOT_REGISTERED);
break;
case RvFrameConstant.HTTP_STATE_DATA_ALREADY_EXISTS:
baseView.onShowError(bean.message, RvFrameConstant.HTTP_STATE_DATA_ALREADY_EXISTS);
break;
default:
baseView.onShowError(bean.message, bean.status);
......@@ -64,8 +65,8 @@ public class RxRequestResult<T extends BaseBean, V extends BaseView<T>> extends
e.printStackTrace();
}
}else {
baseView.onShowError("服务器链接失败",response.code());
} else {
baseView.onShowError("服务器链接失败", response.code());
}
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/HomeFragment.java
View file @ da5481a6
......@@ -275,7 +275,7 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
@Override
public void onGlobalLayout() {
rlItemLayout.getViewTreeObserver().removeGlobalOnLayoutListener(this);
height = rlItemLayout.getHeight()-120;
height = rlItemLayout.getHeight() - 120;
rlItemLayout.getWidth();
scrollview.setScrollViewListener(HomeFragment.this);
}
......@@ -497,6 +497,7 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
private void setRecommendGood(HomeHotGoodListBean data) {
mAdapter.getData().clear();
mAdapter.setType(hotType);
mAdapter.setNewData(data.getData());
}
......@@ -584,9 +585,9 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
//选择日期
ARouter.getInstance()
.build(Constance.ACTIVITY_URL_CALENDAR)
.withString("begDate",begDate)
.withString("endDate",endDate)
.navigation(_mActivity,108);
.withString("begDate", begDate)
.withString("endDate", endDate)
.navigation(_mActivity, 108);
} else if (id == R.id.tv_select_car) {
if (copyDay < 1) {
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/adapter/HotCarTypeAdapter.java
View file @ da5481a6
package com.rv.home.rv.module.ui.main.home.adapter;
import android.text.TextUtils;
import android.widget.ImageView;
import com.base.utils.ui.datetime.selector.util.TextUtil;
......@@ -15,7 +16,10 @@ import com.rv.home.rv.module.ui.main.home.bean.HomePopularBrigade;
* Desc:热门车型适配
*/
public class HotCarTypeAdapter extends BaseQuickAdapter<HomeHotGoodListBean.DataBean,BaseGlideHolder>{
public class HotCarTypeAdapter extends BaseQuickAdapter<HomeHotGoodListBean.DataBean, BaseGlideHolder> {
private String hotType;
public HotCarTypeAdapter() {
super(R.layout.rv_item_hot_car_type);
}
......@@ -26,11 +30,37 @@ 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_one_car)));
}else {
helper.setText(R.id.tv_price,"");
helper.setText(R.id.tv_price, String.format("¥%1$s%2$s", bean.getPrice(), getUnit()));
} else {
helper.setText(R.id.tv_price, "");
}
}
public void setType(String hotType) {
this.hotType = hotType;
}
private String getUnit() {
if (!TextUtils.isEmpty(hotType)) {
switch (hotType) {
case "1":
return mContext.getString(R.string.rv_one_car);
case "2":
return mContext.getString(R.string.rv_one_person);
case "3":
return mContext.getString(R.string.rv_day);
default:
return mContext.getString(R.string.rv_one_car);
}
}
return mContext.getString(R.string.rv_one_car);
}
// @Override
// public int getItemCount() {
// return 4;
// }
@Override
public int getItemCount() {
return 4;
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/CancelTheTripActivity.java
View file @ da5481a6
......@@ -7,7 +7,9 @@ import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.text.TextUtils;
import android.view.View;
import android.widget.Toast;
import com.base.utils.ui.datetime.selector.util.TextUtil;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.frame.base.bus.CancelOrderEvent;
import com.frame.base.bus.RxBus;
......@@ -52,13 +54,14 @@ public class CancelTheTripActivity extends BaseStatusActivity<PickerPresenter> {
public void onShowResult(int requestType, BaseBean result) {
switch (requestType) {
case 0:
showToast("取消成功！");
RxBus.post(new CancelOrderEvent());
finish();
showToast("取消成功！");
break;
}
}
@Override
protected int setLayout() {
return R.layout.activity_cancel_the_trip;
......@@ -85,7 +88,7 @@ public class CancelTheTripActivity extends BaseStatusActivity<PickerPresenter> {
@OnClick(R2.id.tv_ok)
public void onViewClicked() {
new TipsDialog(mActivity){
new TipsDialog(mActivity) {
@Override
public void helper(ViewHolder helper) {
super.helper(helper);
......@@ -93,7 +96,7 @@ public class CancelTheTripActivity extends BaseStatusActivity<PickerPresenter> {
@Override
public void onClick(View v) {
int id = v.getId();
if (id ==R.id.tv_ok) {
if (id == R.id.tv_ok) {
if (TextUtils.isEmpty(mAdapter.getSelectName())) {
showToast("请选择取消原因！");
return;
......@@ -103,11 +106,11 @@ public class CancelTheTripActivity extends BaseStatusActivity<PickerPresenter> {
mPresenter.postBodyData(RvFrameConfig.VEHICLE_ORDER, 0, ApiConfig.HTTP_URL_BASEORDER_CANCEL + no, CancelTheTripBean.class, new cancelReasonBean(mAdapter.getSelectName()), mapHead, true);
dismiss();
}else if (id ==R.id.tv_cancel ) {
} else if (id == R.id.tv_cancel) {
dismiss();
}
}
},R.id.tv_ok, R.id.tv_cancel);
}, R.id.tv_ok, R.id.tv_cancel);
}
}.show();
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/ForPaymentFragment.java
View file @ da5481a6
......@@ -40,6 +40,7 @@ import java.util.LinkedHashMap;
import java.util.Map;
import butterknife.BindView;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers;
......@@ -60,7 +61,6 @@ public class ForPaymentFragment extends BaseFragment<CommonPresenter> implements
private int mPage;
private int countPage;
private IWXAPI api;
private long effTime = 0; // 失效时间
private OrderListBean.DataBeanX.DataBean payBean = null;
private int payPosition = -1;
......@@ -129,10 +129,16 @@ public class ForPaymentFragment extends BaseFragment<CommonPresenter> implements
}
private Handler handler = new Handler(Looper.getMainLooper()) {
private Disposable disposable;
@SuppressLint("CheckResult")
private void initRxBus() {
disposable = RxBus.tObservable(PaymentSuccessfulEvent.class)
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Consumer<PaymentSuccessfulEvent>() {
@Override
public void handleMessage(Message msg) {
super.handleMessage(msg);
public void accept(PaymentSuccessfulEvent payEvent) throws Exception {
if (payPosition != -1) {
if (mAdapter != null && !mAdapter.getData().isEmpty()) {
mAdapter.getData().remove(payPosition);
......@@ -143,26 +149,12 @@ public class ForPaymentFragment extends BaseFragment<CommonPresenter> implements
mListener.switchTab(3);
}
}
};
private Disposable disposable;
@SuppressLint("CheckResult")
private void initRxBus() {
disposable = RxBus.tObservable(PaymentSuccessfulEvent.class)
.observeOn(Schedulers.io())
.subscribe(new Consumer<PaymentSuccessfulEvent>() {
@Override
public void accept(PaymentSuccessfulEvent payEvent) throws Exception {
handler.sendEmptyMessage(0);
}
});
}
@Override
public void onDestroyView() {
super.onDestroyView();
handler.removeCallbacksAndMessages(null);
if (disposable != null && !disposable.isDisposed()) {
disposable.dispose();
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/OrderDetailActivity.java
View file @ da5481a6
package com.rv.home.rv.module.ui.main.home.order;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.ClipboardManager;
import android.content.Context;
import android.content.Intent;
......@@ -19,6 +20,7 @@ import android.widget.TextView;
import com.alibaba.android.arouter.launcher.ARouter;
import com.frame.base.bus.CancelOrderEvent;
import com.frame.base.bus.Observer;
import com.frame.base.bus.PaymentSuccessfulEvent;
import com.frame.base.bus.RxBus;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean;
......@@ -46,6 +48,8 @@ import java.util.Map;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers;
......@@ -128,6 +132,10 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
// mWebView.addJavascriptInterface(new AndroidJs(),"AndroidJs");
mWebView.destroy();// 生命周期销毁
if (paySucDisposable != null && !paySucDisposable.isDisposed()) {
paySucDisposable.dispose();
}
}
......@@ -184,6 +192,9 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
}
}
private Disposable paySucDisposable;
@SuppressLint("CheckResult")
private void initRxBus() {
......@@ -192,10 +203,20 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
.subscribe(new Observer<CancelOrderEvent>(disposable) {
@Override
public void onNext(CancelOrderEvent event) {
setResult(Activity.RESULT_OK);
finish();
}
});
paySucDisposable = RxBus.tObservable(PaymentSuccessfulEvent.class)
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Consumer<PaymentSuccessfulEvent>() {
@Override
public void accept(PaymentSuccessfulEvent paymentSuccessfulEvent) throws Exception {
setResult(Activity.RESULT_OK);
finish();
}
});
}
@Override
......@@ -402,7 +423,7 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
// 如果此设置是允许，则 setAllowFileAccessFromFileURLs 不起做用
webSettings.setAllowUniversalAccessFromFileURLs(true);
mWebView.addJavascriptInterface(new AndroidJs(), "AndroidJs");
mWebView.setWebViewClient(new WebViewClient(){
mWebView.setWebViewClient(new WebViewClient() {
@Override
public boolean shouldOverrideUrlLoading(WebView view, String url) {
return false;
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/OrderListActivity.java
View file @ da5481a6
......@@ -51,8 +51,6 @@ public class OrderListActivity extends BaseStatusActivity<PickerPresenter> {
return new Intent(context, OrderListActivity.class).putExtra("position", position);
}
;
@Override
protected int setLayout() {
......@@ -165,4 +163,5 @@ public class OrderListActivity extends BaseStatusActivity<PickerPresenter> {
public interface SwitchListener {
void switchTab(int position);
}
}
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/ToTravelFragment.java
View file @ da5481a6
......@@ -30,6 +30,7 @@ import java.util.LinkedHashMap;
import java.util.Map;
import butterknife.BindView;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers;
......@@ -105,7 +106,7 @@ public class ToTravelFragment extends BaseFragment<CommonPresenter> implements B
@SuppressLint("CheckResult")
private void initRxBus() {
RxBus.tObservable(CancelOrderEvent.class)
.observeOn(Schedulers.newThread())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<CancelOrderEvent>(disposable) {
@Override
public void onNext(CancelOrderEvent event) {
......
module_home/src/main/res/values/strings.xml
View file @ da5481a6
......@@ -39,6 +39,7 @@
<string name="rv_car_type_selected">筛选</string>
<string name="rv_day">/天</string>
<string name="rv_one_car">/辆</string>
<string name="rv_one_person">/人</string>
<string name="rv_km">km</string>
<string name="rv_km_you">距您</string>
<string name="rv_select_car">选择车型</string>
......
module_mine/src/main/java/com/rv/rvmine/MineFragment.java
View file @ da5481a6
......@@ -59,6 +59,7 @@ import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import butterknife.Unbinder;
import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers;
/**
......@@ -72,6 +73,8 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
TextView tvNickname;
@BindView(R2.id.iv_member)
ImageView ivMember;
@BindView(com.rv.member.R2.id.tv_member)
TextView tvMember;
@BindView(R2.id.tv_login)
TextView tvLogin;
@BindView(R2.id.tv_verified)
......@@ -137,14 +140,15 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
if (TextUtils.isEmpty(OkGoUtil.getToken())) {
tvNickname.setVisibility(View.GONE);
ivMember.setVisibility(View.GONE);
((View) ivMember.getParent()).setVisibility(View.GONE);
tvLogin.setVisibility(View.VISIBLE);
tvVerified.setVisibility(View.GONE);
tvViewPrivileges.setText("会员中心");
mSimpleRefreshLayout.setPullDownEnable(false);
} else {
tvNickname.setVisibility(View.VISIBLE);
ivMember.setVisibility(View.VISIBLE);
((View) ivMember.getParent()).setVisibility(View.VISIBLE);
// ivMember.setVisibility(View.VISIBLE);
tvLogin.setVisibility(View.GONE);
tvVerified.setVisibility(View.VISIBLE);
tvViewPrivileges.setText("查看会员特权");
......@@ -270,7 +274,8 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
if (requestCode == 101 && resultCode == 201) {
ivAvatar.setImageResource(R.drawable.common_icon_avatar_default);
tvNickname.setVisibility(View.GONE);
ivMember.setVisibility(View.GONE);
((View) ivMember.getParent()).setVisibility(View.GONE);
// ivMember.setVisibility(View.GONE);
tvLogin.setVisibility(View.VISIBLE);
tvVerified.setVisibility(View.GONE);
tvUserIdentity.setVisibility(View.GONE);
......@@ -389,6 +394,8 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
tvVerified.setEnabled(false);
}
if (!TextUtils.isEmpty(info.getIcon()))
GlideManager.getInstance(getContext()).loadImage(info.getIcon(), ivMember);
if (TextUtils.isEmpty(info.getPositionName())){
tvUserIdentity.setVisibility(View.GONE);
}else {
......@@ -400,17 +407,17 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
if (0 == info.getIsMember()) {
tvMembershipLevel.setText("会员特权");
tvMemberHint.setText("免费用车7天");
ivMember.setImageResource(R.drawable.mycenter_icon_type_general_user);
tvMember.setText("普通用户");
} else if (1 == info.getIsMember()) {
if (1 == info.getMemberLevel()) { //1 普通会员 2 黄金会员 3 钻石会员
tvMembershipLevel.setText(" 普通会员特权");
ivMember.setImageResource(R.drawable.mycenter_icon_type_ordinary_member);
tvMember.setText("普通会员");
} else if (2 == info.getMemberLevel()) {
tvMembershipLevel.setText("黄金会员特权");
ivMember.setImageResource(R.drawable.mycenter_icon_type_gold_member);
tvMember.setText("黄金会员");
} else if (3 == info.getMemberLevel()) {
tvMembershipLevel.setText("钻石会员特权");
ivMember.setImageResource(R.drawable.mycenter_icon_type_diamond_membership);
tvMember.setText("钻石会员");
}
tvMemberHint.setText("免费用车" + info.getRentFreeDays() + "天");
}
......@@ -419,12 +426,14 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
if (TextUtils.isEmpty(OkGoUtil.getToken())) {
tvNickname.setVisibility(View.GONE);
ivMember.setVisibility(View.GONE);
((View) ivMember.getParent()).setVisibility(View.GONE);
// ivMember.setVisibility(View.GONE);
tvLogin.setVisibility(View.VISIBLE);
tvVerified.setVisibility(View.GONE);
} else {
tvNickname.setVisibility(View.VISIBLE);
ivMember.setVisibility(View.VISIBLE);
((View) ivMember.getParent()).setVisibility(View.VISIBLE);
// ivMember.setVisibility(View.VISIBLE);
tvLogin.setVisibility(View.GONE);
tvVerified.setVisibility(View.VISIBLE);
}
......
module_mine/src/main/java/com/rv/rvmine/bean/UserInfoBean.java
View file @ da5481a6
......@@ -31,6 +31,8 @@ public class UserInfoBean extends BaseBean {
public static class UserInfo implements Serializable {
private Integer id;
private String icon ;
//用户id
private Integer userid;
//imid
......@@ -279,5 +281,13 @@ public class UserInfoBean extends BaseBean {
public void setPositionName(String positionName) {
this.positionName = positionName;
}
public String getIcon() {
return icon;
}
public void setIcon(String icon) {
this.icon = icon;
}
}
}
module_mine/src/main/res/layout/activity_idcard_certification.xml
View file @ da5481a6
......@@ -60,12 +60,12 @@
</RelativeLayout>
<LinearLayout
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colorWrite"
android:orientation="horizontal"
android:padding="@dimen/size_15">
android:padding="@dimen/size_15"
android:visibility="gone">
<TextView
android:layout_width="wrap_content"
......@@ -80,9 +80,9 @@
android:layout_height="wrap_content"
android:background="@null"
android:hint="@string/tv_phone_hint"
android:inputType="number"
android:maxLength="11"
android:paddingLeft="@dimen/size_20"
android:inputType="number"
android:text=""
android:textColor="@color/textMain"
android:textSize="@dimen/text_14" />
......@@ -101,9 +101,9 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/size_50"
android:background="@color/colorWrite"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginRight="@dimen/size_15"
android:background="@color/colorWrite"
android:gravity="center_vertical"
android:orientation="horizontal">
......@@ -116,10 +116,13 @@
<EditText
android:id="@+id/et_id_card"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@null"
android:digits="0123456789xyzXYZ"
android:gravity="left|center_vertical"
android:hint="@string/tv_id_card_hint"
android:inputType="number|text"
android:maxLength="18"
android:paddingLeft="@dimen/size_20"
android:text=""
......@@ -133,107 +136,117 @@
android:layout_marginLeft="@dimen/size_15"
android:layout_marginRight="@dimen/size_15"
android:background="@color/colorWrite">
<include layout="@layout/common_line" />
</RelativeLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_5"
android:background="@color/colorWrite"
android:padding="@dimen/size_15"
android:layout_marginTop="@dimen/size_5"
android:text="@string/tv_point"
android:textColor="@color/textMain"
android:textSize="@dimen/text_16" />
<RelativeLayout
android:id="@+id/rl_card"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/size_80"
android:layout_marginTop="@dimen/size_20"
android:layout_marginRight="@dimen/size_80"
android:layout_marginLeft="@dimen/size_80"
android:background="@color/colorLine"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:background="@color/colorLine">
<ImageView
android:id="@+id/iv_card"
android:scaleType="centerCrop"
android:layout_width="match_parent"
android:layout_height="@dimen/size_150" />
android:layout_height="@dimen/size_150"
android:scaleType="centerCrop" />
<LinearLayout
android:id="@+id/ll_card"
android:layout_centerInParent="true"
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:gravity="center_horizontal"
android:layout_height="wrap_content">
android:orientation="vertical">
<ImageView
android:src="@drawable/common_icon_front"
android:layout_width="@dimen/size_45"
android:layout_height="@dimen/size_30" />
android:layout_height="@dimen/size_30"
android:src="@drawable/common_icon_front" />
<TextView
android:layout_marginTop="@dimen/size_10"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/tv_front"
/>
android:layout_marginTop="@dimen/size_10"
android:text="@string/tv_front" />
</LinearLayout>
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_card_copy"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/size_80"
android:layout_marginTop="@dimen/size_20"
android:layout_marginRight="@dimen/size_80"
android:layout_marginLeft="@dimen/size_80"
android:background="@color/colorLine"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:background="@color/colorLine">
<ImageView
android:id="@+id/iv_card_copy"
android:layout_width="match_parent"
android:scaleType="centerCrop"
android:layout_height="@dimen/size_150" />
android:layout_height="@dimen/size_150"
android:scaleType="centerCrop" />
<LinearLayout
android:id="@+id/ll_card_copy"
android:layout_centerInParent="true"
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:gravity="center_horizontal"
android:layout_height="wrap_content">
android:orientation="vertical">
<ImageView
android:src="@drawable/common_icon_verso"
android:layout_width="@dimen/size_45"
android:layout_height="@dimen/size_30" />
android:layout_height="@dimen/size_30"
android:src="@drawable/common_icon_verso" />
<TextView
android:layout_marginTop="@dimen/size_10"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/tv_negative"
/>
android:layout_marginTop="@dimen/size_10"
android:text="@string/tv_negative" />
</LinearLayout>
</RelativeLayout>
<TextView
android:layout_marginTop="@dimen/size_15"
android:text="@string/tv_id_card_photo_hint"
android:layout_width="match_parent"
android:textSize="@dimen/text_12"
android:textColor="@color/textLightGrey"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_15"
android:gravity="center"
/>
android:text="@string/tv_id_card_photo_hint"
android:textColor="@color/textLightGrey"
android:textSize="@dimen/text_12" />
<TextView
android:layout_width="match_parent"
android:text="确定"
android:id="@+id/tv_ok"
android:layout_width="match_parent"
android:layout_height="@dimen/size_50"
android:layout_margin="@dimen/size_25"
android:textColor="@color/colorWrite"
android:background="@drawable/resource_drawable_shape_member_bg"
android:gravity="center"
android:textSize="@dimen/text_16"
android:layout_height="@dimen/size_50" />
android:text="确定"
android:textColor="@color/colorWrite"
android:textSize="@dimen/text_16" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/size_20"/>
android:layout_height="@dimen/size_20" />
</LinearLayout>
......
module_mine/src/main/res/layout/activity_mine.xml
View file @ da5481a6
......@@ -84,13 +84,29 @@
android:visibility="gone" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="@dimen/size_15"
android:layout_marginTop="@dimen/text_10"
android:orientation="horizontal"
android:visibility="gone">
<ImageView
android:id="@+id/iv_member"
android:layout_width="@dimen/size_15"
android:layout_height="@dimen/size_15" />
<TextView
android:id="@+id/tv_member"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/text_10"
android:src="@drawable/mycenter_icon_type_general_user"
android:visibility="gone" />
android:layout_height="@dimen/size_15"
android:layout_marginLeft="@dimen/size_2"
android:gravity="center"
android:textColor="@color/gray_f5f5f5"
android:textSize="@dimen/text_10" />
</LinearLayout>
<TextView
......
plugin_member/src/main/java/com/rv.member/MemberCenterActivity.java
View file @ da5481a6
......@@ -80,6 +80,8 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
TextView tvFreeDay;
@BindView(R2.id.tv_purchase_record)
TextView tvPurchaseRecord;
@BindView(R2.id.tv_member)
TextView tvMember;
private MemberListAdapter adapter;
private UserInfoBean.UserInfo info;
......@@ -267,7 +269,8 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
if (TextUtils.isEmpty(OkGoUtil.getToken())) {
tvNickname.setVisibility(View.GONE);
ivMember.setVisibility(View.GONE);
((View) ivMember.getParent()).setVisibility(View.GONE);
// ivMember.setVisibility(View.GONE);
tvLogin.setVisibility(View.VISIBLE);
tvVerified.setVisibility(View.GONE);
} else {
......@@ -275,14 +278,19 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
tvLogin.setVisibility(View.GONE);
tvVerified.setVisibility(View.VISIBLE);
if (info != null) {
ivMember.setVisibility(View.VISIBLE);
((View) ivMember.getParent()).setVisibility(View.VISIBLE);
// ivMember.setVisibility(View.VISIBLE);
if (!TextUtils.isEmpty(info.getIcon()))
GlideManager.getInstance(getApplicationContext()).loadImage(info.getIcon(), ivMember);
freeUseDay = info.getRentFreeDays();
if (info.getIsMember() == 0) {
memberLevel = 0;
if (adapter != null) {
adapter.setMemberLevel(memberLevel, freeUseDay);
}
ivMember.setImageResource(R.drawable.mycenter_icon_goldmembership_1);
tvMember.setText("普通用户");
// ivMember.setImageResource(R.drawable.mycenter_icon_goldmembership_1);
} else {
memberLevel = info.getMemberLevel();
if (adapter != null) {
......@@ -290,13 +298,13 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
}
switch (info.getMemberLevel()) {
case 1:
ivMember.setImageResource(R.drawable.mycenter_icon_ord_membership);
tvMember.setText("普通会员");
break;
case 2:
ivMember.setImageResource(R.drawable.mycenter_icon_goldmembership);
tvMember.setText("黄金会员");
break;
case 3:
ivMember.setImageResource(R.drawable.mycenter_icon_sil_membership);
tvMember.setText("钻石会员");
break;
default:
break;
......@@ -327,7 +335,7 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
@Override
public void pay(final MemberListBean.MemberCard card) {
if (!isLogin()) return;
if (!isVerified()) return;
// if (!isVerified()) return;
new PaymentTypeSelection(MemberCenterActivity.this) {
@Override
public void helper(final ViewHolder helper) {
......
plugin_member/src/main/java/com/rv.member/PurchaseRecordActivity.java
View file @ da5481a6
......@@ -106,6 +106,7 @@ public class PurchaseRecordActivity extends BaseStatusActivity<CommonPresenter>
mapData.put("page", page);
mapData.put("limit", 10);
mapData.put("status", 6);
mapData.put("type", 3);
mPresenter.getData(RvFrameConfig.VEHICLE_ORDER, 0, ApiConfig.HTTP_URL_ORDER_LIST, OrderListBean.class, mapData, headMap, page == 1 ? true : false);
}
......
plugin_member/src/main/java/com/rv.member/bean/UserInfoBean.java
View file @ da5481a6
......@@ -32,6 +32,8 @@ public class UserInfoBean extends BaseBean implements Serializable {
public static class UserInfo implements Serializable {
private Integer id;
private String icon ;
//用户id
private Integer userid;
//imid
......@@ -260,5 +262,13 @@ public class UserInfoBean extends BaseBean implements Serializable {
public void setMemberLevel(int memberLevel) {
this.memberLevel = memberLevel;
}
public String getIcon() {
return icon;
}
public void setIcon(String icon) {
this.icon = icon;
}
}
}
plugin_member/src/main/res/layout/activity_member.xml
View file @ da5481a6
......@@ -72,9 +72,31 @@
android:textSize="@dimen/text_16"
android:visibility="gone" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="@dimen/size_15"
android:layout_marginTop="@dimen/text_10"
android:orientation="horizontal"
android:visibility="gone">
<ImageView
android:id="@+id/iv_member"
android:layout_width="@dimen/size_15"
android:layout_height="@dimen/size_15" />
<TextView
android:id="@+id/tv_member"
android:layout_width="wrap_content"
android:layout_height="@dimen/size_15"
android:layout_marginLeft="@dimen/size_2"
android:gravity="center"
android:textColor="@color/gray_f5f5f5"
android:textSize="@dimen/text_10" />
</LinearLayout>
<ImageView
android:id="@+id/wrap"
android:layout_width="@dimen/size_60"
android:layout_height="@dimen/size_20"
android:layout_marginTop="@dimen/text_10"
......
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