diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 37192d1..cc2ec86 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -47,8 +47,8 @@ android { applicationId = "com.hbl.lewan" minSdk = 24 targetSdk = 33 - versionCode = 215 - versionName = "2.1.5" + versionCode = 216 + versionName = "2.1.6" multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" manifestPlaceholders["IMAPPKEY"] = "23c9cbddd4b876908efdccd0a6f2638d" //正式 diff --git a/app/release/lewan_216.apk b/app/release/lewan_216.apk new file mode 100644 index 0000000..6fa107b Binary files /dev/null and b/app/release/lewan_216.apk differ diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json new file mode 100644 index 0000000..6f40594 --- /dev/null +++ b/app/release/output-metadata.json @@ -0,0 +1,20 @@ +{ + "version": 3, + "artifactType": { + "type": "APK", + "kind": "Directory" + }, + "applicationId": "com.hbl.lewan", + "variantName": "release", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "attributes": [], + "versionCode": 216, + "versionName": "2.1.6", + "outputFile": "app-release.apk" + } + ], + "elementType": "File" +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b20f010..324c0e6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -596,6 +596,14 @@ android:screenOrientation="portrait"> + + + + + entry : result.entrySet()) { String permission = entry.getKey().toString(); - boolean grant = (Boolean) entry.getValue(); + boolean grant = entry.getValue(); if (grant) { if (TextUtils.equals(permission, Manifest.permission.CAMERA)) { ScanUtilNew.startScan(MainActivity.this, MainActivity.REQUEST_CODE_FOR_QRCODE_SCAN, @@ -460,7 +460,7 @@ public class MainActivity extends BaseActivity { if (result != null) { for (Map.Entry entry : result.entrySet()) { String permission = entry.getKey().toString(); - boolean grant = (Boolean) entry.getValue(); + boolean grant = entry.getValue(); if (grant) { if (TextUtils.equals( permission, Manifest.permission.READ_MEDIA_IMAGES) || TextUtils.equals( @@ -587,14 +587,11 @@ public class MainActivity extends BaseActivity { @Override protected void onNewIntent(Intent intent) { super.onNewIntent(intent); - LogUtils.i("111111111111111110ZZZZZZZZYYYYYYYYY:" + IMApplication.schemeUserId); - gotoSheme(); } private void gotoSheme() { - LogUtils.i("111111111111111110ZZZZZZZZXXXXXXXXXX:" + IMApplication.schemeUserId); if (!TextUtils.isEmpty(IMApplication.fcmpayload)) { // {"sessiontype":"1","sessionid":"61330143"} MessagefcmBean messagefcmBean = GsonUtils.getObjFromJSON(IMApplication.fcmpayload, MessagefcmBean.class); @@ -616,7 +613,6 @@ public class MainActivity extends BaseActivity { IMApplication.fcmpayload = ""; } if (!TextUtils.isEmpty(IMApplication.schemeUserId)) { - LogUtils.i("111111111111111110ZZZZZZZZ:" + IMApplication.schemeUserId); new Handler().postDelayed(() -> { XKitRouter.withKey(RouterConstant.PATH_USER_INFO_PAGE) @@ -628,15 +624,12 @@ public class MainActivity extends BaseActivity { } if (!TextUtils.isEmpty(IMApplication.schemeTeamId)) { - LogUtils.i("1111111111111111100000:" + IMApplication.schemeTeamId); new Handler().postDelayed(() -> { - LogUtils.i("11111111111111111:" + IMApplication.schemeTeamId); showQrcodeView(IMApplication.schemeTeamId); }, 500); //延迟12秒执行 } else { - LogUtils.i("11111111111111111000002222222222:" + IMApplication.schemeTeamId); } @@ -889,7 +882,7 @@ public class MainActivity extends BaseActivity { if (originalQrcodeStr.startsWith(IMUIKitConfig.SHARE_INVCODE_START) && originalQrcodeStr.contains("userId")) { originalQrcodeStr = originalQrcodeStr.replace(IMUIKitConfig.SHARE_INVCODE_START, "https://www.baidu.com"); Uri uri = Uri.parse(originalQrcodeStr); - LogUtils.i("数据是啥：" + originalQrcodeStr); +// LogUtils.i("数据是啥：" + originalQrcodeStr); String id = uri.getQueryParameter("userId"); //id 值 10943 XKitRouter.withKey(RouterConstant.PATH_USER_INFO_PAGE) @@ -901,7 +894,7 @@ public class MainActivity extends BaseActivity { && originalQrcodeStr.contains("teamId")) { originalQrcodeStr = originalQrcodeStr.replace(IMUIKitConfig.SHARE_INVCODE_START, "https://www.baidu.com"); Uri uri = Uri.parse(originalQrcodeStr); - LogUtils.i("数据是啥：" + originalQrcodeStr); +// LogUtils.i("数据是啥：" + originalQrcodeStr); String id = uri.getQueryParameter("teamId"); //id 值 10943 showQrcodeView(id); @@ -909,7 +902,7 @@ public class MainActivity extends BaseActivity { && originalQrcodeStr.contains("machineId") && originalQrcodeStr.contains("orderNo")) { originalQrcodeStr = originalQrcodeStr.replace(IMUIKitConfig.SHARE_INVCODE_START, "https://www.baidu.com"); Uri uri = Uri.parse(originalQrcodeStr); - LogUtils.i("数据是啥：" + originalQrcodeStr); +// LogUtils.i("数据是啥：" + originalQrcodeStr); String machineId = uri.getQueryParameter("machineId"); //id 值 10943 String orderNo = uri.getQueryParameter("orderNo"); //id 值 10943 String money = uri.getQueryParameter("money"); @@ -927,14 +920,14 @@ public class MainActivity extends BaseActivity { } else { QRCodeScheme.QRCodeData qrData = QRCodeScheme.parseCodeData(originalQrcodeStr); // 2维码内容前缀（形如“time_go_mm://add_user/”） - LogUtils.i("二维码是啥111：" + GsonUtils.beanToJSONString(qrData)); +// LogUtils.i("二维码是啥111：" + GsonUtils.beanToJSONString(qrData)); String scheme = qrData.getScheme(); // 2维码内容（形如“400069”） String value = qrData.getValue(); String uid = qrData.getUserId(); if (!CommonUtils.isStringEmpty(scheme, true) && !CommonUtils.isStringEmpty(value, true)) { - LogUtils.i("二维码是啥222：" + scheme); +// LogUtils.i("二维码是啥222：" + scheme); switch (scheme) { case QRCodeScheme.QR_CODE_SCHEME_ADD_USER: diff --git a/app/src/main/java/com/hbl/lewan/main/mine/BuyAccountActivity.java b/app/src/main/java/com/hbl/lewan/main/mine/BuyAccountActivity.java index 6bd4f02..803eb4c 100644 --- a/app/src/main/java/com/hbl/lewan/main/mine/BuyAccountActivity.java +++ b/app/src/main/java/com/hbl/lewan/main/mine/BuyAccountActivity.java @@ -52,13 +52,14 @@ import java.util.Map; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.schedulers.Schedulers; -public class BuyAccountActivity extends BaseActivity implements SelectPayTypeDialog.OnToTypeListener{ +public class BuyAccountActivity extends BaseActivity implements SelectPayTypeDialog.OnToTypeListener { ActivityBuyAccountBinding viewBinding; WalletBean walletBean; BindBean bindBean; PayCashDialog payDialog; PayCashFingerDialog payCashFingerDialog; private int payType = 0; + LoginBean locUser; @Override protected void onCreate(@Nullable Bundle savedInstanceState) { @@ -73,15 +74,40 @@ public class BuyAccountActivity extends BaseActivity implements SelectPayTypeDi super.onCreate(savedInstanceState); viewBinding = ActivityBuyAccountBinding.inflate(getLayoutInflater()); setContentView(viewBinding.getRoot()); - payType = DataUtils.get(this,"pay_type",0); - - + payType = DataUtils.get(this, "pay_type", 0); initView(); getWallet(); - bindInfo(); + getUserInfo(); } + private void getUserInfo() { + Api.getInstance().userInfo(IMKitClient.account()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new BaseObserver<>() { + @Override + public void onSuccess(Result feedbackResp) { + locUser = feedbackResp.data; + } + + @Override + public void onError(int code, String msg) { + LogUtils.i("获取到的错误:" + code + "" + msg); + ToastX.showShortToast(msg); + } + }); + + + } + + + @Override + protected void onResume() { + super.onResume(); + bindInfo(); + + } private void bindInfo() { Api.getInstance().bindInfo(IMKitClient.account()) @@ -106,30 +132,40 @@ public class BuyAccountActivity extends BaseActivity implements SelectPayTypeDi viewBinding.contactListActivityTitleBar.getBackImageView().setOnClickListener(v -> finish()); Drawable drawable = viewBinding.contactListActivityTitleBar.getBackImageView().getDrawable().mutate();// Drawable wrap = DrawableCompat.wrap(drawable); - DrawableCompat.setTint(wrap, ContextCompat.getColor(this,R.color.white)); + DrawableCompat.setTint(wrap, ContextCompat.getColor(this, R.color.white)); viewBinding.contactListActivityTitleBar.getBackImageView().setImageDrawable(wrap); viewBinding.sumbitBt.setOnClickListener(v -> { + if ((locUser != null && TextUtils.isEmpty(locUser.getRealName()))) { + ToastX.showShortToast("请先完成实名认证！"); + return; + } + if (bindBean != null) { + if (!bindBean.getPayPasswordSet()) { + showDialogPay(); + return; + } + } - if(TextUtils.isEmpty(viewBinding.nameEt.getText().toString().trim())){ + if (TextUtils.isEmpty(viewBinding.nameEt.getText().toString().trim())) { ToastX.showShortToast("请输入前缀"); return; } - if(TextUtils.isEmpty(viewBinding.nameEt1.getText().toString().trim())){ + if (TextUtils.isEmpty(viewBinding.nameEt1.getText().toString().trim())) { ToastX.showShortToast("请输入后缀"); return; } - if(TextUtils.isEmpty(viewBinding.numberEt.getText().toString().trim())){ + if (TextUtils.isEmpty(viewBinding.numberEt.getText().toString().trim())) { ToastX.showShortToast("请输入您想要设置的密码"); return; } - if(TextUtils.isEmpty(viewBinding.numberEt1.getText().toString().trim())){ + if (TextUtils.isEmpty(viewBinding.numberEt1.getText().toString().trim())) { ToastX.showShortToast("请输入您想要设置的确认密码"); return; } - if(!viewBinding.numberEt1.getText().toString().trim().equals(viewBinding.numberEt.getText().toString().trim())){ + if (!viewBinding.numberEt1.getText().toString().trim().equals(viewBinding.numberEt.getText().toString().trim())) { ToastX.showShortToast("密码和确认密码不一致"); return; } @@ -156,6 +192,7 @@ public class BuyAccountActivity extends BaseActivity implements SelectPayTypeDi // showPayCashDialog(); // } } + }); @@ -164,10 +201,10 @@ public class BuyAccountActivity extends BaseActivity implements SelectPayTypeDi private void buyAccount(String pass) { Map map = new HashMap<>(); - map.put("prefix",viewBinding.nameEt.getText().toString().trim()); - map.put("postfix",viewBinding.nameEt1.getText().toString().trim()); - map.put("password",viewBinding.numberEt.getText().toString().trim()); - map.put("payPassword",pass); + map.put("prefix", viewBinding.nameEt.getText().toString().trim()); + map.put("postfix", viewBinding.nameEt1.getText().toString().trim()); + map.put("password", viewBinding.numberEt.getText().toString().trim()); + map.put("payPassword", pass); Api.getInstance().buyAccount(map) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -175,7 +212,7 @@ public class BuyAccountActivity extends BaseActivity implements SelectPayTypeDi @Override public void onSuccess(Result feedbackResp) { // toRengongCallTop(feedbackResp.data.getStaffServiceId(), feedbackResp.data.getStaffServiceNickname()); - startActivity(new Intent(BuyAccountActivity.this,AccoutListActivity.class)); + startActivity(new Intent(BuyAccountActivity.this, AccoutListActivity.class)); finish(); } @@ -191,8 +228,8 @@ public class BuyAccountActivity extends BaseActivity implements SelectPayTypeDi private void showPayCashDialog() { - payDialog = new PayCashDialog(BuyAccountActivity.this,"68",true,0,walletBean, - null,2,"购买副号"); + payDialog = new PayCashDialog(BuyAccountActivity.this, "68", true, 0, walletBean, + null, 2, "购买副号"); //免密支付的 要告诉 为什么 没有免密 // if(DataUtils.get(BuyAccountActivity.this, "hasMianMi", false)){ // payDialog = new PayCashDialog(BuyAccountActivity.this,"68",true,0,walletBean, @@ -202,7 +239,7 @@ public class BuyAccountActivity extends BaseActivity implements SelectPayTypeDi @Override public void onPayPass(String position) { - toChange(position,false); + toChange(position, false); } @RequiresApi(api = Build.VERSION_CODES.M) @@ -224,7 +261,7 @@ public class BuyAccountActivity extends BaseActivity implements SelectPayTypeDi // @Override // public void toCancel() { // actionDialog.dismiss(); - payDialog.dismiss(); + payDialog.dismiss(); // } // }); // actionDialog.show(); @@ -236,8 +273,8 @@ public class BuyAccountActivity extends BaseActivity implements SelectPayTypeDi private void showPayCashFingerDialog() { //Context context, String data, boolean showNumber, int payType, WalletBean walletBean, SelectPayTypeDialog.OnToTypeListener onToTypeListener, int isShowFinger - payCashFingerDialog = new PayCashFingerDialog(this,"68",true, - 0,walletBean,null,2,"购买副号"); + payCashFingerDialog = new PayCashFingerDialog(this, "68", true, + 0, walletBean, null, 2, "购买副号"); payCashFingerDialog.setOntoAlbumListener(new PayCashFingerDialog.OnListItemClickListener() { @Override @@ -265,7 +302,7 @@ public class BuyAccountActivity extends BaseActivity implements SelectPayTypeDi // @Override // public void toCancel() { // actionDialog.dismiss(); - payCashFingerDialog.dismiss(); + payCashFingerDialog.dismiss(); // } // }); // actionDialog.show(); @@ -285,37 +322,31 @@ public class BuyAccountActivity extends BaseActivity implements SelectPayTypeDi .setTitle(" ") .setDes(" ") .setNegativeText(" ") - .setFingerCheckCallback(new SimpleFingerCheckCallback() - { + .setFingerCheckCallback(new SimpleFingerCheckCallback() { @Override - public void onSucceed() - { + public void onSucceed() { ToastX.showShortToast("验证成功"); payCashFingerDialog.dismiss(); - toChange(null,false); + toChange(null, false); } @Override - public void onError(String error) - { + public void onError(String error) { ToastX.showShortToast("验证失败"); } @Override - public void onCancel() - { + public void onCancel() { ToastX.showShortToast("您取消了识别"); } }) - .setFingerChangeCallback(new AonFingerChangeCallback() - { + .setFingerChangeCallback(new AonFingerChangeCallback() { @Override - protected void onFingerDataChange() - { + protected void onFingerDataChange() { // ToastX.showShortToast("指纹数据发生了变化"); FingerManager.updateFingerData(BuyAccountActivity.this); new Handler().postDelayed(() -> checkPayFinger(), 1000); @@ -326,14 +357,14 @@ public class BuyAccountActivity extends BaseActivity implements SelectPayTypeDi .startListener(BuyAccountActivity.this); } - private void toChange(String password,boolean isMianMi) { + private void toChange(String password, boolean isMianMi) { } private void toRengong() { ActionConfirmDialog actionDialog = new ActionConfirmDialog(BuyAccountActivity.this, getString(R.string.ndqbbdj_txt), getString(R.string.general_got_it), - getString(R.string.lxkh_txt),false); + getString(R.string.lxkh_txt), false); actionDialog.setOnToActionListener(new ActionConfirmDialog.OnToActionListener() { @Override public void toSumbit() { @@ -368,10 +399,12 @@ public class BuyAccountActivity extends BaseActivity implements SelectPayTypeDi } }); } + public void toRengongCallTop(Integer staffServiceId, String name) { // Intent i = IntentFactory.createTempChatIntent(JsBridgeActivity.this, staffServiceId+"", name); // startActivity(i); } + private void showDialogPay() { com.netease.yunxin.kit.chatkit.ui.dialog.ActionConfirmDialog actionDialog = new com.netease.yunxin.kit.chatkit.ui.dialog.ActionConfirmDialog(BuyAccountActivity.this, @@ -446,6 +479,7 @@ public class BuyAccountActivity extends BaseActivity implements SelectPayTypeDi } } + @Override protected void onStop() { super.onStop(); @@ -455,13 +489,12 @@ public class BuyAccountActivity extends BaseActivity implements SelectPayTypeDi @Override public void toType(int type) { - DataUtils.set(BuyAccountActivity.this,"pay_type",type); + DataUtils.set(BuyAccountActivity.this, "pay_type", type); payType = type; changePayType(); } - private void changePayType() { // viewBinding.yueTv.setVisibility(View.INVISIBLE); // if(payType == 0){ diff --git a/app/src/main/java/com/hbl/lewan/main/mine/MineFragment.java b/app/src/main/java/com/hbl/lewan/main/mine/MineFragment.java index 6e0cadc..8178967 100644 --- a/app/src/main/java/com/hbl/lewan/main/mine/MineFragment.java +++ b/app/src/main/java/com/hbl/lewan/main/mine/MineFragment.java @@ -48,6 +48,7 @@ import com.hbl.lewan.network.Api; import com.hbl.lewan.network.BaseObserver; import com.hbl.lewan.network.Result; import com.hbl.lewan.pay.CollectionAndPaymentActivity; +import com.hbl.lewan.pay.PaymentActivity; import com.hbl.lewan.utils.AdaptScreenUtils; import com.hbl.lewan.utils.AppUtils; import com.hbl.lewan.utils.Constant; @@ -57,6 +58,7 @@ import com.hbl.lewan.utils.LogUtils; import com.hbl.lewan.wallet.GiftInfoActivity; import com.hbl.lewan.wallet.MyWalletActivity; import com.hbl.lewan.wallet.PaySettingActivity; +import com.hbl.lewan.wallet.SetPayPasswordActivity; import com.hbl.lewan.wallet.ShiMingActivity; import com.hbl.lewan.wallet.WalletInfoActivity; import com.hbl.lewan.welcome.WelcomeActivity; @@ -254,7 +256,13 @@ public class MineFragment extends BaseFragment { }); binding.tvChange.setOnClickListener(v -> { - checkAccounts(); + if (bindBean != null) { +// if (!bindBean.getPayPasswordSet()) { +// showDialogPay(); +// } else { + checkAccounts(); +// } + } }); binding.friendTv.setOnClickListener(v -> @@ -275,6 +283,27 @@ public class MineFragment extends BaseFragment { } + private void showDialogPay() { + + ActionConfirmDialog actionDialog = new ActionConfirmDialog(getActivity(), + getString(R.string.bind_phone_des_txt1), getString(com.netease.yunxin.kit.chatkit.ui.R.string.cancel_txt), getString(com.netease.yunxin.kit.chatkit.ui.R.string.to_sett_txt)); + actionDialog.setOnToActionListener(new ActionConfirmDialog.OnToActionListener() { + @Override + public void toSumbit() { +// Intent intent = new Intent(PaymentActivity.this, ChangeAccoutActionActivity.class); +// intent.putExtra("type", ChangeAccoutActionActivity.TYPE_CHANGE_PAY_PASSWORD); +// startActivity(intent); + Intent intent = new Intent(getActivity(), SetPayPasswordActivity.class); + startActivity(intent); + } + + @Override + public void toCancel() { + + } + }); + actionDialog.show(); + } private void checkAccounts() { Api.getInstance().accounts() .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/hbl/lewan/model/PayInfoWxBean.java b/app/src/main/java/com/hbl/lewan/model/PayInfoWxBean.java index b691f89..79fc298 100644 --- a/app/src/main/java/com/hbl/lewan/model/PayInfoWxBean.java +++ b/app/src/main/java/com/hbl/lewan/model/PayInfoWxBean.java @@ -12,6 +12,24 @@ public class PayInfoWxBean { private String alipayNo; private String alipayQrCode; private String createTime; + private String usdtAddress; + private String usdtUrl; + + public String getUsdtAddress() { + return usdtAddress; + } + + public void setUsdtAddress(String usdtAddress) { + this.usdtAddress = usdtAddress; + } + + public String getUsdtUrl() { + return usdtUrl; + } + + public void setUsdtUrl(String usdtUrl) { + this.usdtUrl = usdtUrl; + } public int getId() { return id; diff --git a/app/src/main/java/com/hbl/lewan/network/ApiService.java b/app/src/main/java/com/hbl/lewan/network/ApiService.java index 9cdacf0..9bd45ef 100644 --- a/app/src/main/java/com/hbl/lewan/network/ApiService.java +++ b/app/src/main/java/com/hbl/lewan/network/ApiService.java @@ -1121,6 +1121,16 @@ public interface ApiService { @POST("/auth/bindAlipay") Observable AuthBindAlipay(@Body Map requestBody); + /** + * 绑定微信 + * + { + "usdtAddress": "", + "usdtUrl": "", + } + */ + @POST("/auth/bindUsdt") + Observable AuthBindUsdt(@Body Map requestBody); /** * 收到的红包列表 diff --git a/app/src/main/java/com/hbl/lewan/pay/PaymentActivity1.java b/app/src/main/java/com/hbl/lewan/pay/PaymentActivity1.java index c88e74b..65e4b33 100644 --- a/app/src/main/java/com/hbl/lewan/pay/PaymentActivity1.java +++ b/app/src/main/java/com/hbl/lewan/pay/PaymentActivity1.java @@ -140,7 +140,7 @@ public class PaymentActivity1 extends BaseActivity { viewBinding.userinfoLy.setVisibility(View.VISIBLE); viewBinding.userNameTv.setText(bean.getNickname()); ColorUtils.loadAvator(bean.getUserAvatarFileName(), viewBinding.userHeadIv); - viewBinding.cheatid.setText("CHATID：" + bean.getNwId()); + viewBinding.cheatid.setText("ID：" + bean.getNwId()); } else { viewBinding.layoutSelectLy.setVisibility(View.VISIBLE); viewBinding.userinfoLy.setVisibility(View.GONE); @@ -611,8 +611,8 @@ public class PaymentActivity1 extends BaseActivity { layoutSearchlist = (LinearLayout) bottomView.findViewById(com.netease.yunxin.kit.chatkit.ui.R.id.layout_searchlist); contactSearchlistView = (RecyclerView) bottomView.findViewById(com.netease.yunxin.kit.chatkit.ui.R.id.contact_searchlistView); layoutContactlist = (LinearLayout) bottomView.findViewById(com.netease.yunxin.kit.chatkit.ui.R.id.layout_contactlist); - contactLast = (RecyclerView) bottomView.findViewById(com.netease.yunxin.kit.chatkit.ui.R.id.contact_last); - contactListViewMylove = (RecyclerView) bottomView.findViewById(com.netease.yunxin.kit.chatkit.ui.R.id.contact_listView_mylove); +// contactLast = (RecyclerView) bottomView.findViewById(com.netease.yunxin.kit.chatkit.ui.R.id.contact_last); +// contactListViewMylove = (RecyclerView) bottomView.findViewById(com.netease.yunxin.kit.chatkit.ui.R.id.contact_listView_mylove); tvContactmember = (TextView) bottomView.findViewById(com.netease.yunxin.kit.chatkit.ui.R.id.tv_contactmember); contactListView = (RecyclerView) bottomView.findViewById(com.netease.yunxin.kit.chatkit.ui.R.id.contact_listView); title.getBackImageView().setImageResource(com.netease.yunxin.kit.chatkit.ui.R.drawable.map_colose_img); @@ -637,8 +637,8 @@ public class PaymentActivity1 extends BaseActivity { } }); - zuijinTv = (TextView) bottomView.findViewById(com.netease.yunxin.kit.chatkit.ui.R.id.zuijin_tv); - tebieTv = (TextView) bottomView.findViewById(com.netease.yunxin.kit.chatkit.ui.R.id.tebie_tv); +// zuijinTv = (TextView) bottomView.findViewById(com.netease.yunxin.kit.chatkit.ui.R.id.zuijin_tv); +// tebieTv = (TextView) bottomView.findViewById(com.netease.yunxin.kit.chatkit.ui.R.id.tebie_tv); initDataDialog(false, null); initAdapterLast(bottomSheetDialog); initAdapterLover(bottomSheetDialog); diff --git a/app/src/main/java/com/hbl/lewan/redpack/TransferAccountsActivity.java b/app/src/main/java/com/hbl/lewan/redpack/TransferAccountsActivity.java index c596249..09712cf 100644 --- a/app/src/main/java/com/hbl/lewan/redpack/TransferAccountsActivity.java +++ b/app/src/main/java/com/hbl/lewan/redpack/TransferAccountsActivity.java @@ -307,7 +307,7 @@ public class TransferAccountsActivity extends BaseActivity { userInfoBean = feedbackResp.data; if (userInfoBean != null) { viewBinding.userNameTv.setText(String.format(getString(R.string.zhuanzhangjineto_txt), userInfoBean.getNickNameWithRemark())); - viewBinding.cheatid.setText("CHATID：" + userInfoBean.getNwId() + ""); + viewBinding.cheatid.setText("ID：" + userInfoBean.getNwId() + ""); userNickName = userInfoBean.getNickNameWithRemark(); ColorUtils.loadAvator(userInfoBean.getUserAvatarFileName(), viewBinding.userHeadIv); // viewBinding.userHeadIv.setData( diff --git a/app/src/main/java/com/hbl/lewan/wallet/AddOrChangeUSDTActivity.java b/app/src/main/java/com/hbl/lewan/wallet/AddOrChangeUSDTActivity.java new file mode 100644 index 0000000..8807e35 --- /dev/null +++ b/app/src/main/java/com/hbl/lewan/wallet/AddOrChangeUSDTActivity.java @@ -0,0 +1,490 @@ +package com.hbl.lewan.wallet; + +import android.Manifest; +import android.content.Intent; +import android.graphics.Color; +import android.os.Build; +import android.os.Bundle; +import android.text.TextUtils; +import android.view.View; + +import androidx.activity.result.ActivityResultLauncher; +import androidx.activity.result.contract.ActivityResultContracts; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; + +import com.bumptech.glide.Glide; +import com.hbl.lewan.IMUIKitConfig; +import com.hbl.lewan.R; +import com.hbl.lewan.databinding.ActivityBindUsdtBinding; +import com.hbl.lewan.databinding.ActivityBindWechatAlipayBinding; +import com.hbl.lewan.dialog.ActionConfirmDialog; +import com.hbl.lewan.main.mine.ChangeAccoutActionActivity; +import com.hbl.lewan.model.BindBean; +import com.hbl.lewan.model.PayInfoWxBean; +import com.hbl.lewan.model.WalletBean; +import com.hbl.lewan.network.Api; +import com.hbl.lewan.network.BaseObserver; +import com.hbl.lewan.network.Result; +import com.hbl.lewan.utils.GsonUtils; +import com.hbl.lewan.utils.LogUtils; +import com.luck.picture.lib.basic.PictureSelector; +import com.luck.picture.lib.config.SelectMimeType; +import com.luck.picture.lib.entity.LocalMedia; +import com.luck.picture.lib.interfaces.OnResultCallbackListener; +import com.luck.picture.lib.style.BottomNavBarStyle; +import com.luck.picture.lib.style.PictureSelectorStyle; +import com.luck.picture.lib.style.SelectMainStyle; +import com.luck.picture.lib.style.TitleBarStyle; +import com.netease.yunxin.kit.chatkit.ui.common.GlideEngine; +import com.netease.yunxin.kit.common.ui.activities.BaseActivity; +import com.netease.yunxin.kit.common.ui.dialog.LoadingDialog; +import com.netease.yunxin.kit.common.ui.utils.ToastX; +import com.netease.yunxin.kit.common.utils.PermissionUtils; +import com.netease.yunxin.kit.corekit.im.IMKitClient; +import com.qiniu.android.storage.Configuration; +import com.qiniu.android.storage.UploadManager; +import com.qiniu.android.storage.UploadOptions; + +import org.json.JSONException; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + +import io.reactivex.android.schedulers.AndroidSchedulers; +import io.reactivex.schedulers.Schedulers; + +public class AddOrChangeUSDTActivity extends BaseActivity { + ActivityBindUsdtBinding viewBinding; + WalletBean walletBean; + BindBean bindBean; + protected ActivityResultLauncher permissionLauncher; + File imageFile = null; + + @Override + protected void onCreate(@Nullable Bundle savedInstanceState) { + + + super.onCreate(savedInstanceState); + viewBinding = ActivityBindUsdtBinding.inflate(getLayoutInflater()); + setContentView(viewBinding.getRoot()); + permissionLauncher = + registerForActivityResult( + new ActivityResultContracts.RequestMultiplePermissions(), + result -> { + if (result != null) { + for (Map.Entry entry : result.entrySet()) { + String permission = entry.getKey().toString(); + boolean grant = (Boolean) entry.getValue(); + if (grant) { + if (TextUtils.equals( + permission, Manifest.permission.READ_EXTERNAL_STORAGE) || TextUtils.equals( + permission, Manifest.permission.READ_MEDIA_IMAGES) || TextUtils.equals( + permission, Manifest.permission.READ_MEDIA_VIDEO)) { + startPickMedia(); + } + } else { + if (shouldShowRequestPermissionRationale(permission)) { + ToastX.showShortToast(getString(com.netease.yunxin.kit.chatkit.ui.R.string.permission_deny_tips)); + } else { + ToastX.showShortToast(getString(com.netease.yunxin.kit.chatkit.ui.R.string.permission_storage)); + } + } + } + } + }); + initView(); + getWallet(); + bindInfo(); + authPayInfo(); + viewBinding.editIv.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + viewBinding.editIv.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + viewBinding.contactListActivityTitleBar.setTitle("修改钱包地址"); + viewBinding.changeLy.setVisibility(View.VISIBLE); + viewBinding.needDataLy.setVisibility(View.GONE); + } + }); + } + }); + } + + private void authPayInfo() { + showLoadingDialog("正在获取USDT数据"); + Api.getInstance().authPayInfo() + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new BaseObserver<>() { + @Override + public void onSuccess(Result feedbackResp) { + dimessLoadingDialog(); + if(feedbackResp!=null&&feedbackResp.data!=null){ + showType(feedbackResp.data); + }else{ + viewBinding.contactListActivityTitleBar.setTitle("添加钱包地址"); + viewBinding.changeLy.setVisibility(View.VISIBLE); + viewBinding.needDataLy.setVisibility(View.GONE); + } + } + + @Override + public void onError(int code, String msg) { + dimessLoadingDialog(); + viewBinding.contactListActivityTitleBar.setTitle("添加钱包地址"); + viewBinding.changeLy.setVisibility(View.VISIBLE); + viewBinding.needDataLy.setVisibility(View.GONE); + } + }); + } + + private void showType(PayInfoWxBean feedbackResp) { + if(feedbackResp!=null&&!TextUtils.isEmpty(feedbackResp.getUsdtAddress())){ + viewBinding.needDataLy.setVisibility(View.VISIBLE); + viewBinding.contactListActivityTitleBar.setTitle("我的USDT钱包地址"); + viewBinding.addressTv.setText(""+feedbackResp.getUsdtAddress()); + viewBinding.nameEt.setText(""+feedbackResp.getUsdtAddress()); + Glide.with(this).load(feedbackResp.getUsdtUrl()).error(R.color.color_f4f4f4).placeholder(R.color.color_f4f4f4).into(viewBinding.imageIv); + Glide.with(this).load(feedbackResp.getUsdtUrl()).error(R.color.color_f4f4f4).placeholder(R.color.color_f4f4f4).into(viewBinding.imageIv1); + viewBinding.changeLy.setVisibility(View.GONE); + viewBinding.needDataLy.setVisibility(View.VISIBLE); + }else{ + viewBinding.contactListActivityTitleBar.setTitle("添加钱包地址"); + + viewBinding.changeLy.setVisibility(View.VISIBLE); + viewBinding.needDataLy.setVisibility(View.GONE); + } + } + + + private void startPickMedia() { + + TitleBarStyle whiteTitleBarStyle = new TitleBarStyle(); + whiteTitleBarStyle.setTitleBackgroundColor(ContextCompat.getColor(AddOrChangeUSDTActivity.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_white)); + whiteTitleBarStyle.setTitleDrawableRightResource(com.netease.yunxin.kit.chatkit.ui.R.drawable.ic_orange_arrow_down); + whiteTitleBarStyle.setTitleLeftBackResource(com.netease.yunxin.kit.common.ui.R.drawable.ic_back); + whiteTitleBarStyle.setTitleTextColor(ContextCompat.getColor(AddOrChangeUSDTActivity.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_black)); + whiteTitleBarStyle.setTitleCancelTextColor(ContextCompat.getColor(AddOrChangeUSDTActivity.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_53575e)); + whiteTitleBarStyle.setDisplayTitleBarLine(true); + + BottomNavBarStyle whiteBottomNavBarStyle = new BottomNavBarStyle(); + // whiteBottomNavBarStyle.setBottomPreviewSelectText(getResources().getString(R.string.chat_team_ait_all)); + whiteBottomNavBarStyle.setBottomNarBarBackgroundColor(Color.parseColor("#FFFFFF")); + whiteBottomNavBarStyle.setBottomPreviewSelectTextColor(ContextCompat.getColor(AddOrChangeUSDTActivity.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_53575e)); + + whiteBottomNavBarStyle.setBottomPreviewNormalTextColor(ContextCompat.getColor(AddOrChangeUSDTActivity.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_9b)); + whiteBottomNavBarStyle.setBottomPreviewSelectTextColor(ContextCompat.getColor(AddOrChangeUSDTActivity.this, com.netease.yunxin.kit.chatkit.ui.R.color.color_222222)); + whiteBottomNavBarStyle.setCompleteCountTips(false); + + whiteBottomNavBarStyle.setBottomEditorTextColor(ContextCompat.getColor(AddOrChangeUSDTActivity.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_53575e)); + whiteBottomNavBarStyle.setBottomOriginalTextColor(ContextCompat.getColor(AddOrChangeUSDTActivity.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_53575e)); + + SelectMainStyle selectMainStyle = new SelectMainStyle(); + selectMainStyle.setStatusBarColor(ContextCompat.getColor(AddOrChangeUSDTActivity.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_white)); + selectMainStyle.setDarkStatusBarBlack(true); + selectMainStyle.setSelectNormalTextColor(ContextCompat.getColor(AddOrChangeUSDTActivity.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_9b)); + selectMainStyle.setSelectTextColor(ContextCompat.getColor(AddOrChangeUSDTActivity.this, com.netease.yunxin.kit.chatkit.ui.R.color.color_222222)); + selectMainStyle.setPreviewSelectBackground(com.netease.yunxin.kit.chatkit.ui.R.drawable.ps_demo_white_preview_selector); + selectMainStyle.setSelectBackground(com.netease.yunxin.kit.chatkit.ui.R.drawable.ps_checkbox_selector); +// selectMainStyle.setSelectText(R.string.ps_done_front_num); + selectMainStyle.setMainListBackgroundColor(ContextCompat.getColor(AddOrChangeUSDTActivity.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_white)); + PictureSelectorStyle selectorStyle = new PictureSelectorStyle(); + selectorStyle.setTitleBarStyle(whiteTitleBarStyle); + selectorStyle.setBottomBarStyle(whiteBottomNavBarStyle); + selectorStyle.setSelectMainStyle(selectMainStyle); + + + PictureSelector.create(this) + .openGallery(SelectMimeType.ofImage()) + .setImageEngine(GlideEngine.createGlideEngine()) + .setMaxSelectNum(1) +// .setMaxVideoSelectNum(9) + .setSelectorUIStyle(selectorStyle) + .forResult(new OnResultCallbackListener() { + @Override + public void onResult(ArrayList result) { + for (int i = 0; i < result.size(); ++i) { + LogUtils.i("地址是啥：" + result.get(i).getRealPath()); + File file = new File(result.get(i).getRealPath()); + toUpdateBg(file); + } + } + + @Override + public void onCancel() { + + } + }); + + } + + + private void bindInfo() { + Api.getInstance().bindInfo(IMKitClient.account()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new BaseObserver>() { + @Override + public void onSuccess(Result feedbackResp) { + bindBean = feedbackResp.data; + LogUtils.i("获取到的数据：" + GsonUtils.beanToJSONString(bindBean)); + } + + @Override + public void onError(int code, String msg) { + LogUtils.i("获取到的错误:" + code + "" + msg); + } + }); + + } + + protected void initView() { + viewBinding.contactListActivityTitleBar.getBackImageView().setOnClickListener(v -> finish()); + + + viewBinding.imageIv.setOnClickListener(v -> choicePhoto()); + + viewBinding.sumbitBt.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (TextUtils.isEmpty(viewBinding.nameEt.getText().toString().trim())) { + ToastX.showShortToast("请输入您的钱包地址"); + return; + } + + if (imageFile == null) { + ToastX.showShortToast("上传钱包地址二维码"); + return; + } + toShangchuanAli(imageFile); + } + }); + } + + private void choicePhoto() { + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + if (PermissionUtils.hasPermissions( + AddOrChangeUSDTActivity.this, Manifest.permission.READ_MEDIA_IMAGES, Manifest.permission.READ_MEDIA_VIDEO)) { + startPickMedia(); + } else { + permissionLauncher.launch(new String[]{Manifest.permission.READ_MEDIA_IMAGES, Manifest.permission.READ_MEDIA_VIDEO}); + + } + } else { + if (PermissionUtils.hasPermissions( + AddOrChangeUSDTActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE)) { + startPickMedia(); + } else { + permissionLauncher.launch(new String[]{Manifest.permission.READ_EXTERNAL_STORAGE}); + + } + } + + } + + + private void showDialogPay() { + + com.netease.yunxin.kit.chatkit.ui.dialog.ActionConfirmDialog actionDialog = new com.netease.yunxin.kit.chatkit.ui.dialog.ActionConfirmDialog(AddOrChangeUSDTActivity.this, + getString(com.netease.yunxin.kit.chatkit.ui.R.string.bind_phone_des_txt1), getString(com.netease.yunxin.kit.chatkit.ui.R.string.cancel_txt), getString(com.netease.yunxin.kit.chatkit.ui.R.string.to_sett_txt)); + actionDialog.setOnToActionListener(new com.netease.yunxin.kit.chatkit.ui.dialog.ActionConfirmDialog.OnToActionListener() { + @Override + public void toSumbit() { +// Intent intent = new Intent(getActivity(), ChangeAccoutActionActivity.class); +// intent.putExtra("type", 5); +// startActivity(intent); + Intent intent = new Intent(AddOrChangeUSDTActivity.this, SetPayPasswordActivity.class); + startActivity(intent); + } + + @Override + public void toCancel() { + + } + }); + actionDialog.show(); + } + + + private void showDialog() { + + ActionConfirmDialog actionDialog = new ActionConfirmDialog(AddOrChangeUSDTActivity.this, + getString(R.string.bind_phone_des_txt), getString(R.string.nobind_txt), getString(R.string.tobind_txt)); + actionDialog.setOnToActionListener(new ActionConfirmDialog.OnToActionListener() { + @Override + public void toSumbit() { + Intent intent = new Intent(AddOrChangeUSDTActivity.this, ChangeAccoutActionActivity.class); + intent.putExtra("type", ChangeAccoutActionActivity.TYPE_BIND_PHONE); + startActivity(intent); + } + + @Override + public void toCancel() { + + } + }); + actionDialog.show(); + } + + private void getWallet() { + Api.getInstance().walletInfo(IMKitClient.account()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new BaseObserver>() { + + @Override + public void onSuccess(Result feedbackResp) { + walletBean = feedbackResp.data; + changeInfo(); + + } + + @Override + public void onError(int code, String msg) { + + } + }); + + + } + + + private void changeInfo() { + if (walletBean != null) { +// viewBinding.jinbiYueTv.setText(AppUtils.getQian(walletBean.getGoldCoin())); +// viewBinding.yinbiYueTv.setText(AppUtils.getQian(walletBean.getSilverCoin())); + + } + + } + + @Override + protected void onStop() { + super.onStop(); + + } + + + private void toUpdateBg(File file) { + imageFile = file; + Glide.with(AddOrChangeUSDTActivity.this) + .load(file.getAbsolutePath()) + .into(viewBinding.imageIv); + +// toShangchuanAli(file); + } + + + String stsCredentialsBean; + + private void toShangchuanAli(File file) { + showLoadingDialog("正在上传图片"); + Api.getInstance().stsCredentials1() + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new BaseObserver<>() { + @Override + public void onSuccess(Result feedbackResp) { + stsCredentialsBean = feedbackResp.data; +// toAliYunOss(file, isHead); + toQIiNiuYunOss(file); + + } + + @Override + public void onError(int code, String msg) { + dimessLoadingDialog(); + ToastX.showShortToast(msg); + } + }); + } + + public LoadingDialog loadingDialog; + + public void showLoadingDialog() { +// if (loadingDialog == null) +// loadingDialog = new LoadingDialog(this); +// loadingDialog.show(); + } + + public void showLoadingDialog(String msg) { +// if (loadingDialog == null) +// loadingDialog = new LoadingDialog(this); +// loadingDialog.setLoadingText(msg); +// loadingDialog.show(); + } + + + public void dimessLoadingDialog() { +// if (loadingDialog != null) { +// loadingDialog.dismiss(); +// } + + } + + + private void toQIiNiuYunOss(File file) { + String updatePathPic = "usdt"; + UploadOptions options = new UploadOptions(null, null, true, + (key, percent) -> { + LogUtils.i("结果是啥进度：" + percent); + }, () -> { + return false; + }); + Configuration configuration = new Configuration.Builder() + .build(); + UploadManager uploadManager = new UploadManager(configuration); + + String fileName = UUID.randomUUID().toString() + "_" + file.getName(); + LogUtils.i("结果是啥开始：" + stsCredentialsBean + ";;" + file.getAbsolutePath()); + String files = "media/" + updatePathPic + "/" + fileName; + + uploadManager.put(file, files, stsCredentialsBean, (key, info, response) -> { + dimessLoadingDialog(); + if (info != null && info.isOK()) { + // 上传成功 + try { + toPush(IMUIKitConfig.OSS_URL + response.getString("key")); + } catch (JSONException e) { + LogUtils.i("结果是啥失败：" + e); + } + + + } else { + // 上传失败 + LogUtils.i("结果是啥失败：" + GsonUtils.beanToJSONString(info)); + } + }, options); + } + + private void toPush(String key) { + Map map = new HashMap<>(); + map.put("usdtAddress", viewBinding.nameEt.getText().toString().trim()); + map.put("usdtUrl", key); + Api.getInstance().AuthBindUsdt(map) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new BaseObserver<>() { + @Override + public void onSuccess(Result feedbackResp) { + authPayInfo(); + } + + @Override + public void onError(int code, String msg) { + ToastX.showShortToast(msg); + } + }); + + + } +} diff --git a/app/src/main/java/com/hbl/lewan/wallet/MyWalletActivity.java b/app/src/main/java/com/hbl/lewan/wallet/MyWalletActivity.java index 4377ef9..ab07368 100644 --- a/app/src/main/java/com/hbl/lewan/wallet/MyWalletActivity.java +++ b/app/src/main/java/com/hbl/lewan/wallet/MyWalletActivity.java @@ -20,6 +20,7 @@ import com.hbl.lewan.main.mine.ChangeAccoutActionActivity; import com.hbl.lewan.model.AccountsBean; import com.hbl.lewan.model.BindBean; import com.hbl.lewan.model.LoginBean; +import com.hbl.lewan.model.PayInfoWxBean; import com.hbl.lewan.model.WalletBean; import com.hbl.lewan.network.Api; import com.hbl.lewan.network.BaseObserver; @@ -50,7 +51,7 @@ public class MyWalletActivity extends BaseActivity { public static int TYPE_BANK = 3; public static int TYPE_WECHAT = 4; public static int TYPE_ALIPAY = 5; - + public static int TYPE_USDT = 6; @Override protected void onCreate(@Nullable Bundle savedInstanceState) { @@ -112,6 +113,7 @@ public class MyWalletActivity extends BaseActivity { if (locUser != null && !TextUtils.isEmpty(locUser.getRealName())) { toNextType(type); } else { + Api.getInstance().userInfo(IMKitClient.account()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -139,6 +141,15 @@ public class MyWalletActivity extends BaseActivity { } private void toNextType(int type) { + if (bindBean != null) { + if(type == TYPE_TIXIAN) { + if (!bindBean.getPayPasswordSet()) { + showDialogPay(); + return; + } + } + } + if (type == TYPE_TOPUP) { startActivity(new Intent(MyWalletActivity.this, TopUpActivity.class)); } else if (type == TYPE_TIXIAN) { @@ -147,7 +158,11 @@ public class MyWalletActivity extends BaseActivity { startActivity(new Intent(MyWalletActivity.this, BankListActivity.class)); } else if (type == TYPE_WECHAT) { startActivity(new Intent(MyWalletActivity.this, ToBindWeChatOrAliPayActivity.class)); - } else if (type == TYPE_ALIPAY) { + } else if(type == TYPE_USDT){ +// authPayInfo(); + startActivity(new Intent(MyWalletActivity.this, AddOrChangeUSDTActivity.class)); + + }else if (type == TYPE_ALIPAY) { Intent i = new Intent(MyWalletActivity.this, ToBindWeChatOrAliPayActivity.class); i.putExtra("isWeChat", false); startActivity(i); @@ -183,39 +198,35 @@ public class MyWalletActivity extends BaseActivity { protected void initView() { viewBinding.contactListActivityTitleBar.getBackImageView().setOnClickListener(v -> finish()); - viewBinding.gmfhBt.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - startActivity(new Intent(MyWalletActivity.this, BuyAccountActivity.class)); - } - }); + viewBinding.gmfhBt.setOnClickListener(v -> startActivity(new Intent(MyWalletActivity.this, BuyAccountActivity.class))); viewBinding.lqmxBt.setOnClickListener(v -> { - if (bindBean != null) { - if (!bindBean.getPhoneBind()) { - showDialog(); - } else { +// if (bindBean != null) { +// if (!bindBean.getPayPasswordSet()) { +// showDialogPay(); +// } else { Intent intent = new Intent(MyWalletActivity.this, WalletInfoNewActivity.class); intent.putExtra("isG", true); startActivity(intent); - } - } +// } +// } }); viewBinding.czBt.setOnClickListener(v -> getUserInfo(TYPE_TOPUP)); viewBinding.txBt.setOnClickListener(v -> getUserInfo(TYPE_TIXIAN)); viewBinding.czjlBt.setOnClickListener(v -> startActivity(new Intent(MyWalletActivity.this, ChongZhiLogActivity.class))); viewBinding.txjlBt.setOnClickListener(v -> startActivity(new Intent(MyWalletActivity.this, TiXianLogActivity.class))); + viewBinding.wdusdtBt.setOnClickListener(v -> getUserInfo(TYPE_USDT)); viewBinding.hbjlBt.setOnClickListener(v -> { - if (bindBean != null) { - if (!bindBean.getPhoneBind()) { - showDialog(); - } else { +// if (bindBean != null) { +// if (!bindBean.getPayPasswordSet()) { +// showDialogPay(); +// } else { Intent intent = new Intent(MyWalletActivity.this, WalletInfoRedActivity.class); intent.putExtra("isG", true); startActivity(intent); - } - } +// } +// } }); viewBinding.smrzBt.setOnClickListener(v -> startActivity(new Intent(MyWalletActivity.this, ShiMingActivity.class))); diff --git a/app/src/main/java/com/hbl/lewan/wallet/PaySettingActivity.java b/app/src/main/java/com/hbl/lewan/wallet/PaySettingActivity.java index da1a29a..7457222 100644 --- a/app/src/main/java/com/hbl/lewan/wallet/PaySettingActivity.java +++ b/app/src/main/java/com/hbl/lewan/wallet/PaySettingActivity.java @@ -35,6 +35,7 @@ import com.hbl.lewan.dialog.PayDialog; import com.hbl.lewan.dialog.SelectPayTypeDialog; import com.hbl.lewan.game.JsBridgeActivity; import com.hbl.lewan.login.RegisterActivity; +import com.hbl.lewan.main.mine.AccountAndSecurityActivity; import com.hbl.lewan.main.mine.ChangeAccoutActionActivity; import com.hbl.lewan.model.BindBean; import com.hbl.lewan.model.LoginBean; @@ -79,11 +80,6 @@ public class PaySettingActivity extends BaseActivity implements SelectPayTypeDia viewBinding.mianmiSc.setChecked(DataUtils.get(PaySettingActivity.this, "hasMianMi", false)); viewBinding.zhiwenSc.setChecked(DataUtils.get(PaySettingActivity.this, "hasFinger", false)); viewBinding.mianmiV.setOnClickListener(v -> { - if(loginBean!=null&&(loginBean.getUserType()+"").equals("2")){ - ToastX.showShortToast("副号不支持修改密码"); - return; - } - if (bean != null && !bean.getPayPasswordSet()) { showDialogPay(); @@ -214,6 +210,28 @@ public class PaySettingActivity extends BaseActivity implements SelectPayTypeDia } + private void getUserInfo(String user_uid) { + + Api.getInstance().userInfo(user_uid) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new BaseObserver>() { + @Override + public void onSuccess(Result feedbackResp) { + + loginBean = feedbackResp.data; + + } + + @Override + public void onError(int code, String msg) { + LogUtils.i("获取到的错误:" + code + "" + msg); +// WidgetUtils.showToast(getActivity(), msg, WidgetUtils.ToastType.ERROR); + } + }); + + + } private void showDialogPay() { @@ -304,6 +322,10 @@ public class PaySettingActivity extends BaseActivity implements SelectPayTypeDia viewBinding.contactListActivityTitleBar.getBackImageView().setOnClickListener(v -> finish()); viewBinding.setPassBt.setOnClickListener(v -> { + if(loginBean!=null&&(loginBean.getUserType()+"").equals("2")){ + ToastX.showShortToast("副号不支持修改密码"); + return; + } Intent intent = new Intent(PaySettingActivity.this, SetPayPasswordActivity.class); startActivity(intent); }); diff --git a/app/src/main/java/com/hbl/lewan/wallet/ToBindWeChatOrAliPayActivity.java b/app/src/main/java/com/hbl/lewan/wallet/ToBindWeChatOrAliPayActivity.java index 133cedb..111670e 100644 --- a/app/src/main/java/com/hbl/lewan/wallet/ToBindWeChatOrAliPayActivity.java +++ b/app/src/main/java/com/hbl/lewan/wallet/ToBindWeChatOrAliPayActivity.java @@ -71,7 +71,11 @@ public class ToBindWeChatOrAliPayActivity extends BaseActivity { viewBinding.bindLy.setVisibility(View.VISIBLE); viewBinding.xingmingTv.setText("姓名："+feedbackResp.getWxRealName()); viewBinding.wechatAlipayTv.setText("微信号："+feedbackResp.getWxNo()); - Glide.with(this).load(feedbackResp.getWxQrCode()).error(R.color.color_f4f4f4).placeholder(R.color.color_f4f4f4).into(viewBinding.imageIv); + try { + Glide.with(this).load(feedbackResp.getWxQrCode()).error(R.color.color_f4f4f4).placeholder(R.color.color_f4f4f4).into(viewBinding.imageIv); + }catch ( Exception e){ + e.printStackTrace(); + } } }else{ if(!TextUtils.isEmpty(feedbackResp.getAlipayNo())){ @@ -79,7 +83,11 @@ public class ToBindWeChatOrAliPayActivity extends BaseActivity { viewBinding.bindLy.setVisibility(View.VISIBLE); viewBinding.xingmingTv.setText("姓名："+feedbackResp.getAlipayRealName()); viewBinding.wechatAlipayTv.setText("支付宝账号："+feedbackResp.getAlipayNo()); - Glide.with(this).load(feedbackResp.getAlipayQrCode()).error(R.color.color_f4f4f4).placeholder(R.color.color_f4f4f4).into(viewBinding.imageIv); + try { + Glide.with(this).load(feedbackResp.getAlipayQrCode()).error(R.color.color_f4f4f4).placeholder(R.color.color_f4f4f4).into(viewBinding.imageIv); + }catch ( Exception e){ + e.printStackTrace(); + } } } diff --git a/app/src/main/java/com/hbl/lewan/wallet/WalletInfologFragment.java b/app/src/main/java/com/hbl/lewan/wallet/WalletInfologFragment.java index 5674f3d..04d3508 100644 --- a/app/src/main/java/com/hbl/lewan/wallet/WalletInfologFragment.java +++ b/app/src/main/java/com/hbl/lewan/wallet/WalletInfologFragment.java @@ -469,6 +469,7 @@ public class WalletInfologFragment extends BaseFragment { binding.refreshLayout.setOnRefreshListener(refreshlayout -> { pageSize = 1; titles.clear(); + tiXianLogBeans.clear(); binding.refreshLayout.setVisibility(View.VISIBLE); binding.nodateLy.setVisibility(View.GONE); binding.refreshLayout.setEnableLoadMore(true); @@ -494,7 +495,7 @@ public class WalletInfologFragment extends BaseFragment { Api.getInstance().charge(pageSize,20) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new BaseObserver>>() { + .subscribe(new BaseObserver<>() { @Override public void onSuccess(Result> feedbackResp) { changeDate(feedbackResp.data); @@ -512,7 +513,7 @@ public class WalletInfologFragment extends BaseFragment { Api.getInstance().withdraw(pageSize,20) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new BaseObserver>>() { + .subscribe(new BaseObserver<>() { @Override public void onSuccess(Result> feedbackResp) { changeDates(feedbackResp.data); diff --git a/app/src/main/res/layout/activity_account_list.xml b/app/src/main/res/layout/activity_account_list.xml new file mode 100644 index 0000000..3a90461 --- /dev/null +++ b/app/src/main/res/layout/activity_account_list.xml @@ -0,0 +1,30 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_bind_usdt.xml b/app/src/main/res/layout/activity_bind_usdt.xml new file mode 100644 index 0000000..e95501e --- /dev/null +++ b/app/src/main/res/layout/activity_bind_usdt.xml @@ -0,0 +1,221 @@ + + + + + + + + + + + + + + + + + + + + + + + +