Skip to content

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

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

parents 939ba0e6 a974de4c
Hide whitespace changes
Inline Side-by-side
Showing with 160 additions and 21 deletions
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/CarDetailActivity.java
View file @ 240bf216
......@@ -156,6 +156,7 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
@Override
public void onNext(PaymentSuccessfulEvent event) {
getUserData();
finish();
}
});
......@@ -165,6 +166,7 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
@Override
public void onNext(PaymentFailedEvent event) {
getUserData();
finish();
}
});
}
......@@ -337,7 +339,6 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
}
private void initWeb() {
WebSettings webSettings = mWebView.getSettings();
if (webSettings == null) return;
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/CarRentalListActivity.java
View file @ 240bf216
......@@ -15,6 +15,10 @@ import android.widget.TextView;
import com.alibaba.android.arouter.launcher.ARouter;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.frame.base.bus.Observer;
import com.frame.base.bus.PaymentFailedEvent;
import com.frame.base.bus.PaymentSuccessfulEvent;
import com.frame.base.bus.RxBus;
import com.frame.base.url.Constance;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean;
......@@ -50,6 +54,8 @@ import java.util.Map;
import butterknife.BindView;
import butterknife.OnClick;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
/**
* Created :Auser
......@@ -166,6 +172,28 @@ public class CarRentalListActivity extends BaseStatusActivity<CommonPresenter> i
}
}
});
initRxbus();
}
private void initRxbus() {
RxBus.tObservable(PaymentSuccessfulEvent.class)
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<PaymentSuccessfulEvent>(disposable) {
@Override
public void onNext(PaymentSuccessfulEvent event) {
onFresh();
}
});
RxBus.tObservable(PaymentFailedEvent.class)
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<PaymentFailedEvent>(disposable) {
@Override
public void onNext(PaymentFailedEvent event) {
onFresh();
}
});
}
......@@ -292,7 +320,7 @@ public class CarRentalListActivity extends BaseStatusActivity<CommonPresenter> i
headMap.put("Authorization", OkGoUtil.getToken());
Map<String, Object> map = new LinkedHashMap<>();
map.put("start", begDate);
map.put("end",endDate);
map.put("end", endDate);
mPresenter.getData(RvFrameConfig.HOST, 2, ApiConfig.HTTP_URL_CALENDAR_PRICE + id, CarRentalPriceBean.class, map, headMap, true);
}
......
module_tourism/src/main/java/com/rv/tourism/other/TravelDetailsActivity.java
View file @ 240bf216
......@@ -30,6 +30,8 @@ import com.baidu.mapapi.model.LatLng;
import com.base.utils.ui.datetime.selector.util.TextUtil;
import com.frame.base.bus.IDCardCertificationEvent;
import com.frame.base.bus.Observer;
import com.frame.base.bus.PaymentFailedEvent;
import com.frame.base.bus.PaymentSuccessfulEvent;
import com.frame.base.bus.RxBus;
import com.frame.base.url.Constance;
import com.frame.rv.config.CommonApi;
......@@ -104,7 +106,6 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
private TravelBookingDialog travelBookingDialog;
private BeanTourDetailData.DataBeanX DetailsData;
@Autowired()
String id;
......@@ -161,18 +162,24 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
llItemBottom.setVisibility(View.GONE);
}
});
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
mWebView.setOnScrollChangeListener(new View.OnScrollChangeListener() {
@Override
public void onScrollChange(View v, int scrollX, int scrollY, int oldScrollX, int oldScrollY) {
Log.d("scroll", "scrollX=" + scrollX);
Log.d("scroll", "scrollY=" + scrollY);
Log.d("scroll", "oldScrollX=" + oldScrollX);
Log.d("scroll", "oldScrollY=" + oldScrollY);
}
});
}
RxBus.tObservable(PaymentSuccessfulEvent.class)
.observeOn(Schedulers.newThread())
.subscribe(new Observer<PaymentSuccessfulEvent>(disposable) {
@Override
public void onNext(PaymentSuccessfulEvent event) {
finish();
}
});
RxBus.tObservable(PaymentFailedEvent.class)
.observeOn(Schedulers.newThread())
.subscribe(new Observer<PaymentFailedEvent>(disposable) {
@Override
public void onNext(PaymentFailedEvent event) {
finish();
}
});
}
@OnClick({R2.id.iv_back, R2.id.tv_appointment, R2.id.iv_collect, R2.id.iv_share, R2.id.tv_customer_service})
......
plugin_poster/src/main/java/com/rv/poster/plugin/CarPosterActivity.java
View file @ 240bf216
......@@ -23,6 +23,7 @@ import com.bumptech.glide.Glide;
import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
import com.bumptech.glide.request.RequestOptions;
import com.frame.base.url.Constance;
import com.ruiwenliu.wrapper.SPConstance;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseStatusActivity;
import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
......@@ -31,6 +32,7 @@ import com.ruiwenliu.wrapper.util.glide.GlideOptions;
import com.ruiwenliu.wrapper.util.um.CustomShareListener;
import com.ruiwenliu.wrapper.util.um.ShareManager;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.component.utils.Cookie;
import com.rv.component.utils.DisplayUtil;
import com.rv.component.utils.IsAppInstall;
import com.rv.component.utils.ShareUtils;
......@@ -82,6 +84,9 @@ public class CarPosterActivity extends BaseStatusActivity<CommonPresenter> {
@BindView(R2.id.scrollView)
ScrollView scrollView;
@BindView(R2.id.tv_invitation_code)
TextView tvInvitationCode;
private ShareManager shareManager;
private Bitmap bitmap = null;
......@@ -118,6 +123,11 @@ public class CarPosterActivity extends BaseStatusActivity<CommonPresenter> {
tvContent.setText(content);
tvPrice.setText("¥" + price + "/天");
String userCode = Cookie.getStringValue(this, SPConstance.USER_JSON_CODE);
if (!TextUtils.isEmpty(userCode)) {
tvInvitationCode.setText("邀请码" + userCode);
}
}
@Override
......
plugin_poster/src/main/java/com/rv/poster/plugin/PosterActivity.java
View file @ 240bf216
......@@ -23,6 +23,7 @@ import com.bumptech.glide.Glide;
import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
import com.bumptech.glide.request.RequestOptions;
import com.frame.base.url.Constance;
import com.ruiwenliu.wrapper.SPConstance;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseStatusActivity;
import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
......@@ -34,6 +35,7 @@ import com.ruiwenliu.wrapper.util.um.CustomShareListener;
import com.ruiwenliu.wrapper.util.um.ShareManager;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.component.utils.CacheEnum;
import com.rv.component.utils.Cookie;
import com.rv.component.utils.DisplayUtil;
import com.rv.component.utils.IsAppInstall;
import com.rv.component.utils.RvCache;
......@@ -76,6 +78,9 @@ public class PosterActivity extends BaseStatusActivity<CommonPresenter> {
@BindView(R2.id.scrollView)
ScrollView scrollView;
@BindView(R2.id.tv_invitation_code)
TextView tvInvitationCode;
private ShareManager shareManager;
private Bitmap bitmap = null;
......@@ -124,6 +129,11 @@ public class PosterActivity extends BaseStatusActivity<CommonPresenter> {
GlideManager.getInstance(mActivity).loadCircleImage("https://mgmt.dfangche.com/image/app/default_avatar.png", ringHeader);
tvName.setText("滴房车");
}
String userCode = Cookie.getStringValue(this, SPConstance.USER_JSON_CODE);
if (!TextUtils.isEmpty(userCode)) {
tvInvitationCode.setText("邀请码" + userCode);
}
}
......
plugin_poster/src/main/res/layout/activity_carposter.xml
View file @ 240bf216
......@@ -66,6 +66,7 @@
android:layout_height="wrap_content"
android:maxLines="1"
android:singleLine="true"
android:text="2222222222222222222"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_16" />
......@@ -76,6 +77,7 @@
android:layout_marginTop="@dimen/size_3"
android:maxLines="1"
android:singleLine="true"
android:text="2222222222222222222"
android:textColor="@color/textGray"
android:textSize="@dimen/text_10" />
......@@ -85,15 +87,39 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_3"
android:singleLine="true"
android:text="2222222222222222222"
android:textColor="@color/colorAuxiliaryRed"
android:textSize="@dimen/text_14" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_5"
android:orientation="horizontal">
<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_invitation_code"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_5"
android:text=""
android:textColor="@color/text_Gray"
android:textSize="@dimen/text_10" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_gravity="right|center_vertical"
android:layout_marginLeft="@dimen/size_10"
android:gravity="center_vertical"
android:orientation="horizontal">
......
plugin_poster/src/main/res/layout/activity_poster.xml
View file @ 240bf216
......@@ -76,12 +76,36 @@
android:textColor="@color/textGray"
android:textSize="@dimen/text_15" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_5"
android:orientation="horizontal">
<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_invitation_code"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_5"
android:text=""
android:textColor="@color/text_Gray"
android:textSize="@dimen/text_10" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_gravity="right|center_vertical"
android:layout_marginLeft="@dimen/size_10"
android:gravity="center_vertical"
android:orientation="horizontal">
......
plugin_share/src/main/java/com/rv/share/ReativeBillActivity.java
View file @ 240bf216
......@@ -25,6 +25,7 @@ import com.bumptech.glide.Glide;
import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
import com.bumptech.glide.request.RequestOptions;
import com.frame.base.url.ImageUrl;
import com.ruiwenliu.wrapper.SPConstance;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseStatusActivity;
import com.ruiwenliu.wrapper.bean.UserInfoBean;
......@@ -32,6 +33,7 @@ import com.ruiwenliu.wrapper.util.glide.GlideManager;
import com.ruiwenliu.wrapper.util.glide.GlideOptions;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.component.utils.CacheEnum;
import com.rv.component.utils.Cookie;
import com.rv.component.utils.DisplayUtil;
import com.rv.component.utils.RvCache;
import com.rv.component.utils.ZxingUtils;
......@@ -39,6 +41,7 @@ import com.rv.share.presenter.ReativeBillPresenter;
import com.rv.share.utils.TransformationUtils;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
/*******
......@@ -46,6 +49,8 @@ import butterknife.OnClick;
*/
public class ReativeBillActivity extends BaseStatusActivity<ReativeBillPresenter> {
@BindView(R2.id.tv_invitation_code)
TextView tvInvitationCode;
private String url;
@BindView(R2.id.ring_header)
RoundImageView roundImageView;
......@@ -109,6 +114,11 @@ public class ReativeBillActivity extends BaseStatusActivity<ReativeBillPresenter
tvPhone.setText(name);
}
}
String userCode = Cookie.getStringValue(this, SPConstance.USER_JSON_CODE);
if (!TextUtils.isEmpty(userCode)) {
tvInvitationCode.setText("邀请码" + userCode);
}
}
@Override
......@@ -175,4 +185,10 @@ public class ReativeBillActivity extends BaseStatusActivity<ReativeBillPresenter
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// TODO: add setContentView(...) invocation
ButterKnife.bind(this);
}
}
plugin_share/src/main/res/layout/activity_reative_bill.xml
View file @ 240bf216
......@@ -89,13 +89,30 @@
android:textColor="@color/textGray"
android:textSize="@dimen/text_15" />
<TextView
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_5"
android:text="邀请你一起参加"
android:textColor="@color/text_Gray"
android:textSize="@dimen/text_10" />
android:orientation="horizontal">
<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_invitation_code"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_5"
android:text=""
android:textColor="@color/text_Gray"
android:textSize="@dimen/text_10" />
</LinearLayout>
</LinearLayout>
<LinearLayout
......
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