Skip to content

R
RvApp
Commit 9ace690c authored by jianglx's avatar jianglx
Browse files
Options

Merge remote-tracking branch 'origin/master-invoice-john' into master-invoice-john

parents ba77285d 8ef87adb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 309 additions and 163 deletions
RvClient/build.gradle
View file @ 9ace690c
......@@ -8,8 +8,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
flavorDimensions "default"
versionCode 156
versionName "1.5.6"
versionCode 157
versionName "1.5.7"
multiDexEnabled true
......
RvClient/src/main/java/com/xxfc/rv/MainActivity.java
View file @ 9ace690c
......@@ -737,8 +737,6 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements DownL
/**
* 发布会活动
*/
int width2;
int height2;
private void showConferenceEvent(CodeInfoBean codeInfoBean) {
if (codeInfoBean == null || codeInfoBean.getData() == null) {
return;
......@@ -759,25 +757,6 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements DownL
.apply(options)
.into(new TransformationUtils((ImageView) helper.getView(R.id.img_bg)));
// //获取图片真正的宽高
// Glide.with(MainActivity.this)
// .asBitmap()//强制Glide返回一个Bitmap对象
// .load(ImageUrl.IMG_APP_BG_ACTIVITY_50)
// .into(new SimpleTarget<Bitmap>() {
// @Override
// public void onResourceReady(@NonNull Bitmap bitmap, @Nullable Transition<? super Bitmap> transition) {
// width2 = bitmap.getWidth();
// height2 = bitmap.getHeight();
// }
// });
//
// Glide.with(MainActivity.this)
// .asBitmap()
// .load(ImageUrl.IMG_APP_BG_ACTIVITY_50)
// .apply(options)
// .into(new TransformationUtils10((ImageView) helper.getView(R.id.img_bg),width2,height2));
helper.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
......
RvClient/src/sit/res/values/strings.xml
View file @ 9ace690c
<resources>
<string name="app_name">滴房车(测试)</string>
<string name="share_install_key">K7BKEK7E7KE722</string>
<string name="share_install_scheme">ebfg3573</string>
<string name="share_install_key">B7BKE2FRAAAEBK</string>
<string name="share_install_scheme">dqff2227</string>
</resources>
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/OrderListActivity.java
View file @ 9ace690c
......@@ -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/res/layout/activity_reative_bill.xml
View file @ 9ace690c
......@@ -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_video/src/main/java/com/xxrv/video/weight/JcvTrillVideo.java
View file @ 9ace690c
......@@ -34,6 +34,7 @@ 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;
import com.xxrv.video.bean.circle.DiscoveryDataBean;
import com.xxrv.video.bean.circle.VideoIMTokenBean;
import com.xxrv.video.dialog.TrillCommDialog;
......@@ -43,6 +44,7 @@ import com.yuyife.okgo.OkGoUtil;
import java.lang.reflect.ParameterizedType;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
......@@ -347,29 +349,29 @@ public class JcvTrillVideo extends FrameLayout implements BaseView, View.OnClick
tvAddress.setText(bean.getLocation());
}
commentVideoAdapter.addData(bean.getComments());
// commentVideoAdapter.addData(bean.getComments());
// List<Comment> comments = bean.getComments();
// if (comments != null && comments.size() > 0) {
// tvConmmentHint1.setVisibility(VISIBLE);
// tvConmmentHint1.setText(comments.get(0).getBody());
// } else {
// tvConmmentHint1.setVisibility(GONE);
// }
//
// if (comments != null && comments.size() > 1) {
// tvConmmentHint2.setVisibility(VISIBLE);
// tvConmmentHint2.setText(comments.get(1).getBody());
// } else {
// tvConmmentHint2.setVisibility(GONE);
// }
//
// if (comments != null && comments.size() > 2) {
// tvConmmentHint3.setVisibility(VISIBLE);
// tvConmmentHint3.setText(comments.get(2).getBody());
// } else {
// tvConmmentHint3.setVisibility(GONE);
// }
List<Comment> comments = bean.getComments();
if (comments != null && comments.size() > 0) {
tvConmmentHint1.setVisibility(VISIBLE);
tvConmmentHint1.setText(comments.get(0).getBody());
} else {
tvConmmentHint1.setVisibility(GONE);
}
if (comments != null && comments.size() > 1) {
tvConmmentHint2.setVisibility(VISIBLE);
tvConmmentHint2.setText(comments.get(1).getBody());
} else {
tvConmmentHint2.setVisibility(GONE);
}
if (comments != null && comments.size() > 2) {
tvConmmentHint3.setVisibility(VISIBLE);
tvConmmentHint3.setText(comments.get(2).getBody());
} else {
tvConmmentHint3.setVisibility(GONE);
}
}
@Override
......
plugin_video/src/main/res/layout/layout_jcv_trill.xml
View file @ 9ace690c
......@@ -203,6 +203,7 @@
<android.support.v7.widget.RecyclerView
android:id="@+id/rv_content"
android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="@dimen/size_60" />
......@@ -218,7 +219,7 @@
android:text="今年一定要去这里..."
android:textColor="@color/colorWrite"
android:textSize="@dimen/text_12"
android:visibility="gone" />
android:visibility="visible" />
<TextView
android:id="@+id/tv_conmment_hint2"
......@@ -233,7 +234,7 @@
android:text="各种颜色的集装箱，绝对是打卡圣地"
android:textColor="@color/colorWrite"
android:textSize="@dimen/text_12"
android:visibility="gone" />
android:visibility="visible" />
<TextView
android:id="@+id/tv_conmment_hint3"
......@@ -248,7 +249,7 @@
android:text="住在里面真的是面朝大海，春暖花开呀 很安静..."
android:textColor="@color/colorWrite"
android:textSize="@dimen/text_12"
android:visibility="gone" />
android:visibility="visible" />
<TextView
android:id="@+id/tv_name"
......
plugin_wallet/src/main/java/com/xxrv/wallet/activity/SetPayPwdActivity2.java
View file @ 9ace690c
......@@ -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 @ 9ace690c
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 @ 9ace690c
......@@ -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 @ 9ace690c
......@@ -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