Skip to content

R
RvApp
Commit 8ef87adb authored by jianglx's avatar jianglx
Browse files
Options

Merge branch 'master-invoice' of http://113.105.137.151:22280/lify/rvapp into master-invoice-john

parents b3657a2e 9bff3d9e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 493 additions and 130 deletions
RvClient/build.gradle
View file @ 8ef87adb
......@@ -8,8 +8,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
flavorDimensions "default"
versionCode 155
versionName "1.5.5"
versionCode 157
versionName "1.5.7"
multiDexEnabled true
......
RvClient/src/main/java/com/xxfc/rv/MainActivity.java
View file @ 8ef87adb
......@@ -9,6 +9,7 @@ import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.ServiceConnection;
import android.graphics.Bitmap;
import android.location.LocationManager;
import android.net.ConnectivityManager;
import android.net.Uri;
......@@ -24,6 +25,7 @@ import android.text.TextUtils;
import android.util.Log;
import android.view.KeyEvent;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
......@@ -31,6 +33,8 @@ import android.widget.Toast;
import com.alibaba.android.arouter.launcher.ARouter;
import com.base.utils.ui.image.round.RoundImageView;
import com.bumptech.glide.Glide;
import com.bumptech.glide.request.target.SimpleTarget;
import com.bumptech.glide.request.transition.Transition;
import com.frame.base.url.Constance;
import com.frame.base.url.ImageUrl;
import com.frame.rv.config.RvFrameConfig;
......@@ -81,6 +85,7 @@ import com.rv.plugin.calendar.bean.PreRentDaysBean;
import com.rv.rvmine.MineFragment;
import com.rv.share.WebViewActivity;
import com.rv.share.utils.TransformationUtils;
import com.rv.share.utils.TransformationUtils10;
import com.rv.share.view.PromotionDialog;
import com.rv.tourism.R2;
import com.rv.tourism.TourismFragment;
......@@ -736,6 +741,7 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements DownL
if (codeInfoBean == null || codeInfoBean.getData() == null) {
return;
}
new ConferenceEventDialog(mActivity) {
@Override
public void helper(ViewHolder helper) {
......
component_dialog/src/main/res/layout/rv_dialog_conference_event.xml
View file @ 8ef87adb
......@@ -44,8 +44,8 @@
android:layout_marginLeft="@dimen/size_10"
android:layout_marginTop="@dimen/size_20"
android:layout_marginRight="@dimen/size_10"
android:minWidth="@dimen/size_150"
android:minHeight="@dimen/size_150" />
android:minWidth="@dimen/dialog_act_width"
android:minHeight="@dimen/dialog_act_height" />
<TextView
......
component_dialog/src/main/res/values-hdpi/dimens.xml 0 → 100644
View file @ 8ef87adb
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="dialog_width">150dp</dimen>
<dimen name="dialog_min_height">150dp</dimen>
<dimen name="dialog_act_width">150dp</dimen>
<dimen name="dialog_act_height">150dp</dimen>
<dimen name="height_share_ruler_top">108.34dp</dimen>
</resources>
component_dialog/src/main/res/values-xhdpi/dimens.xml 0 → 100644
View file @ 8ef87adb
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="dialog_width">200dp</dimen>
<dimen name="dialog_min_height">200dp</dimen>
<dimen name="dialog_act_width">200dp</dimen>
<dimen name="dialog_act_height">200dp</dimen>
<dimen name="height_share_ruler_top">240.45dp</dimen>
</resources>
component_dialog/src/main/res/values-xxhdpi/dimens.xml 0 → 100644
View file @ 8ef87adb
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="dialog_width">300dp</dimen>
<dimen name="dialog_min_height">300dp</dimen>
<dimen name="dialog_act_width">300dp</dimen>
<dimen name="dialog_act_height">300dp</dimen>
<dimen name="height_share_ruler_top">216.67dp</dimen>
</resources>
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/OrderListActivity.java
View file @ 8ef87adb
......@@ -63,14 +63,14 @@ public class OrderListActivity extends BaseStatusActivity<PickerPresenter> {
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
menuPosition = intent.getIntExtra("position", 0);
titleView.setTitle(mActivity.getString(R.string.rv_my_order));
// titleView.setText(R.id.tv_title_right, "开发票");
// titleView.setChildClickListener(R.id.tv_title_right, new View.OnClickListener() {
// @Override
// public void onClick(View v) {
// ARouter.getInstance().build(Constance.ACTIVITY_URL_INVOICINGACTIVITY)
// .navigation();
// }
// });
/*titleView.setText(R.id.tv_title_right, "开发票");
titleView.setChildClickListener(R.id.tv_title_right, new View.OnClickListener() {
@Override
public void onClick(View v) {
ARouter.getInstance().build(Constance.ACTIVITY_URL_INVOICINGACTIVITY)
.navigation();
}
});*/
initRecyclerView();
initViewpager();
......
plugin_share/src/main/java/com/rv/share/utils/TransformationUtils10.java 0 → 100644
View file @ 8ef87adb
package com.rv.share.utils;
import android.graphics.Bitmap;
import android.view.ViewGroup;
import android.widget.ImageView;
import com.bumptech.glide.request.target.ImageViewTarget;
public class TransformationUtils10 extends ImageViewTarget<Bitmap> {
private int width;
private int height;
private ImageView target;
public TransformationUtils10(ImageView target, int width, int height) {
super(target);
this.target = target;
this.width = width;
this.height = height;
}
@Override
protected void setResource(Bitmap resource) {
target.setImageBitmap(resource);
if (resource == null) return;
//获取原图的宽高
// int width = resource.getWidth();
// int height = resource.getHeight();
//获取imageView的宽
int imageViewWidth = target.getWidth();
//计算缩放比例
float sy = (float) (imageViewWidth * 0.1) / (float) (width * 0.1);
//计算图片等比例放大后的高
int imageViewHeight = (int) (height * sy);
ViewGroup.LayoutParams params = target.getLayoutParams();
params.height = imageViewHeight;
target.setLayoutParams(params);
}
}
\ No newline at end of file
plugin_share/src/main/java/com/rv/share/view/RvWebView.java
View file @ 8ef87adb
......@@ -50,13 +50,13 @@ public class RvWebView extends WebView {
// 支持 Js 使用
webSettings.setJavaScriptEnabled(true);
// 开启DOM缓存,默认状态下是不支持LocalStorage的
webSettings.setDomStorageEnabled(true);
// webSettings.setDomStorageEnabled(true);
// 开启数据库缓存
webSettings.setDatabaseEnabled(true);
// 支持自动加载图片
webSettings.setLoadsImagesAutomatically(hasKitkat());
// 设置 WebView 的缓存模式
webSettings.setCacheMode(WebSettings.LOAD_DEFAULT);
// webSettings.setCacheMode(WebSettings.LOAD_DEFAULT);
// 支持启用缓存模式
webSettings.setAppCacheEnabled(true);
// 设置 AppCache 最大缓存值(现在官方已经不提倡使用，已废弃)
......
plugin_share/src/main/res/layout/activity_reative_bill.xml
View file @ 8ef87adb
......@@ -101,7 +101,8 @@
android:layout_height="wrap_content"
android:text="邀请你一起参加"
android:textColor="@color/text_Gray"
android:textSize="@dimen/text_10" />
android:textSize="@dimen/text_10"
android:visibility="gone" />
<TextView
android:id="@+id/tv_invitation_code"
......
plugin_share/src/main/res/layout/activity_web_view.xml
View file @ 8ef87adb
......@@ -25,7 +25,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toRightOf="@id/iv_title_left"
android:gravity="center"
android:padding="@dimen/size_10"
android:textColor="@color/textMain"
......
plugin_video/src/main/java/com/xxrv/video/adapter/CommentVideoAdapter.java 0 → 100644
View file @ 8ef87adb
package com.xxrv.video.adapter;
import android.widget.ImageView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.ruiwenliu.wrapper.util.glide.GlideManager;
import com.rv.component.utils.DateUtils;
import com.xxrv.video.R;
import com.xxrv.video.bean.circle.Comment;
import com.xxrv.video.bean.circle.VideoFile;
/**
* 评论
*/
public class CommentVideoAdapter extends BaseQuickAdapter<Comment, BaseViewHolder> {
public CommentVideoAdapter() {
super(R.layout.rv_item_comment_video);
}
@Override
protected void convert(BaseViewHolder helper, Comment item) {
if (item == null) {
return;
}
helper.setText(R.id.tv_content, item.getBody());
}
}
plugin_video/src/main/java/com/xxrv/video/weight/AutoScrollLayoutManager.java 0 → 100644
View file @ 8ef87adb
package com.xxrv.video.weight;
import android.content.Context;
import android.graphics.PointF;
import android.support.annotation.Nullable;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.LinearSmoothScroller;
import android.support.v7.widget.RecyclerView;
import android.util.DisplayMetrics;
public class AutoScrollLayoutManager extends LinearLayoutManager {
public AutoScrollLayoutManager(Context context) {
super(context);
}
// 客制化需要实现该方法；
@Override
public void smoothScrollToPosition(RecyclerView recyclerView, RecyclerView.State state, int
position) {
LinearSmoothScroller linearSmoothScroller =
new LinearSmoothScroller(recyclerView.getContext()) {
@Nullable
@Override
public PointF computeScrollVectorForPosition(int targetPosition) {
return AutoScrollLayoutManager.this.computeScrollVectorForPosition
(targetPosition);
}
@Override
protected float calculateSpeedPerPixel(DisplayMetrics displayMetrics) {
// 计算滑动每个像素需要的时间，这里应该与屏幕适配；
return 15f / displayMetrics.density;
}
};
linearSmoothScroller.setTargetPosition(position);
startSmoothScroll(linearSmoothScroller);
}
}
plugin_video/src/main/java/com/xxrv/video/weight/JcvTrillVideo.java
View file @ 8ef87adb
......@@ -3,6 +3,7 @@ package com.xxrv.video.weight;
import android.content.Context;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v7.widget.RecyclerView;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.util.Log;
......@@ -15,7 +16,6 @@ import android.view.animation.LinearInterpolator;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.ProgressBar;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.alibaba.android.arouter.launcher.ARouter;
......@@ -23,17 +23,15 @@ import com.base.utils.ui.datetime.selector.util.TextUtil;
import com.danikula.videocache.HttpProxyCacheServer;
import com.frame.base.url.Constance;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.SPConstance;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseStatusActivity;
import com.ruiwenliu.wrapper.base.BaseView;
import com.ruiwenliu.wrapper.presenter.MvpPresenter;
import com.ruiwenliu.wrapper.presenter.WrapperPresenter;
import com.ruiwenliu.wrapper.util.glide.GlideApp;
import com.ruiwenliu.wrapper.util.glide.GlideManager;
import com.rv.component.utils.Cookie;
import com.xxrv.video.R;
import com.xxrv.video.activity.TriListActivity;
import com.xxrv.video.adapter.CommentVideoAdapter;
import com.xxrv.video.api.VideoApi;
import com.xxrv.video.base.Proxy;
import com.xxrv.video.bean.circle.Comment;
......@@ -41,8 +39,6 @@ import com.xxrv.video.bean.circle.DiscoveryDataBean;
import com.xxrv.video.bean.circle.VideoIMTokenBean;
import com.xxrv.video.dialog.TrillCommDialog;
import com.xxrv.video.presenter.VideoPresenter;
import com.xxrv.video.weight.likeView.LikeAnimationView;
import com.xxrv.video.weight.likeView.LikeRelativeLayout;
import com.yuyife.okgo.OkGoUtil;
import java.lang.reflect.ParameterizedType;
......@@ -55,7 +51,6 @@ import java.util.Map;
import fm.jiecao.jcvideoplayer_lib.JCVideoPlayer;
import fm.jiecao.jcvideoplayer_lib.JCVideoViewbyXuan;
import fm.jiecao.jcvideoplayer_lib.OnJcvdListener;
import okhttp3.Call;
public class JcvTrillVideo extends FrameLayout implements BaseView, View.OnClickListener {
TriListActivity mShareListener;
......@@ -102,6 +97,8 @@ public class JcvTrillVideo extends FrameLayout implements BaseView, View.OnClick
private TextView tvConmmentHint2;
private TextView tvConmmentHint3;
private TextView tvAddress;
private RecyclerView rvContent;
private CommentVideoAdapter commentVideoAdapter;
private OnJcvdListener mVideoListener = new OnJcvdListener() {
@Override
......@@ -204,6 +201,7 @@ public class JcvTrillVideo extends FrameLayout implements BaseView, View.OnClick
tvConmmentHint2 = findViewById(R.id.tv_conmment_hint2);
tvConmmentHint3 = findViewById(R.id.tv_conmment_hint3);
tvAddress = findViewById(R.id.tv_address);
rvContent = findViewById(R.id.rv_content);
ivAvatar.setOnClickListener(this);
findViewById(R.id.iv_follow).setOnClickListener(this);// 关注
......@@ -213,8 +211,35 @@ public class JcvTrillVideo extends FrameLayout implements BaseView, View.OnClick
mVideoView.addOnJcvdListener(mVideoListener);
initGestureAndAnimation(context);
// AutoScrollLayoutManager autoScrollLayoutManager = new AutoScrollLayoutManager(context);
// rvContent.setLayoutManager(autoScrollLayoutManager);
// commentVideoAdapter = new CommentVideoAdapter();
// rvContent.setAdapter(commentVideoAdapter);
//
//
// rvContent.setOnScrollListener(new RecyclerView.OnScrollListener() {
// @Override
// public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
// super.onScrollStateChanged(recyclerView, newState);
//
// if (newState == RecyclerView.SCROLL_STATE_IDLE) {
// // 如果自动滑动到最后一个位置，则此处状态为SCROLL_STATE_IDLE
// AutoScrollLayoutManager lm = (AutoScrollLayoutManager) recyclerView
// .getLayoutManager();
//
// int position = lm.findLastCompletelyVisibleItemPosition();
// int count = lm.getItemCount();
// if (position == count - 1) {
// lm.scrollToPosition(0);
// rvContent.smoothScrollToPosition(commentVideoAdapter.getItemCount());
// }
// }
// }
// });
}
private void initGestureAndAnimation(Context context) {
mGestureDetector = new GestureDetector(context, new GestureDetector.SimpleOnGestureListener() {
@Override
......@@ -324,6 +349,8 @@ public class JcvTrillVideo extends FrameLayout implements BaseView, View.OnClick
tvAddress.setText(bean.getLocation());
}
// commentVideoAdapter.addData(bean.getComments());
List<Comment> comments = bean.getComments();
if (comments != null && comments.size() > 0) {
tvConmmentHint1.setVisibility(VISIBLE);
......
plugin_video/src/main/res/layout/layout_jcv_trill.xml
View file @ 8ef87adb
......@@ -201,6 +201,11 @@
android:layout_marginBottom="12dp"
android:orientation="vertical">
<android.support.v7.widget.RecyclerView
android:id="@+id/rv_content"
android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="@dimen/size_60" />
<TextView
android:id="@+id/tv_conmment_hint1"
......@@ -213,7 +218,8 @@
android:paddingBottom="@dimen/size_8"
android:text="今年一定要去这里..."
android:textColor="@color/colorWrite"
android:textSize="@dimen/text_12" />
android:textSize="@dimen/text_12"
android:visibility="visible" />
<TextView
android:id="@+id/tv_conmment_hint2"
......@@ -227,7 +233,8 @@
android:paddingBottom="@dimen/size_8"
android:text="各种颜色的集装箱，绝对是打卡圣地"
android:textColor="@color/colorWrite"
android:textSize="@dimen/text_12" />
android:textSize="@dimen/text_12"
android:visibility="visible" />
<TextView
android:id="@+id/tv_conmment_hint3"
......@@ -241,7 +248,8 @@
android:paddingBottom="@dimen/size_8"
android:text="住在里面真的是面朝大海，春暖花开呀 很安静..."
android:textColor="@color/colorWrite"
android:textSize="@dimen/text_12" />
android:textSize="@dimen/text_12"
android:visibility="visible" />
<TextView
android:id="@+id/tv_name"
......
plugin_video/src/main/res/layout/rv_item_comment_video.xml 0 → 100644
View file @ 8ef87adb
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingLeft="@dimen/size_15"
android:paddingRight="@dimen/size_15">
<TextView
android:id="@+id/tv_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/colorYellow"
android:textSize="@dimen/text_22" />
</LinearLayout>
\ No newline at end of file
plugin_wallet/src/main/java/com/xxrv/wallet/activity/SetPayPwdActivity2.java
View file @ 8ef87adb
......@@ -7,6 +7,8 @@ import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.util.Log;
import android.view.KeyEvent;
import android.view.View;
import android.widget.EditText;
import com.frame.base.bus.RxBus;
......@@ -120,6 +122,25 @@ public class SetPayPwdActivity2 extends BaseStatusActivity<CommonPresenter> {
} else if (edtPwd6.isFocused()) {
edtPwd6.requestFocus();
}
}else {
if (edtPwd6.isFocused()) {
edtPwd6.clearFocus();
edtPwd5.requestFocus();
} else if (edtPwd5.isFocused()) {
edtPwd5.clearFocus();
edtPwd4.requestFocus();
} else if (edtPwd4.isFocused()) {
edtPwd4.clearFocus();
edtPwd3.requestFocus();
} else if (edtPwd3.isFocused()) {
edtPwd3.clearFocus();
edtPwd2.requestFocus();
} else if (edtPwd2.isFocused()) {
edtPwd2.clearFocus();
edtPwd1.requestFocus();
} else if (edtPwd1.isFocused()) {
edtPwd1.requestFocus();
}
}
}
};
......
plugin_wallet/src/main/java/com/xxrv/wallet/activity/WalletActivity.java
View file @ 8ef87adb
package com.xxrv.wallet.activity;
import android.annotation.SuppressLint;
import android.app.ProgressDialog;
import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
......@@ -27,6 +28,10 @@ import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.component.dialog.VerifiedTipsDialog;
import com.rv.component.dialog.WalletTipsDialog;
import com.rv.home.rv.module.ApiConfig;
import com.umeng.socialize.UMAuthListener;
import com.umeng.socialize.UMShareAPI;
import com.umeng.socialize.bean.SHARE_MEDIA;
import com.umeng.socialize.utils.SocializeUtils;
import com.xxrv.wallet.R;
import com.xxrv.wallet.R2;
import com.xxrv.wallet.api.WalletApi;
......@@ -40,6 +45,7 @@ import com.xxrv.wallet.event.SetPasswordSuccessEvent;
import com.xxrv.wallet.presenter.WalletPresenter;
import com.yuyife.okgo.OkGoUtil;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
......@@ -51,7 +57,7 @@ import io.reactivex.schedulers.Schedulers;
* 钱包
*/
@Route(path = Constance.ACTIVITY_URL_WALLET)
public class WalletActivity extends BaseStatusActivity<WalletPresenter> {
public class WalletActivity extends BaseStatusActivity<WalletPresenter> implements UMAuthListener {
@BindView(R2.id.tv_wallet_balance)
TextView tvWalletBalance;
......@@ -67,7 +73,7 @@ public class WalletActivity extends BaseStatusActivity<WalletPresenter> {
private BeanUserInfo.UserInfo userInfo;
private static final int SDK_AUTH_FLAG = 2;
private String isFrozen;
public ProgressDialog dialog;
@Override
protected int setLayout() {
......@@ -85,6 +91,7 @@ public class WalletActivity extends BaseStatusActivity<WalletPresenter> {
showTitle(false);
initRxbus();
userInfo = getUserInfo();
dialog = new ProgressDialog(this);
}
private void initRxbus() {
......@@ -136,18 +143,7 @@ public class WalletActivity extends BaseStatusActivity<WalletPresenter> {
private void isAccountNumber(AccountNumberListBean result) {
if (result != null && result.getData() != null && result.getData().size() > 0) { ////1支付宝 2微信
int num = 0;
for (int i = 0; i < result.getData().size(); i++) {
if (1 == result.getData().get(i).getType()) {
num++;
}
}
if (num > 0) {
getCheckSetPwd();
} else {
showBindingDialog();
}
getCheckSetPwd();
} else {
showBindingDialog();
}
......@@ -168,6 +164,7 @@ public class WalletActivity extends BaseStatusActivity<WalletPresenter> {
dismiss();
} else if (id == R.id.ll_item_wechat) {
//微信绑定
bindThirdParty(SHARE_MEDIA.WEIXIN);
dismiss();
}
}
......@@ -312,6 +309,9 @@ public class WalletActivity extends BaseStatusActivity<WalletPresenter> {
mPresenter.getData(RvFrameConfig.HOST, 2, WalletApi.HTTP_URL_WALLET_UNAUTH_GETPARAM, WalletAuthInfoBean.class, map, false);
}
/**
* 获取帐号信息
*/
private void getAccountNumber() {
Map<String, Object> headMap = new LinkedHashMap<>();
if (OkGoUtil.getToken() != null)
......@@ -373,6 +373,7 @@ public class WalletActivity extends BaseStatusActivity<WalletPresenter> {
}
};
private void putAlipayCode(String code) {
Map<String, Object> headMap = new LinkedHashMap<>();
if (OkGoUtil.getToken() != null)
......@@ -382,4 +383,106 @@ public class WalletActivity extends BaseStatusActivity<WalletPresenter> {
mPresenter.getData(RvFrameConfig.HOST, 3, WalletApi.HTTP_URL_WALLET_ALIPAY_GETUSERINFO, BaseBean.class, map, headMap, false);
}
private void bindThirdParty(SHARE_MEDIA share_media) {
UMShareAPI.get(mActivity).getPlatformInfo(mActivity, share_media, this);
}
@Override
public void onStart(SHARE_MEDIA share_media) {
SocializeUtils.safeShowDialog(dialog);
}
@Override
public void onComplete(SHARE_MEDIA share_media, int i, Map<String, String> map) {
if (dialog != null) {
SocializeUtils.safeCloseDialog(dialog);
}
String type = share_media.getName();
if (share_media != null && "wxsession".equals(type)) { // 微信
String openid = map.get("openid");
String unionid = map.get("unionid");
String nickName = map.get("name");
authorize(openid, unionid, nickName, "wx");
}
}
/**
* 微信绑定
*
* @param openid
* @param unionid
* @param nickName
* @param type
*/
private void authorize(String openid, String unionid, String nickName, String type) {
if (!TextUtils.isEmpty(OkGoUtil.getToken())) {
Map<String, String> heads = new HashMap<>();
heads.put("Authorization", OkGoUtil.getToken());
mPresenter.postBodyData(10, ApiConfig.HTTP_URL_USER_BIND, BaseBean.class, new AccountBindDto(openid, unionid, nickName, type), heads, false);
}
}
@Override
public void onError(SHARE_MEDIA share_media, int i, Throwable throwable) {
SocializeUtils.safeCloseDialog(dialog);
showToast(mActivity.getString(com.rv.home.R.string.rv_login_authorization_failure) + throwable.getMessage());
}
@Override
public void onCancel(SHARE_MEDIA share_media, int i) {
SocializeUtils.safeCloseDialog(dialog);
}
private class AccountBindDto {
private String openId;
private String unionId;
private String nickName;
private String type;
public AccountBindDto(String openId, String unionId, String nickName, String type) {
this.openId = openId;
this.unionId = unionId;
this.nickName = nickName;
this.type = type;
}
public String getOpenId() {
return openId;
}
public void setOpenId(String openId) {
this.openId = openId;
}
public String getUnionId() {
return unionId;
}
public void setUnionId(String unionId) {
this.unionId = unionId;
}
public String getNickName() {
return nickName;
}
public void setNickName(String nickName) {
this.nickName = nickName;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
}
}
plugin_wallet/src/main/java/com/xxrv/wallet/bean/AccountNumberListBean.java
View file @ 8ef87adb
......@@ -40,15 +40,6 @@ public class AccountNumberListBean extends BaseBean {
private int isDel;//":0,
private String nickname;//":"PeakLin",
private int type;//":1
private boolean check;
public boolean getCheck() {
return check;
}
public void setCheck(boolean check) {
this.check = check;
}
public String getId() {
return id;
......
plugin_wallet/src/main/res/layout/rv_dialog_third_party_binding.xml
View file @ 8ef87adb
......@@ -35,21 +35,10 @@
android:layout_marginLeft="@dimen/size_15"
android:layout_marginRight="@dimen/size_15"
android:layout_marginBottom="@dimen/size_26"
android:text="支持提现到支付余额，请绑定支付宝。"
android:text="提现有2种方式，提现到微信零钱或支付宝余额。需至少绑定一种方式："
android:textColor="@color/textGray"
android:textSize="@dimen/size_16" />
<!--<TextView-->
<!--android:id="@+id/tv_content"-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:layout_marginLeft="@dimen/size_15"-->
<!--android:layout_marginRight="@dimen/size_15"-->
<!--android:layout_marginBottom="@dimen/size_26"-->
<!--android:text="提现有2种方式，提现到微信零钱或支付宝余额。需至少绑定一种方式："-->
<!--android:textColor="@color/textGray"-->
<!--android:textSize="@dimen/size_16" />-->
<LinearLayout
android:layout_width="match_parent"
......@@ -95,8 +84,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"
android:visibility="gone">
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
......
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