Skip to content

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

钱包接口和逻辑

parent 8d1aa872
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 656 additions and 199 deletions
MyFrame/src/main/java/com/frame/base/bus/WithdrawSuccessEvent.java 0 → 100644
View file @ 76cdca31
package com.frame.base.bus;
public class WithdrawSuccessEvent {
}
module_mine/src/main/java/com/rv/rvmine/MineFragment.java
View file @ 76cdca31
......@@ -23,6 +23,7 @@ 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.bus.WithdrawSuccessEvent;
import com.frame.base.url.Constance;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.SPConstance;
......@@ -214,6 +215,15 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
getUserData();
}
});
RxBus.tObservable(WithdrawSuccessEvent.class)
.observeOn(Schedulers.newThread())
.subscribe(new Observer<WithdrawSuccessEvent>(disposable) {
@Override
public void onNext(WithdrawSuccessEvent event) {
loadProfit();
}
});
}
......
plugin_wallet/src/main/java/com/xxrv/wallet/activity/CashWithdrawalDetailsActivity.java
View file @ 76cdca31
package com.xxrv.wallet.activity;
import android.annotation.TargetApi;
import android.content.Context;
import android.content.Intent;
import android.os.Build;
import android.support.v7.app.AppCompatActivity;
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.frame.base.bus.RxBus;
import com.frame.base.bus.WithdrawSuccessEvent;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseStatusActivity;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.xxrv.wallet.R;
import com.xxrv.wallet.R2;
import com.xxrv.wallet.api.WalletApi;
import com.xxrv.wallet.presenter.WalletPresenter;
import com.yuyife.okgo.OkGoUtil;
import butterknife.BindView;
import static com.ruiwenliu.wrapper.weight.webview.SafeWebView.hasKitkat;
/**
* 提现详情
*/
public class CashWithdrawalDetailsActivity extends BaseStatusActivity<WalletPresenter> {
@BindView(R2.id.pb_progress)
ProgressBar pbProgress;
@BindView(R2.id.webView)
WebView mWebView;
private String webUrl;
public static Intent getIntent(Context context) {
return new Intent(context, CashWithdrawalDetailsActivity.class);
public static Intent getIntent(Context context,String id) {
return new Intent(context, CashWithdrawalDetailsActivity.class)
.putExtra("id",id);
}
@Override
......@@ -29,8 +55,114 @@ public class CashWithdrawalDetailsActivity extends BaseStatusActivity<WalletPres
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
titleView.setTitle("提现详情");
String id = intent.getStringExtra("id");
webUrl = WalletApi.HTTP_URL_WALLET_WITHDRAWDETAIL + "?id=" + id;
Log.i("CampDetailActivity", "initView: " + webUrl);
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 getToken() {
return OkGoUtil.getToken();
}
}
@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) {
......
plugin_wallet/src/main/java/com/xxrv/wallet/activity/WalletActivity.java
View file @ 76cdca31
......@@ -6,7 +6,9 @@ import android.view.View;
import android.widget.TextView;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.frame.base.bus.Observer;
import com.frame.base.bus.RxBus;
import com.frame.base.bus.WithdrawSuccessEvent;
import com.frame.base.url.Constance;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean;
......@@ -43,6 +45,8 @@ public class WalletActivity extends BaseStatusActivity<WalletPresenter> {
@BindView(R2.id.tv_not_amount)
TextView tvNotAmount;
private String balance;
@Override
protected int setLayout() {
return R.layout.activity_wallet;
......@@ -57,10 +61,19 @@ public class WalletActivity extends BaseStatusActivity<WalletPresenter> {
private void initRxbus() {
RxBus.tObservable(SetPasswordSuccessEvent.class)
.observeOn(Schedulers.newThread())
.subscribe(new com.frame.base.bus.Observer<SetPasswordSuccessEvent>(disposable) {
.subscribe(new Observer<SetPasswordSuccessEvent>(disposable) {
@Override
public void onNext(SetPasswordSuccessEvent event) {
startActivity(WithdrawActivity.getIntent(mActivity));
startActivity(WithdrawActivity.getIntent(mActivity,balance));
}
});
RxBus.tObservable(WithdrawSuccessEvent.class)
.observeOn(Schedulers.newThread())
.subscribe(new Observer<WithdrawSuccessEvent>(disposable) {
@Override
public void onNext(WithdrawSuccessEvent event) {
getWalletList();
}
});
}
......@@ -81,6 +94,7 @@ public class WalletActivity extends BaseStatusActivity<WalletPresenter> {
private void setWalletData(WalletBean bean) {
if (bean != null && bean.getData() != null) {
balance = bean.getData().getBalance();
tvWalletBalance.setText("¥" + bean.getData().getBalance());
tvTodayAmount.setText(bean.getData().getTodayAmount());
tvTotalAmount.setText(bean.getData().getTotalAmount());
......@@ -102,7 +116,7 @@ public class WalletActivity extends BaseStatusActivity<WalletPresenter> {
Map<String, Object> headMap = new LinkedHashMap<>();
if (OkGoUtil.getToken() != null)
headMap.put("Authorization", OkGoUtil.getToken());
mPresenter.getDataHead(RvFrameConfig.HOST, 0, WalletApi.HTTP_URL_ADMIN_WALLET, WalletBean.class, headMap, true);
mPresenter.getDataHead(RvFrameConfig.HOST, 0, WalletApi.HTTP_URL_ADMIN_WALLET, WalletBean.class, headMap, false);
}
......@@ -142,7 +156,7 @@ public class WalletActivity extends BaseStatusActivity<WalletPresenter> {
private void setCheckPwd(WalletCheckPwdBean bean) {
if (bean !=null){
if (bean.isData()){ //true-设置过；false-没有
startActivity(WithdrawActivity.getIntent(mActivity));
startActivity(WithdrawActivity.getIntent(mActivity,balance));
}else {
startActivity(SetPayPwdActivity.getIntent(mActivity));
}
......
plugin_wallet/src/main/java/com/xxrv/wallet/api/WalletApi.java
View file @ 76cdca31
......@@ -13,6 +13,22 @@ public class WalletApi {
//检查验证码
public static String HTTP_URL_CHECK_CHECKCODE = RvFrameConfig.HOST + "/api/admin/wallet/checkCode";
// 设置密码
// 设置密码
public static String HTTP_URL_WALLET_SETPWD = RvFrameConfig.HOST + "/api/admin/wallet/setPwd";
//获取支付账号列表
public static String HTTP_URL_WALLET_WXAPLIPAYLIST = RvFrameConfig.HOST + "/api/admin/wallet/txAlipayList";
//提现规则
public static String HTTP_URL_WALLET_RULE = RvFrameConfig.HOST + "/api/app/cofig/app/unauth/wallet_rule";
//钱包提现
public static String HTTP_URL_WALLET_APPLYCATH = RvFrameConfig.HOST + "/api/admin/wallet/applyCath";
//提现检查提现下一步操作
public static String HTTP_URL_WALLET_CHECKAMOUNT = RvFrameConfig.HOST + "/api/admin/wallet/checkAmount";
//提现详情
public static String HTTP_URL_WALLET_WITHDRAWDETAIL = RvFrameConfig.HOST + "/h5/appHtml/view/withdrawDetail.html";
}
plugin_wallet/src/main/java/com/xxrv/wallet/bean/AlipayListBean.java 0 → 100644
View file @ 76cdca31
package com.xxrv.wallet.bean;
import com.ruiwenliu.wrapper.base.BaseBean;
import java.io.Serializable;
import java.util.List;
/**
* 获取支付账号列表
*/
public class AlipayListBean extends BaseBean {
private List<DataBean> data;
private boolean rel;
public List<DataBean> getData() {
return data;
}
public void setData(List<DataBean> data) {
this.data = data;
}
public boolean isRel() {
return rel;
}
public void setRel(boolean rel) {
this.rel = rel;
}
public static class DataBean implements Serializable {
private String txAlipay;
public String getTxAlipay() {
return txAlipay;
}
public void setTxAlipay(String txAlipay) {
this.txAlipay = txAlipay;
}
}
}
plugin_wallet/src/main/java/com/xxrv/wallet/bean/CheckAmountBean.java 0 → 100644
View file @ 76cdca31
package com.xxrv.wallet.bean;
import com.ruiwenliu.wrapper.base.BaseBean;
import java.io.Serializable;
/**
* 检查提现下一步操作
*/
public class CheckAmountBean extends BaseBean {
private DataBean data;
private boolean rel;
public DataBean getData() {
return data;
}
public void setData(DataBean data) {
this.data = data;
}
public boolean isRel() {
return rel;
}
public void setRel(boolean rel) {
this.rel = rel;
}
public static class DataBean implements Serializable {
private double sumAmount;// ": 0,
private double number;//": 0,
private double balance;//": 50,
private double proceduReates;//": 1.01,
private String walletId;//": 54
public double getSumAmount() {
return sumAmount;
}
public void setSumAmount(double sumAmount) {
this.sumAmount = sumAmount;
}
public double getNumber() {
return number;
}
public void setNumber(double number) {
this.number = number;
}
public double getBalance() {
return balance;
}
public void setBalance(double balance) {
this.balance = balance;
}
public double getProceduReates() {
return proceduReates;
}
public void setProceduReates(double proceduReates) {
this.proceduReates = proceduReates;
}
public String getWalletId() {
return walletId;
}
public void setWalletId(String walletId) {
this.walletId = walletId;
}
}
}
plugin_wallet/src/main/java/com/xxrv/wallet/bean/WithdrawBean.java 0 → 100644
View file @ 76cdca31
package com.xxrv.wallet.bean;
import com.ruiwenliu.wrapper.base.BaseBean;
public class WithdrawBean extends BaseBean {
private int data;
private boolean rel;
public int getData() {
return data;
}
public void setData(int data) {
this.data = data;
}
public boolean isRel() {
return rel;
}
public void setRel(boolean rel) {
this.rel = rel;
}
}
plugin_wallet/src/main/java/com/xxrv/wallet/bean/WithdrawalRulesBean.java 0 → 100644
View file @ 76cdca31
package com.xxrv.wallet.bean;
import com.ruiwenliu.wrapper.base.BaseBean;
import java.io.Serializable;
import java.util.List;
/**
* 提现规则
*/
public class WithdrawalRulesBean extends BaseBean {
private DataBean data;
private boolean rel;
public DataBean getData() {
return data;
}
public void setData(DataBean data) {
this.data = data;
}
public boolean isRel() {
return rel;
}
public void setRel(boolean rel) {
this.rel = rel;
}
public static class DataBean implements Serializable {
private double minAmount;// ": 1,最少提现金额
private double proceduReates;// ": 1.01,手续费比例
private double amountOfMonth;// ": 10000, 单月余额
private double amountOfDay;// ": 100,单日余额
private double maxNumberOfMonth;// ": 6,单月次数
private double maxNumberOfDay;//": 2,单日次数
private String withdrawWay;//": 1 1-线上；2-线下
public double getMinAmount() {
return minAmount;
}
public void setMinAmount(double minAmount) {
this.minAmount = minAmount;
}
public double getProceduReates() {
return proceduReates;
}
public void setProceduReates(double proceduReates) {
this.proceduReates = proceduReates;
}
public double getAmountOfMonth() {
return amountOfMonth;
}
public void setAmountOfMonth(double amountOfMonth) {
this.amountOfMonth = amountOfMonth;
}
public double getAmountOfDay() {
return amountOfDay;
}
public void setAmountOfDay(double amountOfDay) {
this.amountOfDay = amountOfDay;
}
public double getMaxNumberOfMonth() {
return maxNumberOfMonth;
}
public void setMaxNumberOfMonth(double maxNumberOfMonth) {
this.maxNumberOfMonth = maxNumberOfMonth;
}
public double getMaxNumberOfDay() {
return maxNumberOfDay;
}
public void setMaxNumberOfDay(double maxNumberOfDay) {
this.maxNumberOfDay = maxNumberOfDay;
}
public String getWithdrawWay() {
return withdrawWay;
}
public void setWithdrawWay(String withdrawWay) {
this.withdrawWay = withdrawWay;
}
}
}
plugin_wallet/src/main/res/layout/activity_cash_withdrawal_details.xml
View file @ 76cdca31
......@@ -7,161 +7,21 @@
android:orientation="vertical"
tools:context=".activity.CashWithdrawalDetailsActivity">
<LinearLayout
<ProgressBar
android:id="@+id/pb_progress"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colorWrite"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginTop="@dimen/size_15"
android:text="进度"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_16" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/size_70"
android:layout_marginTop="@dimen/size_40"
android:layout_marginLeft="@dimen/size_20"
android:orientation="horizontal">
<LinearLayout
android:gravity="center_horizontal"
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="match_parent">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/selector_rv_icon_renminbi"/>
<View
android:layout_width="@dimen/size_1"
android:layout_height="match_parent"
android:background="@color/gray_47E270"/>
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_weight="1"
android:orientation="vertical"
android:layout_marginLeft="@dimen/size_25"
android:layout_height="match_parent">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/text_14"
android:textColor="@color/colorMain"
android:text="提现申请已发出"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_5"
android:textSize="@dimen/text_10"
android:textColor="@color/text_Gray"
android:text="2019-05-10 10:10:58 已申请"/>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/size_70"
android:layout_marginLeft="@dimen/size_20"
android:orientation="horizontal">
<LinearLayout
android:orientation="vertical"
android:layout_width="wrap_content"
android:gravity="center_horizontal"
android:layout_height="match_parent">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/selector_rv_icon_renminbi"/>
<View
android:layout_width="@dimen/size_1"
android:layout_height="match_parent"
android:background="@color/gray_47E270"/>
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_weight="1"
android:orientation="vertical"
android:layout_marginLeft="@dimen/size_25"
android:layout_height="match_parent">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/text_14"
android:textColor="@color/colorMain"
android:text="预计在周四周五到账"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_5"
android:textSize="@dimen/text_10"
android:textColor="@color/text_Gray"
android:text="还未到账"/>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/size_60"
android:layout_marginLeft="@dimen/size_20"
android:orientation="horizontal">
<LinearLayout
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="match_parent">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/selector_rv_icon_renminbi"/>
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_weight="1"
android:orientation="vertical"
android:layout_marginLeft="@dimen/size_25"
android:layout_height="match_parent">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/text_14"
android:textColor="@color/colorMain"
android:text="提现成功"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_5"
android:textSize="@dimen/text_10"
android:textColor="@color/text_Gray"
android:text="还未到账"/>
</LinearLayout>
</LinearLayout>
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"
android:layout_weight="1" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
plugin_wallet/src/main/res/layout/activity_wallet.xml
View file @ 76cdca31
......@@ -24,7 +24,7 @@
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/size_5"
android:padding="@dimen/size_8"
android:src="@drawable/rv_common_icon_back_dark" />
android:src="@drawable/common_icon_back_white" />
<TextView
android:layout_width="wrap_content"
......
plugin_wallet/src/main/res/layout/activity_withdraw.xml
View file @ 76cdca31
......@@ -68,7 +68,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_40"
android:layout_marginLeft="@dimen/size_30"
android:text="¥"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_23" />
......@@ -85,7 +85,7 @@
android:text=""
android:textColor="@color/colorMain"
android:textColorHint="@color/colorGray"
android:textSize="@dimen/text_16" />
android:textSize="@dimen/text_15" />
</LinearLayout>
<View
......@@ -96,11 +96,11 @@
android:layout_height="@dimen/size_half"/>
<TextView
android:id="@+id/tv_hint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginTop="@dimen/size_15"
android:text="当前账户余额50元"
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
......
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