Skip to content

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

活动优化

parent f03dcd15
Show whitespace changes
Inline Side-by-side
Showing with 333 additions and 161 deletions
RvClient/src/main/AndroidManifest.xml
View file @ 1981765a
......@@ -215,6 +215,7 @@
</activity>
<activity
android:name="com.rv.home.rv.module.ui.login.LoginRvActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait" />
<activity
android:name="com.rv.home.rv.module.ui.login.RegisteredActivity"
......
RvClient/src/main/java/com/xxfc/rv/MainActivity.java
View file @ 1981765a
......@@ -433,13 +433,18 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements DownL
mPresenter.getData(7, ApiConfig.HTTP_URL_UNAUTH_CODE + code, CodeInfoBean.class, false);
}
/**
* 获取活动弹框
*/
private void getActivityPopup() {
if (!TextUtils.isEmpty(getCopy())) {
return;
}
Map<String, Object> map = new HashMap<>();
if (!TextUtils.isEmpty(OkGoUtil.getToken())) {
map.put("Authorization", OkGoUtil.getToken());
mPresenter.getDataHead(RvFrameConfig.HOST, 2, ApiConfig.HTTP_URL_GET_ACT, ActBean.class, map, true);
}
mPresenter.getDataHead(RvFrameConfig.HOST, 2, ApiConfig.HTTP_URL_GET_ACT, ActBean.class, map, true);
}
/*****
......@@ -702,8 +707,8 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements DownL
if (!TextUtils.isEmpty(copyCode)) {
AppCookie.save("code", copyCode);
if (copyCode.contains("-")) {
String[] split = copyCode.split("-");
if (copyCode.contains("_")) {
String[] split = copyCode.split("_");
if (split != null && split.length > 0) {
copyCode = split[0];
}
......@@ -722,7 +727,6 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements DownL
}
/**
* 发布会活动
*/
......
component_control/src/main/java/com/rv/component/control/CircleNumberProgressBar.java 0 → 100644
View file @ 1981765a
package com.rv.component.control;
public class CircleNumberProgressBar {
}
component_resource/src/main/res/drawable/shape_rv_bg_talk_yellow_circle2.xml 0 → 100644
View file @ 1981765a
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<!--空心框 圆角 少量红-->
<corners android:radius="50dp" />
<stroke
android:width="1dp"
android:color="#FFB74B" />
</shape>
\ No newline at end of file
module_home/src/main/AndroidManifest.xml
View file @ 1981765a
......@@ -3,7 +3,9 @@
package="com.rv.home">
<application>
<activity android:name=".rv.module.ui.main.home.order.ChargeDetailsActivity"
<activity android:name=".rv.module.ui.main.home.CarVRActivity"></activity>
<activity
android:name=".rv.module.ui.main.home.order.ChargeDetailsActivity"
android:screenOrientation="portrait" />
<activity
android:name=".rv.module.ui.main.home.order.DepositefundProgressDetailsActivity"
......
module_home/src/main/java/com/rv/home/rv/module/ApiConfig.java
View file @ 1981765a
......@@ -189,4 +189,9 @@ public class ApiConfig {
* 发布会活动
*/
public static String HTTP_URL_NEWYEAR_INDEX = RvFrameConfig.HOST_H5_DETAIL + "/h5/appHtml/view/newYear/index.html";
/**
* vr展示
*/
public static String HTTP_URL_VIEW_VRSHOW = RvFrameConfig.HOST_H5_DETAIL + "/h5/appHtml/view/vrShow.html";
}
module_home/src/main/java/com/rv/home/rv/module/ui/login/ConfirmPwdActivity.java
View file @ 1981765a
......@@ -102,7 +102,7 @@ public class ConfirmPwdActivity extends BaseLoginActivity<CommonPresenter> {
String inviteCode = AppCookie.getStringValue("code");
if (!TextUtils.isEmpty(inviteCode)) {
if (inviteCode.contains("_")) {
String[] split = inviteCode.split("-");
String[] split = inviteCode.split("_");
if (split != null && split.length > 0) {
etInviteCode.setText(split[0]);
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/login/RegisteredActivity.java
View file @ 1981765a
......@@ -105,7 +105,7 @@ public class RegisteredActivity extends BaseLoginActivity<CommonPresenter> {
String inviteCode = AppCookie.getStringValue("code");
if (!TextUtils.isEmpty(inviteCode)) {
if (inviteCode.contains("_")) {
String[] split = inviteCode.split("-");
String[] split = inviteCode.split("_");
if (split != null && split.length > 0) {
etInviteCode.setText(split[0]);
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/CarDetailActivity.java
View file @ 1981765a
......@@ -535,6 +535,11 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
map.put("end", endDate);
mPresenter.getData(RvFrameConfig.HOST, 2, ApiConfig.HTTP_URL_CALENDAR_PRICE + mCarBean.getVehicleModel().getId(), CarRentalPriceBean.class, map, headMap, false);
}
@JavascriptInterface
public void toVR(String url) {
startActivity(CarVRActivity.getIntent(mActivity, url));
}
}
/**
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/CarVRActivity.java 0 → 100644
View file @ 1981765a
package com.rv.home.rv.module.ui.main.home;
import android.annotation.TargetApi;
import android.content.Context;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
import android.webkit.JavascriptInterface;
import android.webkit.WebChromeClient;
import android.webkit.WebResourceRequest;
import android.webkit.WebSettings;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.widget.ProgressBar;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseStatusActivity;
import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.home.R;
import com.rv.home.R2;
import com.rv.home.rv.module.ApiConfig;
import butterknife.BindView;
import static com.ruiwenliu.wrapper.weight.webview.SafeWebView.hasKitkat;
public class CarVRActivity extends BaseStatusActivity<CommonPresenter> {
@BindView(R2.id.pb_progress)
ProgressBar pbProgress;
@BindView(R2.id.webView)
WebView mWebView;
private String webUrl;
private String url;
public static Intent getIntent(Context context, String url) {
return new Intent(context, CarVRActivity.class)
.putExtra("url", url);
}
@Override
protected int setLayout() {
return R.layout.activity_car_vr;
}
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
titleView.setTitle("VR展示");
url = intent.getStringExtra("url");
webUrl = ApiConfig.HTTP_URL_VIEW_VRSHOW;
initWeb();
}
@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
private void initWeb() {
WebSettings webSettings = mWebView.getSettings();
if (webSettings == null) return;
// 支持 Js 使用
webSettings.setJavaScriptEnabled(true);
// 开启DOM缓存,默认状态下是不支持LocalStorage的
webSettings.setDomStorageEnabled(true);
// 开启数据库缓存
webSettings.setDatabaseEnabled(true);
// 支持自动加载图片
webSettings.setLoadsImagesAutomatically(hasKitkat());
// 设置 WebView 的缓存模式
webSettings.setCacheMode(WebSettings.LOAD_DEFAULT);
// 支持启用缓存模式
webSettings.setAppCacheEnabled(true);
// 设置 AppCache 最大缓存值(现在官方已经不提倡使用，已废弃)
// webSettings.setAppCacheMaxSize(8 * 1024 * 1024);
// Android 私有缓存存储，如果你不调用setAppCachePath方法，WebView将不会产生这个目录
webSettings.setAppCachePath(getCacheDir().getAbsolutePath());
// 数据库路径
// if (!hasKitkat()) {
// webSettings.setDatabasePath(getDatabasePath("html").getPath());
// }
// 关闭密码保存提醒功能
// webSettings.setSavePassword(false);
// 支持缩放
webSettings.setSupportZoom(true);
// 设置 UserAgent 属性
webSettings.setUserAgentString("");
// 允许加载本地 html 文件/false
webSettings.setAllowFileAccess(true);
// 允许通过 file url 加载的 Javascript 读取其他的本地文件,Android 4.1 之前默认是true，在 Android 4.1 及以后默认是false,也就是禁止
webSettings.setAllowFileAccessFromFileURLs(true);
// 允许通过 file url 加载的 Javascript 可以访问其他的源，包括其他的文件和 http，https 等其他的源，
// Android 4.1 之前默认是true，在 Android 4.1 及以后默认是false,也就是禁止
// 如果此设置是允许，则 setAllowFileAccessFromFileURLs 不起做用
webSettings.setAllowUniversalAccessFromFileURLs(true);
mWebView.addJavascriptInterface(new AndroidJs(), "AndroidJs");
mWebView.setWebViewClient(new WebViewClient() {
@Override
public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
return super.shouldOverrideUrlLoading(view, request);
}
});
mWebView.loadUrl(webUrl);
mWebView.setWebChromeClient(new WebChromeClient() {
@Override
public void onProgressChanged(WebView view, int newProgress) {
if (newProgress == 100) {
pbProgress.setVisibility(View.GONE);//加载完网页进度条消失
} else {
pbProgress.setVisibility(View.VISIBLE);//开始加载网页时显示进度条
pbProgress.setProgress(newProgress);//设置进度值
}
}
});
}
public class AndroidJs {
@JavascriptInterface
public String getVRUrl() {
return url;
}
}
@Override
protected void onStart() {
super.onStart();
}
@Override
public void onResume() {
super.onResume();
mWebView.onResume();// 生命周期onResume
}
@Override
protected void onPause() {
super.onPause();
mWebView.onPause();//生命周期onPause
}
@Override
public void onDestroy() {
super.onDestroy();
mWebView.stopLoading();// 停止当前加载
mWebView.clearMatches();// 清除网页查找的高亮匹配字符。
mWebView.clearHistory();// 清除当前 WebView 访问的历史记录
mWebView.clearSslPreferences();//清除ssl信息
mWebView.clearCache(true);//清空网页访问留下的缓存数据。需要注意的时，由于缓存是全局的，所以只要是WebView用到的缓存都会被清空，即便其他地方也会使用到。该方法接受一个参数，从命名即可看出作用。若设为false，则只清空内存里的资源缓存，而不清空磁盘里的。
mWebView.loadUrl("about:blank");// 清空当前加载
mWebView.removeAllViews();// 清空子 View
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR2) {
mWebView.removeJavascriptInterface("AndroidNative");// 向 Web端注入 java 对象
}
// mWebView.addJavascriptInterface(new AndroidJs(),"AndroidJs");
mWebView.destroy();// 生命周期销毁
}
@Override
public void onShowResult(int requestType, BaseBean result) {
}
}
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/MemberOrderDetailsActivity.java
View file @ 1981765a
......@@ -56,7 +56,6 @@ import static com.ruiwenliu.wrapper.weight.webview.SafeWebView.hasKitkat;
*/
public class MemberOrderDetailsActivity extends BaseStatusActivity<PickerPresenter> {
private static final int TYPE_REQUEST_EVALUATION = 102;
@BindView(R2.id.webView)
WebView mWebView;
......@@ -73,12 +72,14 @@ public class MemberOrderDetailsActivity extends BaseStatusActivity<PickerPresent
private IWXAPI api;
private double orderAmount;
private OrderDetailBean.DataBeanX dataBean;
private TitleView titleViews;
public static Intent getIntent(Context context, String no) {
return new Intent(context, MemberOrderDetailsActivity.class)
.putExtra("no", no);
}
@Override
protected int setLayout() {
return R.layout.activity_travel_order_details;
......@@ -143,7 +144,8 @@ public class MemberOrderDetailsActivity extends BaseStatusActivity<PickerPresent
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
showTitle(false);
titleView.setTitle("");
titleViews = titleView;
initRxBus();
api = WXAPIFactory.createWXAPI(mActivity, RvFrameConfig.APP_ID);
......@@ -160,7 +162,7 @@ public class MemberOrderDetailsActivity extends BaseStatusActivity<PickerPresent
pay((OrderPayBean) result);
break;
case 1:
setData((OrderDetailBean)result);
setData((OrderDetailBean) result);
break;
}
}
......@@ -188,16 +190,25 @@ public class MemberOrderDetailsActivity extends BaseStatusActivity<PickerPresent
case 3:
tvCancelOrder.setVisibility(View.GONE);
tvPickUpTheCar.setVisibility(View.VISIBLE);
if (titleViews != null) {
titleViews.setTitle("待支付");
}
break;
case 6:
tvCancelOrder.setVisibility(View.GONE);
tvPickUpTheCar.setVisibility(View.VISIBLE);
tvPickUpTheCar.setText("去评价");
if (titleViews != null) {
titleViews.setTitle("已完成");
}
break;
default:
tvCancelOrder.setVisibility(View.GONE);
tvPickUpTheCar.setVisibility(View.GONE);
llItemBottom.setVisibility(View.GONE);
if (titleViews != null) {
titleViews.setTitle("已取消");
}
break;
}
}
......@@ -235,17 +246,10 @@ public class MemberOrderDetailsActivity extends BaseStatusActivity<PickerPresent
}
}
@OnClick({R2.id.iv_back, R2.id.iv_customer_service, R2.id.tv_cancel_order, R2.id.tv_pick_up_the_car})
@OnClick({R2.id.tv_cancel_order, R2.id.tv_pick_up_the_car})
public void onViewClicked(View view) {
int i = view.getId();
if (i == R.id.iv_back) {
finish();
} else if (i == R.id.iv_customer_service) {
Intent intent = new Intent(Intent.ACTION_DIAL);
Uri uri = Uri.parse("tel:" + "4000369369");
intent.setData(uri);
startActivity(intent);
} else if (i == R.id.tv_cancel_order) {
if (i == R.id.tv_cancel_order) {
cancelOnclick();
} else if (i == R.id.tv_pick_up_the_car) {
......@@ -441,7 +445,6 @@ public class MemberOrderDetailsActivity extends BaseStatusActivity<PickerPresent
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
StatusBarUtil.setRootViewFitsSystemWindows(mActivity, false);
ButterKnife.bind(this);
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/OrderDetailActivity.java
View file @ 1981765a
......@@ -80,9 +80,6 @@ import static com.ruiwenliu.wrapper.weight.webview.SafeWebView.hasKitkat;
public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
private static final int SDK_ALI_PAY_FLAG = 11;
@BindView(R2.id.tv_center)
TextView tvCenter;
@BindView(R2.id.pb_progress)
ProgressBar pbProgress;
@BindView(R2.id.webView)
......@@ -104,6 +101,7 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
private double orderAmount;
// private OrderListBean.DataBeanX.DataBean dataBean;
private OrderDetailBean.DataBeanX dataBean;
private TitleView titleViews;
public static Intent getIntent(Context context, String no) {
return new Intent(context, OrderDetailActivity.class)
......@@ -171,7 +169,8 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
showTitle(false);
titleView.setTitle("");
titleViews = titleView;
initRxBus();
api = WXAPIFactory.createWXAPI(mActivity, RvFrameConfig.APP_ID);
no = intent.getStringExtra("no");
......@@ -200,19 +199,36 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
status = dataBean.getStatus();
orderAmount = dataBean.getRealAmount();
}
/**
* type 0–删除
* 1–创建订单
* 2–取消
* 3–待付款
* 4–待出行
* 5–出行中（进行中）
* 6–已完成
*/
switch (status) {
case 3:
tvCancelOrder.setText(mActivity.getString(R.string.rv_cancel_order));
tvPickUpTheCar.setText(mActivity.getString(R.string.rv_pay_immediately));
if (titleViews != null) {
titleViews.setTitle("待支付");
}
break;
case 4:
tvCancelOrder.setText(mActivity.getString(R.string.rv_cancel_order));
tvPickUpTheCar.setText(mActivity.getString(R.string.rv_pick_up_the_car));
if (titleViews != null) {
titleViews.setTitle("待出行");
}
break;
case 5:
tvCancelOrder.setText(mActivity.getString(R.string.rv_contact_staff));
tvPickUpTheCar.setText(mActivity.getString(R.string.rv_return_car));
if (titleViews != null) {
titleViews.setTitle("出行中");
}
break;
case 6:
case -1:
......@@ -221,11 +237,17 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
}
tvCancelOrder.setText(mActivity.getString(R.string.deposit_information));
tvPickUpTheCar.setText(mActivity.getString(R.string.rv_to_evaluate));
if (titleViews != null) {
titleViews.setTitle("已完成");
}
break;
default:
tvCancelOrder.setVisibility(View.GONE);
tvPickUpTheCar.setVisibility(View.GONE);
llItemBottom.setVisibility(View.GONE);
if (titleViews != null) {
titleViews.setTitle("已取消");
}
break;
}
}
......@@ -266,18 +288,10 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
}
}
@OnClick({R2.id.iv_back, R2.id.iv_customer_service, R2.id.tv_cancel_order, R2.id.tv_pick_up_the_car})
@OnClick({R2.id.tv_cancel_order, R2.id.tv_pick_up_the_car})
public void onViewClicked(View view) {
int i = view.getId();
if (i == R.id.iv_back) {
finish();
} else if (i == R.id.iv_customer_service) {
Intent intent = new Intent(Intent.ACTION_DIAL);
Uri uri = Uri.parse("tel:" + "4000369369");
intent.setData(uri);
startActivity(intent);
} else if (i == R.id.tv_cancel_order) {
if (i == R.id.tv_cancel_order) {
cancelOnclick();
} else if (i == R.id.tv_pick_up_the_car) {
......@@ -378,8 +392,6 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// TODO: add setContentView(...) invocation
StatusBarUtil.setRootViewFitsSystemWindows(mActivity, false);
ButterKnife.bind(this);
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/TravelOrderDetailsActivity.java
View file @ 1981765a
......@@ -33,6 +33,7 @@ import com.frame.rv.config.RvFrameConfig;
import com.frame.rv.widget.PayResult;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseStatusActivity;
import com.ruiwenliu.wrapper.base.presenter.PickerPresenter;
import com.ruiwenliu.wrapper.statusbar.StatusBarUtil;
import com.ruiwenliu.wrapper.util.ViewHolder;
import com.ruiwenliu.wrapper.weight.TitleView;
......@@ -40,12 +41,9 @@ import com.rv.component.dialog.PaymentTypeSelection;
import com.rv.home.R;
import com.rv.home.R2;
import com.rv.home.rv.module.ApiConfig;
import com.rv.home.rv.module.basic.WebActivity;
import com.ruiwenliu.wrapper.base.presenter.PickerPresenter;
import com.rv.home.rv.module.ui.main.home.bean.OrderAliPayBean;
import com.rv.home.rv.module.ui.main.home.bean.OrderPayBean;
import com.rv.home.rv.module.ui.main.home.order.bean.OrderDetailBean;
import com.rv.home.rv.module.ui.main.home.order.bean.OrderListBean;
import com.tencent.mm.opensdk.modelpay.PayReq;
import com.tencent.mm.opensdk.openapi.IWXAPI;
import com.tencent.mm.opensdk.openapi.WXAPIFactory;
......@@ -78,8 +76,8 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
@BindView(R2.id.ll_item_bottom)
LinearLayout llItemBottom;
private static final int SDK_ALI_PAY_FLAG = 11;
private String webUrl;
private int status;
private String no;
......@@ -87,6 +85,7 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
private double orderAmount;
private OrderDetailBean.DataBeanX dataBean;
private int payType = 1;//选择支付类型
private TitleView titleViews;
public static Intent getIntent(Context context, String no) {
......@@ -150,7 +149,8 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
showTitle(false);
titleView.setTitle("");
titleViews = titleView;
initRxBus();
api = WXAPIFactory.createWXAPI(mActivity, RvFrameConfig.APP_ID);
no = intent.getStringExtra("no");
......@@ -198,26 +198,41 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
case 3:
tvCancelOrder.setVisibility(View.VISIBLE);
tvPickUpTheCar.setVisibility(View.VISIBLE);
if (titleViews != null) {
titleViews.setTitle("待支付");
}
break;
case 4:
tvCancelOrder.setVisibility(View.VISIBLE);
tvPickUpTheCar.setVisibility(View.VISIBLE);
tvPickUpTheCar.setText("立即上车");
if (titleViews != null) {
titleViews.setTitle("待出行");
}
break;
case 5:
tvCancelOrder.setVisibility(View.GONE);
tvPickUpTheCar.setVisibility(View.VISIBLE);
tvPickUpTheCar.setText("去评价");
if (titleViews != null) {
titleViews.setTitle("出行中");
}
break;
case 6:
tvCancelOrder.setVisibility(View.GONE);
tvPickUpTheCar.setVisibility(View.VISIBLE);
tvPickUpTheCar.setText("去评价");
if (titleViews != null) {
titleViews.setTitle("已完成");
}
break;
default:
tvCancelOrder.setVisibility(View.GONE);
tvPickUpTheCar.setVisibility(View.GONE);
llItemBottom.setVisibility(View.GONE);
if (titleViews != null) {
titleViews.setTitle("已取消");
}
break;
}
}
......@@ -245,18 +260,10 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
}
}
@OnClick({R2.id.iv_back, R2.id.iv_customer_service, R2.id.tv_cancel_order, R2.id.tv_pick_up_the_car})
@OnClick({R2.id.tv_cancel_order, R2.id.tv_pick_up_the_car})
public void onViewClicked(View view) {
int i = view.getId();
if (i == R.id.iv_back) {
finish();
} else if (i == R.id.iv_customer_service) {
Intent intent = new Intent(Intent.ACTION_DIAL);
Uri uri = Uri.parse("tel:" + "4000369369");
intent.setData(uri);
startActivity(intent);
} else if (i == R.id.tv_cancel_order) {
if (i == R.id.tv_cancel_order) {
cancelOnclick();
} else if (i == R.id.tv_pick_up_the_car) {
......@@ -516,7 +523,6 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
StatusBarUtil.setRootViewFitsSystemWindows(mActivity, false);
ButterKnife.bind(this);
}
......
module_home/src/main/res/drawable/shape_rv__circle_yellow.xml
View file @ 1981765a
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/size_90" />
<solid android:color="@color/colorAuxiliaryYellow" />
<solid android:color="@color/gray_FFB74B" />
</shape>
\ No newline at end of file
module_home/src/main/res/layout/activity_car_vr.xml 0 → 100644
View file @ 1981765a
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorLine"
android:orientation="vertical"
tools:context=".rv.module.ui.main.home.CarVRActivity">
<ProgressBar
android:id="@+id/pb_progress"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
android:layout_height="@dimen/size_3"
android:indeterminateOnly="false"
android:max="100"
android:progressDrawable="@drawable/shape_rv_bg_yellow_progress"
android:visibility="gone"></ProgressBar>
<WebView
android:id="@+id/webView"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
\ No newline at end of file
module_home/src/main/res/layout/activity_order_to_travel.xml
View file @ 1981765a
......@@ -5,55 +5,6 @@
android:layout_height="match_parent"
android:orientation="vertical">
<com.ruiwenliu.wrapper.statusbar.StatusBarHeightView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/gray_FFB74B"
android:orientation="vertical"
app:use_type="use_padding_top">
<RelativeLayout
android:id="@+id/lay_title"
android:layout_width="match_parent"
android:layout_height="@dimen/size_55"
android:background="@color/gray_FFB74B">
<ImageView
android:id="@+id/iv_back"
android:layout_width="@dimen/size_32"
android:layout_height="@dimen/size_32"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/size_5"
android:padding="@dimen/size_8"
android:src="@drawable/rv_common_icon_back_dark" />
<TextView
android:id="@+id/tv_center"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:ellipsize="end"
android:gravity="center"
android:maxWidth="320dp"
android:maxLines="1"
android:text="订单详情"
android:textColor="@color/textMain"
android:textSize="@dimen/text_18" />
<ImageView
android:id="@+id/iv_customer_service"
android:layout_width="@dimen/size_42"
android:layout_height="@dimen/size_32"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/size_5"
android:padding="@dimen/size_8"
android:src="@drawable/rv_rentingcar_icon_service_white" />
</RelativeLayout>
</com.ruiwenliu.wrapper.statusbar.StatusBarHeightView>
<ProgressBar
android:id="@+id/pb_progress"
style="?android:attr/progressBarStyleHorizontal"
......@@ -62,7 +13,8 @@
android:indeterminateOnly="false"
android:max="100"
android:progressDrawable="@drawable/shape_rv_bg_yellow_progress"
android:visibility="gone"></ProgressBar>
android:visibility="gone">
</ProgressBar>
<WebView
android:id="@+id/webView"
......@@ -87,10 +39,10 @@
android:layout_height="@dimen/size_50"
android:layout_marginRight="@dimen/size_5"
android:layout_weight="1"
android:background="@drawable/shape_rv_border_gray"
android:background="@drawable/shape_rv_bg_talk_yellow_circle2"
android:gravity="center"
android:text="@string/rv_cancel_order"
android:textColor="@color/textGray"
android:textColor="@color/gray_FFB74B"
android:textSize="@dimen/text_14" />
<TextView
......@@ -99,7 +51,7 @@
android:layout_height="@dimen/size_50"
android:layout_marginLeft="@dimen/size_5"
android:layout_weight="1"
android:background="@drawable/shape_rv_bg_yellow"
android:background="@drawable/shape_rv__circle_yellow"
android:gravity="center"
android:text="@string/rv_pick_up_the_car"
android:textColor="@color/colorWrite"
......
module_home/src/main/res/layout/activity_travel_order_details.xml
View file @ 1981765a
......@@ -5,54 +5,6 @@
android:layout_height="match_parent"
android:orientation="vertical">
<com.ruiwenliu.wrapper.statusbar.StatusBarHeightView
android:background="@color/gray_FFB74B"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
app:use_type="use_padding_top">
<RelativeLayout
android:id="@+id/lay_title"
android:layout_width="match_parent"
android:layout_height="@dimen/size_55"
android:background="@color/gray_FFB74B">
<ImageView
android:id="@+id/iv_back"
android:layout_width="@dimen/size_32"
android:layout_height="@dimen/size_32"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/size_5"
android:padding="@dimen/size_8"
android:src="@drawable/rv_common_icon_back_dark" />
<TextView
android:id="@+id/tv_center"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:ellipsize="end"
android:gravity="center"
android:maxWidth="320dp"
android:maxLines="1"
android:text="订单详情"
android:textColor="@color/textMain"
android:textSize="@dimen/text_18" />
<ImageView
android:id="@+id/iv_customer_service"
android:layout_width="@dimen/size_42"
android:layout_height="@dimen/size_32"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/size_5"
android:padding="@dimen/size_8"
android:src="@drawable/rv_rentingcar_icon_service_white" />
</RelativeLayout>
</com.ruiwenliu.wrapper.statusbar.StatusBarHeightView>
<ProgressBar
android:id="@+id/pb_progress"
style="?android:attr/progressBarStyleHorizontal"
......@@ -86,10 +38,10 @@
android:layout_height="@dimen/size_50"
android:layout_marginRight="@dimen/size_5"
android:layout_weight="1"
android:background="@drawable/shape_rv_border_gray"
android:background="@drawable/shape_rv_bg_talk_yellow_circle2"
android:gravity="center"
android:text="@string/rv_cancel_order"
android:textColor="@color/textGray"
android:textColor="@color/gray_FFB74B"
android:textSize="@dimen/text_14" />
<TextView
......@@ -98,7 +50,7 @@
android:layout_height="@dimen/size_50"
android:layout_marginLeft="@dimen/size_5"
android:layout_weight="1"
android:background="@drawable/shape_rv_bg_yellow"
android:background="@drawable/shape_rv__circle_yellow"
android:gravity="center"
android:text="立即支付"
android:textColor="@color/colorWrite"
......
module_tourism/src/main/java/com/rv/tourism/other/TravelDetailsActivity.java
View file @ 1981765a
......@@ -345,10 +345,11 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
if (DetailsData != null && DetailsData.getStock() < 1) {
TvAppointment.setEnabled(false);
TvAppointment.setText("已售完");
TvAppointment.setBackground(mActivity.getResources().getDrawable(R.color.gray_707070));
TvAppointment.setBackground(mActivity.getResources().getDrawable(R.color.colorGray));
}
}
@Override
public void onShowError(String errorMsg, int errorType) {
super.onShowError(errorMsg, errorType);
......
plugin_share/build.gradle
View file @ 1981765a
......@@ -51,5 +51,6 @@ dependencies {
api project(':module_home')
api project(':component_resource')
api project(':component_utils')
implementation project(':plugin_wallet')
// implementation files('libs/tbs_sdk_thirdapp_v3.6.0.1310_43612_sharewithdownload_withoutGame_obfs_20180706_163319.jar')
}
plugin_share/src/main/java/com/rv/share/WebViewActivity.java
View file @ 1981765a
......@@ -12,6 +12,9 @@ import android.widget.TextView;
import android.widget.Toast;
import com.base.utils.tools.android.NetworkUtil;
import com.frame.base.bus.LoginSuccessfulEvent;
import com.frame.base.bus.Observer;
import com.frame.base.bus.RxBus;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseStatusActivity;
......@@ -20,6 +23,7 @@ import com.rv.share.presenter.WebViewPresenter;
import com.rv.share.view.RvWebView;
import butterknife.BindView;
import io.reactivex.android.schedulers.AndroidSchedulers;
public class WebViewActivity extends BaseStatusActivity<WebViewPresenter> {
@BindView(R2.id.ll_content)
......@@ -56,6 +60,7 @@ public class WebViewActivity extends BaseStatusActivity<WebViewPresenter> {
titleView.setVisibility(View.GONE);
url = intent.getStringExtra("url");
title = intent.getStringExtra("title");
initRxbus();
if (!TextUtils.isEmpty(title)) {
tvTitleCenter.setVisibility(View.VISIBLE);
tvTitleCenter.setText(title);
......@@ -71,7 +76,7 @@ public class WebViewActivity extends BaseStatusActivity<WebViewPresenter> {
finish();
}
});
rvWebView = new RvWebView(getApplicationContext(),listener);
rvWebView = new RvWebView(getApplicationContext(), listener);
if (NetworkUtil.isNetworkAvailable(this)) {
llContent.addView(rvWebView);
if (!TextUtils.isEmpty(url)) {
......@@ -82,6 +87,17 @@ public class WebViewActivity extends BaseStatusActivity<WebViewPresenter> {
}
}
private void initRxbus() {
RxBus.tObservable(LoginSuccessfulEvent.class)
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<LoginSuccessfulEvent>(disposable) {
@Override
public void onNext(LoginSuccessfulEvent event) {
rvWebView.reload();
}
});
}
@Override
protected void loadData(Bundle savedInstanceState, Intent intent) {
super.loadData(savedInstanceState, intent);
......
plugin_share/src/main/java/com/rv/share/view/RvWebView.java
View file @ 1981765a
......@@ -264,6 +264,17 @@ public class RvWebView extends WebView {
.withInt("type", 30)
.navigation();
}
/**
* 跳到钱包
*/
@JavascriptInterface
public void goWallet() {
ARouter.getInstance()
.build(Constance.ACTIVITY_URL_WALLET)
.navigation();
}
}
public interface WebViewListener {
......
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