第N+6次提交专属红包

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"  //正式

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"
+}

app/src/main/AndroidManifest.xml

@@ -596,6 +596,14 @@
             android:screenOrientation="portrait">
 
         </activity>
+        <activity
+            android:name=".wallet.AddOrChangeUSDTActivity"
+            android:exported="true"
+            android:screenOrientation="portrait">
+
+        </activity>
+
+
 
         <activity
             android:name=".wallet.WalletInfoActivity"

app/src/main/java/com/hbl/lewan/imkit/selector/FunContactSelectorActivity.java

@@ -78,12 +78,12 @@ public class FunContactSelectorActivity extends BaseContactSelectorActivity {
     protected View initViewAndGetRootView(Bundle savedInstanceState) {
         binding = FunContactSelectorActivityLayoutBinding.inflate(getLayoutInflater());
         contactListView = binding.contactListView;
-        lastContactView = binding.contactLast;
-        loveContactView = binding.contactListViewMylove;
+//        lastContactView = binding.contactLast;
+//        loveContactView = binding.contactListViewMylove;
         searchContactView = binding.contactSearchlistView;
         setViewHolderFactory(contactListView);
-        setViewHolderFactory(lastContactView);
-        setViewHolderFactory(loveContactView);
+//        setViewHolderFactory(lastContactView);
+//        setViewHolderFactory(loveContactView);
         setViewHolderFactory(searchContactView);
 //        contactListView.configIndexTextBGColor(getResources().getColor(R.color.color_58be6b));
         emptyGroup = binding.emptyLayout;
@@ -92,8 +92,8 @@ public class FunContactSelectorActivity extends BaseContactSelectorActivity {
         editSearch = binding.editSelectorFriends;
         titleBar = binding.title;
         tvMemberslist = binding.tvContactmember;
-        tvMembersLast = binding.tvContactlast;
-        tvMembersSpecialGz = binding.tvContactspecialgz;
+//        tvMembersLast = binding.tvContactlast;
+//        tvMembersSpecialGz = binding.tvContactspecialgz;
 
         layoutContactList = binding.layoutContactlist;
         layoutSearchList = binding.layoutSearchlist;
@@ -114,14 +114,14 @@ public class FunContactSelectorActivity extends BaseContactSelectorActivity {
         if (b) {
             rvSelected.setVisibility(View.GONE);
             updateListView(contactListView);
-            updateListView(lastContactView);
-            updateListView(loveContactView);
+//            updateListView(lastContactView);
+//            updateListView(loveContactView);
             updateListView(searchContactView);
         } else {
             rvSelected.setVisibility(View.VISIBLE);
             updateListView1(contactListView);
-            updateListView1(lastContactView);
-            updateListView1(loveContactView);
+//            updateListView1(lastContactView);
+//            updateListView1(loveContactView);
             updateListView1(searchContactView);
         }
     }

app/src/main/java/com/hbl/lewan/main/MainActivity.java

@@ -429,7 +429,7 @@ public class MainActivity extends BaseActivity {
                             if (result != null) {
                                 for (Map.Entry<String, Boolean> 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<String, Boolean> 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:

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<LoginBean> 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<String, Object> 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){

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())

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;

app/src/main/java/com/hbl/lewan/network/ApiService.java

@@ -1121,6 +1121,16 @@ public interface ApiService {
     @POST("/auth/bindAlipay")
     Observable<Result> AuthBindAlipay(@Body Map<String, String> requestBody);
 
+    /**
+     * 绑定微信
+     *
+     {
+     "usdtAddress": "",
+     "usdtUrl": "",
+     }
+     */
+    @POST("/auth/bindUsdt")
+    Observable<Result> AuthBindUsdt(@Body Map<String, String > requestBody);
 
     /**
      * 收到的红包列表

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);

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(

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<String[]> 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<String, Boolean> 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<PayInfoWxBean> 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<LocalMedia>() {
+                    @Override
+                    public void onResult(ArrayList<LocalMedia> 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<Result<BindBean>>() {
+                    @Override
+                    public void onSuccess(Result<BindBean> 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<Result<WalletBean>>() {
+
+                    @Override
+                    public void onSuccess(Result<WalletBean> 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<String> 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<String, String> 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);
+                    }
+                });
+
+
+    }
+}

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)));

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<Result<LoginBean>>() {
+                    @Override
+                    public void onSuccess(Result<LoginBean> 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);
         });

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();
+                }
 
             }
         }

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<Result<ListBeanResult<ChongZhiLogBean>>>() {
+                    .subscribe(new BaseObserver<>() {
                         @Override
                         public void onSuccess(Result<ListBeanResult<ChongZhiLogBean>> 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<Result<ListBeanResult<TiXianLogBean>>>() {
+                    .subscribe(new BaseObserver<>() {
                         @Override
                         public void onSuccess(Result<ListBeanResult<TiXianLogBean>> feedbackResp) {
                             changeDates(feedbackResp.data);

app/src/main/res/layout/activity_account_list.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white"
+    android:foreground="?android:attr/selectableItemBackground"
+    android:orientation="vertical">
+
+    <com.netease.yunxin.kit.common.ui.widgets.BackTitleBar
+        android:id="@+id/contact_list_activity_titleBar"
+        android:layout_width="match_parent"
+        android:layout_height="?actionBarSize"
+        app:layout_constraintTop_toTopOf="parent"
+        app:titleText="账号列表"
+        app:titleTextColor="@android:color/black" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="#D8D8D8" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler"
+        android:background="#F6F5F7"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>

app/src/main/res/layout/activity_bind_usdt.xml

@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white"
+    android:id="@+id/big_bg"
+    android:foreground="?android:attr/selectableItemBackground"
+    android:orientation="vertical">
+
+    <com.netease.yunxin.kit.common.ui.widgets.BackTitleBar
+        android:id="@+id/contact_list_activity_titleBar"
+        android:layout_width="match_parent"
+        android:layout_height="?actionBarSize"
+        android:background="@color/white"
+        app:layout_constraintTop_toTopOf="parent"
+        app:titleText=""
+        app:titleTextColor="@android:color/black" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="#ededed"
+        android:visibility="visible" />
+
+    <LinearLayout
+        android:id="@+id/change_ly"
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="@dimen/dp_15"
+        android:orientation="vertical">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="钱包地址"
+            android:textColor="#ff383838"
+            android:textSize="14sp"
+            />
+
+        <EditText
+            android:layout_width="match_parent"
+            android:layout_height="44dp"
+            android:gravity="center_vertical"
+            android:background="@color/transparent"
+            android:hint ="请输入您的钱包地址"
+            android:textColorHint="#ff999999"
+            android:textSize="18sp"
+            android:id="@+id/name_et"
+            android:layout_marginTop="10dp"
+            android:textColor="@color/black"
+            />
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:background="#ededed"
+            android:visibility="visible" />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="网络类型"
+            android:id="@+id/type_name_tv"
+            android:layout_marginTop="@dimen/dp_20"
+            android:textColor="#ff383838"
+            android:textSize="14sp"
+            />
+
+        <RadioButton
+            android:id="@+id/rb_bank"
+            android:layout_width="match_parent"
+            android:layout_height="44dp"
+            android:layout_marginTop="10dp"
+            android:button="@drawable/radio_button"
+            android:text="  TRC20"
+            android:textSize="14sp"
+            android:checked="true"
+            android:enabled="false"
+            android:textColor="@color/color_383838"/>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:background="#ededed"
+            android:visibility="visible" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="上传钱包地址二维码"
+            android:id="@+id/type_image_tv"
+            android:layout_marginTop="@dimen/dp_20"
+            android:textColor="#ff383838"
+            android:textSize="14sp"
+            />
+        
+        <com.hbl.lewan.widget.CircleImageView
+            android:layout_width="@dimen/dp_110"
+            android:layout_height="@dimen/dp_110"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="15dp"
+            app:es_shape_type="rectangle"
+            app:ease_radius="@dimen/dp_5"
+            android:id="@+id/image_iv"
+            android:src="@mipmap/add_img_wallet"/>
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_15"
+            android:id="@+id/tips_tv"
+            android:text="*请注意查看钱包网络类型，网络类型错误会造成资产丢失，请务必确认清楚"
+            android:textColor="#999999"
+            android:textSize="14sp"
+            />
+        <Button
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:layout_marginTop="@dimen/dp_100"
+            android:text="确定"
+            android:id="@+id/sumbit_bt"
+            android:background="@drawable/button_true_bg1"
+            android:textColor="#fff6f8fd"
+            android:textSize="16sp"
+            />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/need_data_ly"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#F6F5F7"
+        android:visibility="gone"
+        android:orientation="vertical">
+
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:id="@+id/bind_ly"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:visibility="visible">
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/dp_15">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/index_user_bg"
+                    android:orientation="vertical">
+
+                    <com.hbl.lewan.widget.CircleImageView
+                        android:id="@+id/image_iv1"
+                        android:layout_width="@dimen/dp_100"
+                        android:layout_height="@dimen/dp_100"
+                        android:layout_gravity="center_horizontal"
+                        android:layout_marginTop="15dp"
+                        android:src="@mipmap/add_img_wallet"
+                        app:ease_radius="@dimen/dp_5"
+                        app:es_shape_type="rectangle" />
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="1px"
+                        android:layout_marginStart="@dimen/dp_10"
+                        android:layout_marginTop="@dimen/dp_15"
+                        android:layout_marginEnd="@dimen/dp_10"
+                        android:background="#ededed" />
+
+                    <TextView
+                        android:id="@+id/xingming_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="15dp"
+                        android:layout_marginTop="15dp"
+                        android:layout_marginEnd="@dimen/dp_15"
+                        android:text="网络类型：TRC20"
+                        android:textColor="#ff333333"
+                        android:textSize="16sp" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10dp"
+                        android:layout_marginBottom="@dimen/dp_15"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="15dp"
+                            android:text="钱包地址："
+                            android:textColor="#ff333333"
+                            android:textSize="16sp" />
+
+                        <TextView
+                            android:id="@+id/address_tv"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginEnd="@dimen/dp_15"
+                            android:text="TRuf6kD5FXMMV6oxuhD9YJ7WzfH1SoJCAa"
+                            android:textColor="#ff4482ff"
+                            android:textSize="16sp" />
+                    </LinearLayout>
+
+                </LinearLayout>
+                <ImageView
+                    android:id="@+id/edit_iv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@mipmap/ustdt_edit_iv"
+                    android:visibility="gone"
+                    android:layout_alignParentRight="true"/>
+            </RelativeLayout>
+
+        </androidx.appcompat.widget.LinearLayoutCompat>
+    </LinearLayout>
+
+</androidx.appcompat.widget.LinearLayoutCompat>

app/src/main/res/layout/activity_buy_account.xml

@@ -161,7 +161,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:text="设置完成后，所有副号的密码都会统一为此密码，若想针对单独副号进行修改，请切换到副号中进行修改"
+                android:text="设置完成后，所有副号的密码都会统一为此密码，副号的手机号、支付密码和主号一致，不可修改。"
                 android:textColor="#999999"
                 android:textSize="14sp" />
 

app/src/main/res/layout/activity_mywallet.xml

@@ -2,16 +2,16 @@
 <androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:background="#F6F5F7"
-    android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="#F6F5F7"
+    android:orientation="vertical">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/big_bg"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        >
+        android:layout_height="wrap_content">
+
         <ImageView
             android:layout_width="match_parent"
             android:layout_height="211dp"
@@ -31,13 +31,14 @@
             app:layout_constraintTop_toTopOf="parent"
             app:titleText="我的钱包"
             app:titleTextColor="@android:color/black" />
+
         <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="180dp"
             android:layout_marginStart="@dimen/dp_12"
+            android:layout_marginTop="?actionBarSize"
             android:layout_marginEnd="@dimen/dp_12"
             android:layout_marginBottom="@dimen/dp_12"
-            android:layout_marginTop="?actionBarSize"
             android:background="@mipmap/qianbao_top_float_bg"
             android:orientation="vertical"
             app:cardCornerRadius="@dimen/dp_10"
@@ -47,6 +48,7 @@
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toTopOf="parent">
+
             <LinearLayout
                 android:id="@+id/top_cly"
                 android:layout_width="match_parent"
@@ -83,9 +85,9 @@
                         android:id="@+id/cz_bt"
                         android:layout_width="match_parent"
                         android:layout_height="48dp"
-                        android:layout_weight="1"
-                        android:layout_marginEnd="@dimen/dp_10"
                         android:layout_marginStart="@dimen/dp_20"
+                        android:layout_marginEnd="@dimen/dp_10"
+                        android:layout_weight="1"
                         android:background="@drawable/button_true_bg1"
                         android:gravity="center"
                         android:text="充值"
@@ -96,9 +98,9 @@
                         android:id="@+id/tx_bt"
                         android:layout_width="match_parent"
                         android:layout_height="48dp"
+                        android:layout_marginStart="@dimen/dp_10"
                         android:layout_marginEnd="@dimen/dp_20"
                         android:layout_weight="1"
-                        android:layout_marginStart="@dimen/dp_10"
                         android:background="@drawable/button_true_bg11"
                         android:gravity="center"
                         android:text="提现"
@@ -110,297 +112,309 @@
         </androidx.cardview.widget.CardView>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
+
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/index_user_bg"
-        android:orientation="vertical"
-        android:layout_marginTop="@dimen/dp_15"
         android:layout_marginStart="@dimen/dp_12"
+        android:layout_marginTop="@dimen/dp_15"
         android:layout_marginEnd="@dimen/dp_12"
+        android:orientation="vertical"
         android:scrollbars="none">
 
         <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:foreground="?android:attr/selectableItemBackground"
             android:orientation="vertical">
 
-
-            <LinearLayout
-                android:id="@+id/safe_ll"
+            <androidx.appcompat.widget.LinearLayoutCompat
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_57"
-                android:gravity="center_vertical"
-                android:orientation="vertical"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                tools:ignore="SpUsage">
+                android:layout_height="wrap_content"
+                android:background="@drawable/index_user_bg"
+                android:orientation="vertical">
 
-                <Button
-                    android:id="@+id/hbjl_bt"
-                    style="@style/settings_item_bg_group_full_20191"
+
+                <LinearLayout
+                    android:id="@+id/safe_ll"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:drawablePadding="@dimen/dp_15"
+                    android:layout_height="@dimen/dp_50"
                     android:gravity="center_vertical"
-                    android:text="红包记录"
-                    android:textColor="@color/color_333333"
-                    android:textSize="@dimen/sp_14"
-                    app:drawableLeftCompat="@mipmap/hongbao"
-                    app:drawableRightCompat="@drawable/ic_frame_mine_right_arrow" />
+                    android:orientation="vertical"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    tools:ignore="SpUsage">
 
-            </LinearLayout>
+                    <Button
+                        android:id="@+id/hbjl_bt"
+                        style="@style/settings_item_bg_group_full_20191"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:drawablePadding="@dimen/dp_15"
+                        android:gravity="center_vertical"
+                        android:text="红包记录"
+                        android:textColor="@color/color_333333"
+                        android:textSize="@dimen/sp_14"
+                        app:drawableLeftCompat="@mipmap/hongbao"
+                        app:drawableRightCompat="@drawable/ic_frame_mine_right_arrow" />
 
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1px"
+                    android:layout_marginLeft="@dimen/dp_15"
+                    android:layout_marginRight="@dimen/dp_15"
+                    android:background="#D8D8D8" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_50"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <Button
+                        android:id="@+id/lqmx_bt"
+                        style="@style/settings_item_bg_group_full_20191"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:drawablePadding="@dimen/dp_15"
+                        android:gravity="center_vertical"
+                        android:text="零钱明细"
+                        android:textColor="@color/color_333333"
+                        android:textSize="@dimen/sp_14"
+                        app:drawableLeftCompat="@mipmap/mingxi"
+                        app:drawableRightCompat="@drawable/ic_frame_mine_right_arrow" />
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1px"
+                    android:layout_marginLeft="@dimen/dp_15"
+                    android:layout_marginRight="@dimen/dp_15"
+                    android:background="#D8D8D8" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_50"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <Button
+                        android:id="@+id/czjl_bt"
+                        style="@style/settings_item_bg_group_full_20191"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:drawablePadding="@dimen/dp_15"
+                        android:gravity="center_vertical"
+                        android:text="充值记录"
+                        android:textColor="@color/color_333333"
+                        android:textSize="@dimen/sp_14"
+                        app:drawableLeftCompat="@mipmap/czjl_img"
+                        app:drawableRightCompat="@drawable/ic_frame_mine_right_arrow" />
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1px"
+                    android:layout_marginLeft="@dimen/dp_15"
+                    android:layout_marginRight="@dimen/dp_15"
+                    android:background="#D8D8D8" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_50"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <Button
+                        android:id="@+id/txjl_bt"
+                        style="@style/settings_item_bg_group_full_20191"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:drawablePadding="@dimen/dp_15"
+                        android:gravity="center_vertical"
+                        android:text="提现记录"
+                        android:textColor="@color/color_333333"
+                        android:textSize="@dimen/sp_14"
+                        app:drawableLeftCompat="@mipmap/txjl_img"
+                        app:drawableRightCompat="@drawable/ic_frame_mine_right_arrow" />
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1px"
+                    android:layout_marginLeft="@dimen/dp_15"
+                    android:layout_marginRight="@dimen/dp_15"
+                    android:background="#D8D8D8" />
+
+                <LinearLayout
+                    android:id="@+id/gmfh_ly"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_50"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:visibility="gone">
+
+                    <Button
+                        android:id="@+id/gmfh_bt"
+                        style="@style/settings_item_bg_group_full_20191"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:drawablePadding="@dimen/dp_15"
+                        android:gravity="center_vertical"
+                        android:text="购买副号"
+                        android:textColor="@color/color_333333"
+                        android:textSize="@dimen/sp_14"
+                        app:drawableLeftCompat="@mipmap/goumaifuhao"
+                        app:drawableRightCompat="@drawable/ic_frame_mine_right_arrow" />
+                </LinearLayout>
+
+                <View
+                    android:id="@+id/gmfh_line"
+                    android:layout_width="match_parent"
+                    android:layout_height="1px"
+                    android:layout_marginLeft="@dimen/dp_15"
+                    android:layout_marginRight="@dimen/dp_15"
+                    android:background="#D8D8D8"
+                    android:visibility="gone" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_50"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:visibility="visible">
+
+                    <Button
+                        android:id="@+id/smrz_bt"
+                        style="@style/settings_item_bg_group_full_20191"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:drawablePadding="@dimen/dp_15"
+                        android:gravity="center_vertical"
+                        android:text="实名认证"
+                        android:textColor="@color/color_333333"
+                        android:textSize="@dimen/sp_14"
+                        app:drawableLeftCompat="@mipmap/shimingrenzheng"
+                        app:drawableRightCompat="@drawable/ic_frame_mine_right_arrow" />
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1px"
+                    android:layout_marginLeft="@dimen/dp_15"
+                    android:layout_marginRight="@dimen/dp_15"
+                    android:background="#D8D8D8" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_50"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:visibility="visible">
+
+                    <Button
+                        android:id="@+id/wdyhk_bt"
+                        style="@style/settings_item_bg_group_full_20191"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:drawablePadding="@dimen/dp_15"
+                        android:gravity="center_vertical"
+                        android:text="我的银行卡"
+                        android:textColor="@color/color_333333"
+                        android:textSize="@dimen/sp_14"
+                        app:drawableLeftCompat="@mipmap/yinhangqiahao"
+                        app:drawableRightCompat="@drawable/ic_frame_mine_right_arrow" />
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1px"
+                    android:layout_marginLeft="@dimen/dp_15"
+                    android:layout_marginRight="@dimen/dp_15"
+                    android:background="#D8D8D8" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_50"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:visibility="visible">
+
+                    <Button
+                        android:id="@+id/wdwx_bt"
+                        style="@style/settings_item_bg_group_full_20191"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:drawablePadding="@dimen/dp_15"
+                        android:gravity="center_vertical"
+                        android:text="我的微信"
+                        android:textColor="@color/color_333333"
+                        android:textSize="@dimen/sp_14"
+                        app:drawableLeftCompat="@mipmap/weixin"
+                        app:drawableRightCompat="@drawable/ic_frame_mine_right_arrow" />
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1px"
+                    android:layout_marginLeft="@dimen/dp_15"
+                    android:layout_marginRight="@dimen/dp_15"
+                    android:background="#D8D8D8" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_50"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:visibility="visible">
+
+                    <Button
+                        android:id="@+id/wdzfb_bt"
+                        style="@style/settings_item_bg_group_full_20191"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:drawablePadding="@dimen/dp_15"
+                        android:gravity="center_vertical"
+                        android:text="我的支付宝"
+                        android:textColor="@color/color_333333"
+                        android:textSize="@dimen/sp_14"
+                        app:drawableLeftCompat="@mipmap/zhifubao"
+                        app:drawableRightCompat="@drawable/ic_frame_mine_right_arrow" />
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1px"
+                    android:layout_marginLeft="@dimen/dp_15"
+                    android:layout_marginRight="@dimen/dp_15"
+                    android:background="#D8D8D8" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_50"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:visibility="visible">
+
+                    <Button
+                        android:id="@+id/wdusdt_bt"
+                        style="@style/settings_item_bg_group_full_20191"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:drawablePadding="@dimen/dp_15"
+                        android:gravity="center_vertical"
+                        android:text="我的USDT钱包"
+                        android:textColor="@color/color_333333"
+                        android:textSize="@dimen/sp_14"
+                        app:drawableLeftCompat="@mipmap/usdt"
+                        app:drawableRightCompat="@drawable/ic_frame_mine_right_arrow" />
+                </LinearLayout>
+
+            </androidx.appcompat.widget.LinearLayoutCompat>
             <View
                 android:layout_width="match_parent"
-                android:layout_height="1px"
-                android:layout_marginLeft="@dimen/dp_15"
-                android:layout_marginRight="@dimen/dp_15"
-                android:background="#D8D8D8" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_57"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
-
-                <Button
-                    android:id="@+id/lqmx_bt"
-                    style="@style/settings_item_bg_group_full_20191"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:drawablePadding="@dimen/dp_15"
-                    android:gravity="center_vertical"
-                    android:text="零钱明细"
-                    android:textColor="@color/color_333333"
-                    android:textSize="@dimen/sp_14"
-                    app:drawableLeftCompat="@mipmap/mingxi"
-                    app:drawableRightCompat="@drawable/ic_frame_mine_right_arrow" />
-            </LinearLayout>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1px"
-                android:layout_marginLeft="@dimen/dp_15"
-                android:layout_marginRight="@dimen/dp_15"
-                android:background="#D8D8D8" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_57"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
-
-                <Button
-                    android:id="@+id/czjl_bt"
-                    style="@style/settings_item_bg_group_full_20191"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:drawablePadding="@dimen/dp_15"
-                    android:gravity="center_vertical"
-                    android:text="充值记录"
-                    android:textColor="@color/color_333333"
-                    android:textSize="@dimen/sp_14"
-                    app:drawableLeftCompat="@mipmap/czjl_img"
-                    app:drawableRightCompat="@drawable/ic_frame_mine_right_arrow" />
-            </LinearLayout>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1px"
-                android:layout_marginLeft="@dimen/dp_15"
-                android:layout_marginRight="@dimen/dp_15"
-                android:background="#D8D8D8" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_57"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
-
-                <Button
-                    android:id="@+id/txjl_bt"
-                    style="@style/settings_item_bg_group_full_20191"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:drawablePadding="@dimen/dp_15"
-                    android:gravity="center_vertical"
-                    android:text="提现记录"
-                    android:textColor="@color/color_333333"
-                    android:textSize="@dimen/sp_14"
-                    app:drawableLeftCompat="@mipmap/txjl_img"
-                    app:drawableRightCompat="@drawable/ic_frame_mine_right_arrow" />
-            </LinearLayout>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1px"
-                android:layout_marginLeft="@dimen/dp_15"
-                android:layout_marginRight="@dimen/dp_15"
-                android:background="#D8D8D8" />
-            <LinearLayout
-                android:id="@+id/gmfh_ly"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_57"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:visibility="gone">
-
-                <Button
-                    android:id="@+id/gmfh_bt"
-                    style="@style/settings_item_bg_group_full_20191"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:drawablePadding="@dimen/dp_15"
-                    android:gravity="center_vertical"
-                    android:text="购买副号"
-                    android:textColor="@color/color_333333"
-                    android:textSize="@dimen/sp_14"
-                    app:drawableLeftCompat="@mipmap/goumaifuhao"
-                    app:drawableRightCompat="@drawable/ic_frame_mine_right_arrow" />
-            </LinearLayout>
-
-            <View
-                android:id="@+id/gmfh_line"
-                android:layout_width="match_parent"
-                android:layout_height="1px"
-                android:visibility="gone"
-                android:layout_marginLeft="@dimen/dp_15"
-                android:layout_marginRight="@dimen/dp_15"
-                android:background="#D8D8D8" />
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_57"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:visibility="visible">
-
-                <Button
-                    android:id="@+id/smrz_bt"
-                    style="@style/settings_item_bg_group_full_20191"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:drawablePadding="@dimen/dp_15"
-                    android:gravity="center_vertical"
-                    android:text="实名认证"
-                    android:textColor="@color/color_333333"
-                    android:textSize="@dimen/sp_14"
-                    app:drawableLeftCompat="@mipmap/shimingrenzheng"
-                    app:drawableRightCompat="@drawable/ic_frame_mine_right_arrow" />
-            </LinearLayout>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1px"
-                android:layout_marginLeft="@dimen/dp_15"
-                android:layout_marginRight="@dimen/dp_15"
-                android:background="#D8D8D8" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_57"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:visibility="visible">
-
-                <Button
-                    android:id="@+id/wdyhk_bt"
-                    style="@style/settings_item_bg_group_full_20191"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:drawablePadding="@dimen/dp_15"
-                    android:gravity="center_vertical"
-                    android:text="我的银行卡"
-                    android:textColor="@color/color_333333"
-                    android:textSize="@dimen/sp_14"
-                    app:drawableLeftCompat="@mipmap/yinhangqiahao"
-                    app:drawableRightCompat="@drawable/ic_frame_mine_right_arrow" />
-            </LinearLayout>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1px"
-                android:layout_marginLeft="@dimen/dp_15"
-                android:layout_marginRight="@dimen/dp_15"
-                android:background="#D8D8D8" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_57"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:visibility="visible">
-
-                <Button
-                    android:id="@+id/wdwx_bt"
-                    style="@style/settings_item_bg_group_full_20191"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:drawablePadding="@dimen/dp_15"
-                    android:gravity="center_vertical"
-                    android:text="我的微信"
-                    android:textColor="@color/color_333333"
-                    android:textSize="@dimen/sp_14"
-                    app:drawableLeftCompat="@mipmap/weixin"
-                    app:drawableRightCompat="@drawable/ic_frame_mine_right_arrow" />
-            </LinearLayout>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1px"
-                android:layout_marginLeft="@dimen/dp_15"
-                android:layout_marginRight="@dimen/dp_15"
-                android:background="#D8D8D8" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_57"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:visibility="visible">
-
-                <Button
-                    android:id="@+id/wdzfb_bt"
-                    style="@style/settings_item_bg_group_full_20191"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:drawablePadding="@dimen/dp_15"
-                    android:gravity="center_vertical"
-                    android:text="我的支付宝"
-                    android:textColor="@color/color_333333"
-                    android:textSize="@dimen/sp_14"
-                    app:drawableLeftCompat="@mipmap/zhifubao"
-                    app:drawableRightCompat="@drawable/ic_frame_mine_right_arrow" />
-            </LinearLayout>
-            <!--        <View-->
-            <!--            android:layout_width="match_parent"-->
-            <!--            android:layout_height="1px"-->
-            <!--            android:layout_marginLeft="@dimen/dp_15"-->
-            <!--            android:layout_marginRight="@dimen/dp_15"-->
-            <!--            android:background="#D8D8D8" />-->
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_57"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:visibility="gone">
-
-                <Button
-                    android:id="@+id/wdusdt_bt"
-                    style="@style/settings_item_bg_group_full_20191"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:drawablePadding="@dimen/dp_15"
-                    android:gravity="center_vertical"
-                    android:text="我的USDT钱包"
-                    android:textColor="@color/color_333333"
-                    android:textSize="@dimen/sp_14"
-                    app:drawableLeftCompat="@mipmap/usdt"
-                    app:drawableRightCompat="@drawable/ic_frame_mine_right_arrow" />
-            </LinearLayout>
-
+                android:layout_height="40dp"/>
         </androidx.appcompat.widget.LinearLayoutCompat>
     </ScrollView>
 </androidx.appcompat.widget.LinearLayoutCompat>

app/src/main/res/layout/dialog_action_confirm.xml

@@ -52,6 +52,8 @@
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="@dimen/dp_30"
             android:layout_marginBottom="@dimen/dp_25"
+            android:paddingStart="@dimen/dp_15"
+            android:paddingEnd="@dimen/dp_15"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
@@ -59,7 +61,6 @@
                 android:id="@+id/cancel_tv"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/dp_40"
-                android:layout_marginStart="@dimen/dp_15"
                 android:layout_weight="1"
                 android:background="@drawable/cornor_stroke_thempink_12dp"
                 android:gravity="center"
@@ -78,7 +79,6 @@
                 android:id="@+id/sumbit_tv"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/dp_40"
-                android:layout_marginEnd="@dimen/dp_15"
                 android:layout_weight="1"
                 android:background="@drawable/cornor_thempink_12dp"
                 android:gravity="center"

app/src/main/res/layout/fragment_mine_new.xml

@@ -625,6 +625,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/dp_57"
                         android:gravity="center_vertical"
+                        android:visibility="gone"
                         android:orientation="vertical"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
@@ -649,6 +650,7 @@
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="1px"
+                        android:visibility="gone"
                         android:layout_marginLeft="@dimen/dp_15"
                         android:layout_marginRight="@dimen/dp_15"
                         android:background="#D8D8D8" />

app/src/main/res/values/strings.xml

@@ -515,7 +515,7 @@
     <string name="invcode_friend_txt">邀请好友</string>
     <string name="wawaji_txt">淘樂町</string>
     <string name="guanliyuanxiugai_txt">管理员修改</string>
-    <string name="jinbitixian_txt">Cash提现</string>
+    <string name="jinbitixian_txt">提现</string>
     <string name="zhuanchu_txt">转出</string>
     <string name="fffcz_txt">游戏充值</string>
     <string name="zhuanru_txt">转入</string>

chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/fun/view/message/viewholder/ChatImageMessageViewHolder.java

@@ -6,6 +6,8 @@ package com.netease.yunxin.kit.chatkit.ui.fun.view.message.viewholder;
 
 import android.view.View;
 import androidx.annotation.NonNull;
+
+import com.netease.nim.highavailable.LogUtils;
 import com.netease.nimlib.sdk.msg.attachment.ImageAttachment;
 import com.netease.nimlib.sdk.msg.constant.AttachStatusEnum;
 import com.netease.nimlib.sdk.msg.constant.MsgStatusEnum;
@@ -25,6 +27,7 @@ public class ChatImageMessageViewHolder extends ChatThumbBaseViewHolder {
   @Override
   public void bindData(ChatMessageBean message, ChatMessageBean lastMessage) {
     super.bindData(message, lastMessage);
+//    LogUtils.i("LAILIAOLIAO","走了这个ChatImageMessageViewHolder fun");
 
     binding.progressBarInsideIcon.setVisibility(View.GONE);
     binding.playIcon.setVisibility(View.GONE);

chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/fun/view/message/viewholder/ChatThumbBaseViewHolder.java

@@ -15,6 +15,7 @@ import androidx.core.content.ContextCompat;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
+import com.netease.nim.highavailable.LogUtils;
 import com.netease.nimlib.sdk.msg.attachment.FileAttachment;
 import com.netease.nimlib.sdk.msg.model.IMMessage;
 import com.netease.yunxin.kit.alog.ALog;
@@ -64,6 +65,7 @@ public abstract class ChatThumbBaseViewHolder extends FunChatBaseMessageViewHold
     }
 
     private void load() {
+//        LogUtils.i("LAILIAOLIAO","走了这个ChatThumbBaseViewHolder fun");
 
         FileAttachment attachment = (FileAttachment) getMsgInternal().getAttachment();
         if (attachment == null) {
@@ -72,10 +74,10 @@ public abstract class ChatThumbBaseViewHolder extends FunChatBaseMessageViewHold
         String path = attachment.getPath();
         String thumbPath = attachment.getThumbPath();
         if (!TextUtils.isEmpty(thumbPath)) {
-            ALog.d(TAG, "load from thumb");
+//            ALog.d(TAG, "load from thumb");
             loadThumbnailImage(thumbPath);
         } else if (!TextUtils.isEmpty(path)) {
-            ALog.d(TAG, "load from path");
+//            ALog.d(TAG, "load from path");
             try {
                 loadThumbnailImage(thumbFromSourceFile(path));
             } catch (Exception e) {
@@ -144,22 +146,24 @@ public abstract class ChatThumbBaseViewHolder extends FunChatBaseMessageViewHold
                     .override(w, h)
                     .into(binding.thumbnail);
         }
-//        if (getMsgInternal().getFromAccount().equals(IMKitClient.account())) {
-//            //自己发送
-////            binding.getRoot().setBackgroundColor(shapeBuilder.build());
-//            binding.rootview.setBackgroundResource(R.drawable.fun_message_send_bg);
-//        } else {
-//            binding.rootview.setBackgroundResource(R.drawable.fun_message_receive_bg);
-//        }
+
         binding.rootview.setBackgroundColor(binding.rootview.getResources().getColor(R.color.ps_color_transparent));
     }
 
     private int getImageThumbMinEdge() {
-        return (int) (111.0 / 375.0 * ScreenUtils.getDisplayWidth());
+        int sWidth = ScreenUtils.getDisplayWidth();
+        if(sWidth>1400){
+            sWidth = 1200;
+        }
+        return (int) (111.0 / 375.0 * sWidth);
     }
 
     private int getImageThumbMaxEdge() {
-        return (int) (200.0 / 375.0 * ScreenUtils.getDisplayWidth());
+        int sWidth = ScreenUtils.getDisplayWidth();
+        if(sWidth>1400){
+            sWidth = 1200;
+        }
+        return (int) (200.0 / 375.0 * sWidth);
     }
 
     protected abstract String thumbFromSourceFile(String path);

chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/normal/view/message/viewholder/ChatImageMessageViewHolder.java

@@ -6,6 +6,8 @@ package com.netease.yunxin.kit.chatkit.ui.normal.view.message.viewholder;
 
 import android.view.View;
 import androidx.annotation.NonNull;
+
+import com.netease.nim.highavailable.LogUtils;
 import com.netease.nimlib.sdk.msg.attachment.ImageAttachment;
 import com.netease.nimlib.sdk.msg.constant.AttachStatusEnum;
 import com.netease.nimlib.sdk.msg.constant.MsgStatusEnum;
@@ -26,7 +28,7 @@ public class ChatImageMessageViewHolder extends ChatThumbBaseViewHolder {
   @Override
   public void bindData(ChatMessageBean message, ChatMessageBean lastMessage) {
     super.bindData(message, lastMessage);
-
+    LogUtils.i("LAILIAOLIAO","走了这个ChatImageMessageViewHolder");
     binding.progressBarInsideIcon.setVisibility(View.GONE);
     binding.playIcon.setVisibility(View.GONE);
     if (getMsgInternal().getStatus() == MsgStatusEnum.sending

chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/normal/view/message/viewholder/ChatThumbBaseViewHolder.java

@@ -12,6 +12,7 @@ import androidx.annotation.NonNull;
 import androidx.core.content.ContextCompat;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
+import com.netease.nim.highavailable.LogUtils;
 import com.netease.nimlib.sdk.msg.attachment.FileAttachment;
 import com.netease.nimlib.sdk.msg.model.IMMessage;
 import com.netease.yunxin.kit.alog.ALog;
@@ -58,6 +59,8 @@ public abstract class ChatThumbBaseViewHolder extends NormalChatBaseMessageViewH
   }
 
   private void load() {
+    LogUtils.i("LAILIAOLIAO","走了这个ChatThumbBaseViewHolder");
+
     FileAttachment attachment = (FileAttachment) getMsgInternal().getAttachment();
     if (attachment == null) {
       return;

chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/page/fragment/ChatBaseFragment.java

@@ -1089,18 +1089,18 @@ public abstract class ChatBaseFragment extends BaseFragment {
     private LinearLayout layoutSearchlist;
     private RecyclerView contactSearchlistView;
     private LinearLayout layoutContactlist;
-    private RecyclerView contactLast;
-    private RecyclerView contactListViewMylove;
+//    private RecyclerView contactLast;
+//    private RecyclerView contactListViewMylove;
     private TextView tvContactmember;
     private RecyclerView contactListView;
-    private TextView zuijinTv;
-    private TextView tebieTv;
-    List<NimUserInfo> zuijinUsers;
-    List<UsersExistBean> usersExistBeanList;
+//    private TextView zuijinTv;
+//    private TextView tebieTv;
+//    List<NimUserInfo> zuijinUsers;
+//    List<UsersExistBean> usersExistBeanList;
     List<NimUserInfo> users;
     CommonAdapter commonAdapterReadContentsAll;
-    CommonAdapter commonAdapterLover;
-    CommonAdapter commonAdapterReadContents;
+//    CommonAdapter commonAdapterLover;
+//    CommonAdapter commonAdapterReadContents;
 
     private void showShareBusiness() {
         BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(getActivity(), R.style.BottomSheetDialog);
@@ -1113,8 +1113,8 @@ public abstract class ChatBaseFragment extends BaseFragment {
         layoutSearchlist = (LinearLayout) bottomView.findViewById(R.id.layout_searchlist);
         contactSearchlistView = (RecyclerView) bottomView.findViewById(R.id.contact_searchlistView);
         layoutContactlist = (LinearLayout) bottomView.findViewById(R.id.layout_contactlist);
-        contactLast = (RecyclerView) bottomView.findViewById(R.id.contact_last);
-        contactListViewMylove = (RecyclerView) bottomView.findViewById(R.id.contact_listView_mylove);
+//        contactLast = (RecyclerView) bottomView.findViewById(R.id.contact_last);
+//        contactListViewMylove = (RecyclerView) bottomView.findViewById(R.id.contact_listView_mylove);
         tvContactmember = (TextView) bottomView.findViewById(R.id.tv_contactmember);
         contactListView = (RecyclerView) bottomView.findViewById(R.id.contact_listView);
         title.getBackImageView().setImageResource(R.drawable.map_colose_img);
@@ -1140,11 +1140,11 @@ public abstract class ChatBaseFragment extends BaseFragment {
             }
         });
 
-        zuijinTv = (TextView) bottomView.findViewById(R.id.zuijin_tv);
-        tebieTv = (TextView) bottomView.findViewById(R.id.tebie_tv);
+//        zuijinTv = (TextView) bottomView.findViewById(R.id.zuijin_tv);
+//        tebieTv = (TextView) bottomView.findViewById(R.id.tebie_tv);
         initDataDialog(false, null);
-        initAdapterLast(bottomSheetDialog);
-        initAdapterLover(bottomSheetDialog);
+//        initAdapterLast(bottomSheetDialog);
+//        initAdapterLover(bottomSheetDialog);
         initAdapterUser(bottomSheetDialog);
         title.getBackImageView().setOnClickListener(new View.OnClickListener() {
             @Override
@@ -1164,12 +1164,12 @@ public abstract class ChatBaseFragment extends BaseFragment {
     private void initDataDialog(boolean isChange, String fifter) {
         fifterDataDialog(fifter);
         if (isChange) {
-            if (zuijinUsers != null) {
-                commonAdapterReadContents.setDates(zuijinUsers);
-            }
-            if (usersExistBeanList != null) {
-                commonAdapterLover.setDates(usersExistBeanList);
-            }
+//            if (zuijinUsers != null) {
+//                commonAdapterReadContents.setDates(zuijinUsers);
+//            }
+//            if (usersExistBeanList != null) {
+//                commonAdapterLover.setDates(usersExistBeanList);
+//            }
             if (users != null) {
                 commonAdapterReadContentsAll.setDates(users);
             }
@@ -1187,16 +1187,16 @@ public abstract class ChatBaseFragment extends BaseFragment {
                 }
             }
         }
-        zuijinUsers = NIMClient.getService(UserService.class).getUserInfoList(users1);
-        if (zuijinUsers != null) {
-            for (int i = 0; i < zuijinUsers.size(); i++) {
-                if (ContactRepo.isBlackList(zuijinUsers.get(i).getAccount()) || !ContactRepo.isFriend(zuijinUsers.get(i).getAccount())) {
-                    zuijinUsers.remove(i);
-                }
-
-            }
-        }
-        usersExistBeanList = getFollowUsers();
+//        zuijinUsers = NIMClient.getService(UserService.class).getUserInfoList(users1);
+//        if (zuijinUsers != null) {
+//            for (int i = 0; i < zuijinUsers.size(); i++) {
+//                if (ContactRepo.isBlackList(zuijinUsers.get(i).getAccount()) || !ContactRepo.isFriend(zuijinUsers.get(i).getAccount())) {
+//                    zuijinUsers.remove(i);
+//                }
+//
+//            }
+//        }
+//        usersExistBeanList = getFollowUsers();
 
         List<String> friends = NIMClient.getService(FriendService.class).getFriendAccounts();
         users = NIMClient.getService(UserService.class).getUserInfoList(friends);
@@ -1213,25 +1213,25 @@ public abstract class ChatBaseFragment extends BaseFragment {
             }
         }
         if (!TextUtils.isEmpty(fifter)) {
-            if (zuijinUsers != null && zuijinUsers.size() > 0) {
-                List<NimUserInfo> nimUserInfos = new ArrayList<>();
-                for (int i = 0; i < zuijinUsers.size(); i++) {
-                    if (zuijinUsers.get(i).getName().contains(fifter)) {
-                        nimUserInfos.add(zuijinUsers.get(i));
-                    }
-                }
-                zuijinUsers = nimUserInfos;
-            }
+//            if (zuijinUsers != null && zuijinUsers.size() > 0) {
+//                List<NimUserInfo> nimUserInfos = new ArrayList<>();
+//                for (int i = 0; i < zuijinUsers.size(); i++) {
+//                    if (zuijinUsers.get(i).getName().contains(fifter)) {
+//                        nimUserInfos.add(zuijinUsers.get(i));
+//                    }
+//                }
+//                zuijinUsers = nimUserInfos;
+//            }
 
-            if (usersExistBeanList != null && usersExistBeanList.size() > 0) {
-                List<UsersExistBean> nimUserInfos = new ArrayList<>();
-                for (int i = 0; i < usersExistBeanList.size(); i++) {
-                    if (usersExistBeanList.get(i).getNickname().contains(fifter)) {
-                        nimUserInfos.add(usersExistBeanList.get(i));
-                    }
-                }
-                usersExistBeanList = nimUserInfos;
-            }
+//            if (usersExistBeanList != null && usersExistBeanList.size() > 0) {
+//                List<UsersExistBean> nimUserInfos = new ArrayList<>();
+//                for (int i = 0; i < usersExistBeanList.size(); i++) {
+//                    if (usersExistBeanList.get(i).getNickname().contains(fifter)) {
+//                        nimUserInfos.add(usersExistBeanList.get(i));
+//                    }
+//                }
+//                usersExistBeanList = nimUserInfos;
+//            }
 
             if (users != null && users.size() > 0) {
                 List<NimUserInfo> nimUserInfos = new ArrayList<>();
@@ -1245,21 +1245,21 @@ public abstract class ChatBaseFragment extends BaseFragment {
 
         }
 
-        int size1 = 0;
-        int size2 = 0;
+//        int size1 = 0;
+//        int size2 = 0;
         int size3 = 0;
-        if (zuijinUsers != null && zuijinUsers.size() > 0) {
-            size1 = zuijinUsers.size();
-        }
-        if (usersExistBeanList != null && usersExistBeanList.size() > 0) {
-            size2 = usersExistBeanList.size();
-        }
+//        if (zuijinUsers != null && zuijinUsers.size() > 0) {
+//            size1 = zuijinUsers.size();
+//        }
+//        if (usersExistBeanList != null && usersExistBeanList.size() > 0) {
+//            size2 = usersExistBeanList.size();
+//        }
         if (users != null && users.size() > 0) {
             size3 = users.size();
         }
-        zuijinTv.setText(getString(R.string.jinjinlianxi_txt) + " " + size1);
-        tebieTv.setText(getString(R.string.tebieguanxin_txt) + " " + size2);
-        tvContactmember.setText(getString(R.string.all_txt) + " " + size3);
+//        zuijinTv.setText(getString(R.string.jinjinlianxi_txt) + " " + size1);
+//        tebieTv.setText(getString(R.string.tebieguanxin_txt) + " " + size2);
+        tvContactmember.setText(getString(R.string.all_txt) + " ");
 
     }
 
@@ -1320,110 +1320,6 @@ public abstract class ChatBaseFragment extends BaseFragment {
 
     }
 
-    private void initAdapterLover(BottomSheetDialog bottomSheetDialog) {
-
-        if (usersExistBeanList != null && usersExistBeanList.size() > 0) {
-            tebieTv.setVisibility(View.VISIBLE);
-            contactListViewMylove.setVisibility(View.VISIBLE);
-
-            contactListViewMylove.setLayoutManager(new LinearLayoutManager(getActivity()));
-            commonAdapterLover = new CommonAdapter<UsersExistBean>(getActivity(), R.layout.follow_child_item, usersExistBeanList) {
-                @Override
-                public void convert(ViewHolder holder, UsersExistBean s, int index) {
-                    ContactAvatarView contactAvatarView = holder.getView(R.id.logo_iv);
-                    Log.i("异常数据：", "异常数据：" + GsonUtils.beanToJSONString(s));
-                    if (TextUtils.isEmpty(s.getAvatar())) {
-                        contactAvatarView.setData(
-                                R.drawable.default_head_img, s.getNickname());
-                    } else {
-                        contactAvatarView.setData(
-                                s.getAvatar(), s.getNickname());
-                    }
-                    holder.setText(R.id.item_title_tv, s.getNickname());
-
-                    holder.getView(R.id.big_ly).setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(View v) {
-                            BusinessCardBean businessCardBean = new BusinessCardBean();
-                            businessCardBean.setAccout(s.getUserId() + "");
-                            businessCardBean.setName(s.getNickname());
-                            businessCardBean.setAvatar(s.getAvatar());
-                            bottomSheetDialog.dismiss();
-                            toShareBuesiness(businessCardBean);
-                        }
-                    });
-                }
-
-
-            };
-            contactListViewMylove.setAdapter(commonAdapterLover);
-
-        } else {
-            tebieTv.setVisibility(View.GONE);
-            contactListViewMylove.setVisibility(View.GONE);
-        }
-    }
-
-    /**
-     * 获取所有关注的用户
-     *
-     * @return
-     */
-    private List<UsersExistBean> getFollowUsers() {
-        String tagString = ChatDataUtils.get(getActivity(), "follow_user" + "_" + IMKitClient.account(), "");
-        if (TextUtils.isEmpty(tagString)) {
-            return null;
-        } else {
-            List<UsersExistBean> usersExistBeans = GsonUtils.getListFromJSON(tagString, UsersExistBean.class);
-            return usersExistBeans;
-        }
-    }
-
-
-    private void initAdapterLast(BottomSheetDialog bottomSheetDialog) {
-
-        if (zuijinUsers != null && zuijinUsers.size() > 0) {
-            zuijinTv.setVisibility(View.VISIBLE);
-            contactLast.setVisibility(View.VISIBLE);
-
-            contactLast.setLayoutManager(new LinearLayoutManager(getActivity()));
-            commonAdapterReadContents = new CommonAdapter<NimUserInfo>(getActivity(), R.layout.follow_child_item, zuijinUsers) {
-                @Override
-                public void convert(ViewHolder holder, NimUserInfo s, int index) {
-                    ContactAvatarView contactAvatarView = holder.getView(R.id.logo_iv);
-                    if (TextUtils.isEmpty(s.getAvatar())) {
-                        contactAvatarView.setData(
-                                R.drawable.default_head_img, s.getName());
-                    } else {
-                        contactAvatarView.setData(
-                                s.getAvatar(), s.getName());
-                    }
-                    holder.setText(R.id.item_title_tv, s.getName());
-
-                    holder.getView(R.id.big_ly).setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(View v) {
-                            BusinessCardBean businessCardBean = new BusinessCardBean();
-                            businessCardBean.setAccout(s.getAccount());
-                            businessCardBean.setName(s.getName());
-                            businessCardBean.setAvatar(s.getAvatar());
-                            bottomSheetDialog.dismiss();
-                            toShareBuesiness(businessCardBean);
-                        }
-                    });
-                }
-
-
-            };
-            contactLast.setAdapter(commonAdapterReadContents);
-
-        } else {
-            zuijinTv.setVisibility(View.GONE);
-            contactLast.setVisibility(View.GONE);
-        }
-
-
-    }
 
     @RequiresApi(api = Build.VERSION_CODES.M)
     public static void setWhiteNavigationBar(@NonNull Dialog dialog) {

chatkit-ui/src/main/res/layout/dialog_action_confirm.xml

@@ -36,8 +36,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="62dp"
-            android:paddingStart="@dimen/dimen_20_dp"
-            android:paddingEnd="@dimen/dimen_20_dp"
+            android:paddingLeft="@dimen/dimen_20_dp"
+            android:paddingRight="@dimen/dimen_20_dp"
             android:layout_alignParentBottom="true"
             android:layout_gravity="center_horizontal"
             android:gravity="center_vertical"

chatkit-ui/src/main/res/layout/fun_contact_selector_dialog.xml

@@ -102,45 +102,45 @@
                 android:layout_height="match_parent"
                 android:orientation="vertical">
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="@dimen/dimen_15_dp"
-                    android:layout_marginTop="@dimen/dimen_20_dp"
-                    android:text="@string/jinjinlianxi_txt"
-                    android:id="@+id/zuijin_tv"
-                    android:textColor="@color/color_333333"
-                    android:textSize="@dimen/text_size_14"
-                    />
+<!--                <TextView-->
+<!--                    android:layout_width="wrap_content"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:layout_marginLeft="@dimen/dimen_15_dp"-->
+<!--                    android:layout_marginTop="@dimen/dimen_20_dp"-->
+<!--                    android:text="@string/jinjinlianxi_txt"-->
+<!--                    android:id="@+id/zuijin_tv"-->
+<!--                    android:textColor="@color/color_333333"-->
+<!--                    android:textSize="@dimen/text_size_14"-->
+<!--                    />-->
 
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/contact_last"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/dimen_20_dp"
-                    app:showIndexBar="false"
-                    app:showSelector="true" />
+<!--                <androidx.recyclerview.widget.RecyclerView-->
+<!--                    android:id="@+id/contact_last"-->
+<!--                    android:layout_width="match_parent"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:layout_marginTop="@dimen/dimen_20_dp"-->
+<!--                    app:showIndexBar="false"-->
+<!--                    app:showSelector="true" />-->
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="@dimen/dimen_15_dp"
-                    android:layout_marginTop="@dimen/dimen_20_dp"
-                    android:visibility="visible"
-                    android:text="@string/tebieguanxin_txt"
-                    android:id="@+id/tebie_tv"
-                    android:textColor="@color/color_333333"
-                    android:textSize="@dimen/text_size_14"
-                    />
+<!--                <TextView-->
+<!--                    android:layout_width="wrap_content"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:layout_marginLeft="@dimen/dimen_15_dp"-->
+<!--                    android:layout_marginTop="@dimen/dimen_20_dp"-->
+<!--                    android:visibility="visible"-->
+<!--                    android:text="@string/tebieguanxin_txt"-->
+<!--                    android:id="@+id/tebie_tv"-->
+<!--                    android:textColor="@color/color_333333"-->
+<!--                    android:textSize="@dimen/text_size_14"-->
+<!--                    />-->
 
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/contact_listView_mylove"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:visibility="visible"
-                    android:layout_marginTop="@dimen/dimen_20_dp"
-                    app:showIndexBar="false"
-                    app:showSelector="true" />
+<!--                <androidx.recyclerview.widget.RecyclerView-->
+<!--                    android:id="@+id/contact_listView_mylove"-->
+<!--                    android:layout_width="match_parent"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:visibility="visible"-->
+<!--                    android:layout_marginTop="@dimen/dimen_20_dp"-->
+<!--                    app:showIndexBar="false"-->
+<!--                    app:showSelector="true" />-->
 
                 <TextView
                     android:id="@+id/tv_contactmember"

contactkit-ui/src/main/java/com/netease/yunxin/kit/contactkit/ui/selector/BaseContactSelectorActivity.java

@@ -94,15 +94,15 @@ public abstract class BaseContactSelectorActivity extends BaseActivity {
     protected boolean checkNetworkEnable = true;
 
     protected boolean enableReturnName;
-    protected ContactListView loveContactView;
-    protected ContactListView lastContactView;
+//    protected ContactListView loveContactView;
+//    protected ContactListView lastContactView;
     protected ContactListView searchContactView;
 
     protected LinearLayout layoutContactList;
     protected LinearLayout layoutSearchList;
     protected TextView tvMemberslist;
-    protected TextView tvMembersLast;
-    protected TextView tvMembersSpecialGz;
+//    protected TextView tvMembersLast;
+//    protected TextView tvMembersSpecialGz;
 
     protected boolean isInvite;
 
@@ -182,15 +182,15 @@ public abstract class BaseContactSelectorActivity extends BaseActivity {
                                     .show();
                             ((ContactFriendBean) data).setSelected(false);
                             contactListView.updateContactData(data);
-                            lastContactView.updateContactData(data);
+//                            lastContactView.updateContactData(data);
                             searchContactView.updateContactData(data);
-                            loveContactView.updateContactData(data);
+//                            loveContactView.updateContactData(data);
                         } else {
                             ((ContactFriendBean) data).setSelected(true);
                             contactListView.updateContactData(data);
-                            lastContactView.updateContactData(data);
+//                            lastContactView.updateContactData(data);
                             searchContactView.updateContactData(data);
-                            loveContactView.updateContactData(data);
+//                            loveContactView.updateContactData(data);
                             selectedListAdapter.addFriend((ContactFriendBean) data);
 
                         }
@@ -198,8 +198,8 @@ public abstract class BaseContactSelectorActivity extends BaseActivity {
                         ((ContactFriendBean) data).setSelected(false);
                         selectedListAdapter.removeFriend((ContactFriendBean) data);
                         contactListView.updateContactData(data);
-                        lastContactView.updateContactData(data);
-                        loveContactView.updateContactData(data);
+//                        lastContactView.updateContactData(data);
+//                        loveContactView.updateContactData(data);
                         searchContactView.updateContactData(data);
                     }
                     // titleBar.setActionText(getString(R.string.selector_sure_without_num));
@@ -216,9 +216,9 @@ public abstract class BaseContactSelectorActivity extends BaseActivity {
 //    }
 
         contactListView.setContactAction(actions);
-        lastContactView.setContactAction(actions);
+//        lastContactView.setContactAction(actions);
         searchContactView.setContactAction(actions);
-        loveContactView.setContactAction(actions);
+//        loveContactView.setContactAction(actions);
     //top selected list
     LinearLayoutManager layoutManager =
             new LinearLayoutManager(this, RecyclerView.HORIZONTAL, false);
@@ -232,8 +232,8 @@ public abstract class BaseContactSelectorActivity extends BaseActivity {
     {
         item.setSelected(false);
         contactListView.updateContactData(item);
-        lastContactView.updateContactData(item);
-        loveContactView.updateContactData(item);
+//        lastContactView.updateContactData(item);
+//        loveContactView.updateContactData(item);
         searchContactView.updateContactData(item);
         //int count = selectedListAdapter.getItemCount();
         //  titleBar.setActionText(getString(R.string.selector_sure_without_num));
@@ -370,10 +370,10 @@ public abstract class BaseContactSelectorActivity extends BaseActivity {
         if (recentContact != null && recentContact.size() > 0) {
             List<ContactFriendBean> list = convertConvacationList(recentContact);
             if (list.size() > 0) {
-                tvMembersLast.setVisibility(View.VISIBLE);
-                lastContactView.setVisibility(View.VISIBLE);
-                tvMembersLast.setText(String.format(getString(R.string.fun_contactselector_last), list.size()));
-                lastContactView.onFriendDataSourceChanged(list);
+//                tvMembersLast.setVisibility(View.VISIBLE);
+//                lastContactView.setVisibility(View.VISIBLE);
+//                tvMembersLast.setText(String.format(getString(R.string.fun_contactselector_last), list.size()));
+//                lastContactView.onFriendDataSourceChanged(list);
             }
         }
 
@@ -389,12 +389,12 @@ public abstract class BaseContactSelectorActivity extends BaseActivity {
         });
         List<ContactFriendBean> DATA = getFollowList();
         Log.i("D", DATA + "");
-        if (lastContactView != null && DATA.size() > 0) {
-            tvMembersSpecialGz.setVisibility(View.VISIBLE);
-            loveContactView.setVisibility(View.VISIBLE);
-            tvMembersSpecialGz.setText(String.format(getString(R.string.fun_contactselector_mylove), DATA.size()));
-            loveContactView.onFriendDataSourceChanged(getFollowList());
-        }
+//        if (lastContactView != null && DATA.size() > 0) {
+//            tvMembersSpecialGz.setVisibility(View.VISIBLE);
+//            loveContactView.setVisibility(View.VISIBLE);
+//            tvMembersSpecialGz.setText(String.format(getString(R.string.fun_contactselector_mylove), DATA.size()));
+//            loveContactView.onFriendDataSourceChanged(getFollowList());
+//        }
     }
 
 //    public List<ContactFriendBean> convertConvacationList(List<ConversationBean> list) {
@@ -470,10 +470,10 @@ public abstract class BaseContactSelectorActivity extends BaseActivity {
         return result;
     }
 
-
-    protected List<ContactFriendBean> getLastContactList() {
-        return lastContactView.getAdapter().getFriendList();
-    }
+//
+//    protected List<ContactFriendBean> getLastContactList() {
+//        return lastContactView.getAdapter().getFriendList();
+//    }
 
     protected List<ContactFriendBean> getContactAllList() {
         return contactListView.getAdapter().getFriendList();

contactkit-ui/src/main/res-fun/layout/fun_contact_selector_activity_layout.xml

@@ -107,44 +107,6 @@
                 android:layout_height="match_parent"
                 android:orientation="vertical">
 
-                <TextView
-                    android:id="@+id/tv_contactlast"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="@dimen/dimen_15_dp"
-                    android:layout_marginTop="@dimen/dimen_20_dp"
-                    android:textColor="@color/color_333333"
-                    android:visibility="gone"
-                    android:textSize="@dimen/text_size_14" />
-
-                <com.netease.yunxin.kit.contactkit.ui.view.ContactListView
-                    android:id="@+id/contact_last"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/dimen_20_dp"
-                    app:showIndexBar="false"
-                    android:visibility="gone"
-                    app:showSelector="true" />
-
-                <TextView
-                    android:id="@+id/tv_contactspecialgz"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="@dimen/dimen_15_dp"
-                    android:layout_marginTop="@dimen/dimen_20_dp"
-                    android:textColor="@color/color_333333"
-                    android:textSize="@dimen/text_size_14"
-                    android:visibility="gone" />
-
-                <com.netease.yunxin.kit.contactkit.ui.view.ContactListView
-                    android:id="@+id/contact_listView_mylove"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/dimen_20_dp"
-                    android:visibility="gone"
-                    app:showIndexBar="false"
-                    app:showSelector="true" />
-
                 <TextView
                     android:id="@+id/tv_contactmember"
                     android:layout_width="wrap_content"

conversationkit-ui/src/main/res-normal/layout/conversation_view_holder.xml

@@ -7,32 +7,21 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/rootView"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/dimen_62_dp">
+    android:layout_height="@dimen/dimen_75_dp">
 
     <FrameLayout
         android:id="@+id/avatarLayout"
-        android:layout_width="@dimen/dimen_52_dp"
-        android:layout_height="@dimen/dimen_42_dp"
-        android:layout_marginVertical="@dimen/dimen_10_dp"
-        android:layout_marginStart="@dimen/dimen_20_dp">
+        android:layout_width="@dimen/dimen_45_dp"
+        android:layout_height="@dimen/dimen_45_dp"
+        android:layout_marginVertical="15dp"
+        android:layout_marginStart="@dimen/dimen_14_dp">
 
         <com.netease.yunxin.kit.common.ui.widgets.ContactAvatarView
             android:id="@+id/avatarView"
-            android:layout_width="@dimen/dimen_42_dp"
-            android:layout_height="@dimen/dimen_42_dp" />
+            android:layout_width="@dimen/dimen_45_dp"
+            android:layout_height="@dimen/dimen_45_dp" />
+
 
-        <TextView android:id="@+id/unreadTv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="top|end"
-            android:layout_marginEnd="@dimen/dimen_5_dp"
-            android:background="@drawable/bg_conversation_red_dot"
-            android:gravity="center"
-            android:paddingStart="@dimen/dimen_5_dp"
-            android:paddingEnd="@dimen/dimen_5_dp"
-            android:textColor="@color/color_white"
-            android:textSize="@dimen/text_size_12"
-            android:visibility="gone" />
     </FrameLayout>
 
     <FrameLayout
@@ -40,23 +29,23 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginStart="@dimen/dimen_74_dp"
-        android:layout_marginEnd="@dimen/dimen_20_dp">
+        android:layout_marginEnd="@dimen/dimen_14_dp">
 
         <TextView
             android:id="@+id/nameTv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dimen_10_dp"
+            android:layout_marginTop="@dimen/dimen_14_dp"
             android:layout_marginEnd="@dimen/dimen_100_dp"
             android:ellipsize="end"
             android:maxLines="1"
-            android:textColor="@color/color_333333"
+            android:textColor="#616161"
             android:textSize="@dimen/text_size_16" />
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dimen_35_dp"
+            android:layout_marginTop="@dimen/dimen_40_dp"
             android:layout_marginEnd="@dimen/dimen_18_dp"
             android:orientation="horizontal">
         <TextView
@@ -76,14 +65,14 @@
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:maxLines="1"
-            android:textColor="@color/color_999999"/>
+            android:textColor="#7F7B81"/>
         </LinearLayout>
         <TextView
             android:id="@+id/timeTv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="end"
-            android:layout_marginTop="@dimen/dimen_12_dp"
+            android:layout_marginTop="@dimen/dimen_16_dp"
             android:ellipsize="end"
             android:maxWidth="@dimen/dimen_100_dp"
             android:maxLines="1"
@@ -98,6 +87,25 @@
             android:src="@drawable/ic_conversation_mute"
             android:visibility="gone"
             />
+
+        <TextView android:id="@+id/unreadTv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="top|end"
+            android:background="@drawable/bg_conversation_red_dot"
+            android:gravity="center"
+            android:paddingStart="@dimen/dimen_5_dp"
+            android:paddingEnd="@dimen/dimen_5_dp"
+            android:textColor="@color/color_white"
+            android:textSize="@dimen/text_size_12"
+            android:layout_marginTop="@dimen/dimen_40_dp"
+            android:visibility="gone" />
     </FrameLayout>
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0.5dp"
+        android:background="#E0E0E0"
+        android:layout_marginTop="@dimen/dimen_74_dp"
+        />
 </FrameLayout>

conversationkit-ui/src/main/res-normal/layout/p2p_view_holder_layout.xml

@@ -8,33 +8,20 @@
     android:id="@+id/root_view"
     android:layout_width="match_parent"
     android:background="@drawable/fun_conversation_view_holder_selector"
-
     android:layout_height="76dp">
 
     <FrameLayout
         android:id="@+id/conversation_avatar_fl"
-        android:layout_width="@dimen/dimen_52_dp"
-        android:layout_height="@dimen/dimen_42_dp"
+        android:layout_width="@dimen/dimen_45_dp"
+        android:layout_height="@dimen/dimen_45_dp"
         android:layout_marginVertical="17dp"
-        android:layout_marginStart="@dimen/dimen_20_dp">
+        android:layout_marginStart="@dimen/dimen_14_dp">
 
         <com.netease.yunxin.kit.common.ui.widgets.ContactAvatarView
             android:id="@+id/avatar_view"
-            android:layout_width="@dimen/dimen_42_dp"
-            android:layout_height="@dimen/dimen_42_dp" />
+            android:layout_width="@dimen/dimen_45_dp"
+            android:layout_height="@dimen/dimen_45_dp" />
 
-        <TextView android:id="@+id/conversation_unread_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="top|end"
-            android:layout_marginEnd="@dimen/dimen_5_dp"
-            android:background="@drawable/bg_conversation_red_dot"
-            android:gravity="center"
-            android:paddingStart="@dimen/dimen_5_dp"
-            android:paddingEnd="@dimen/dimen_5_dp"
-            android:textColor="@color/color_white"
-            android:textSize="@dimen/text_size_12"
-            android:visibility="gone" />
     </FrameLayout>
 
     <FrameLayout
@@ -86,6 +73,26 @@
             android:visibility="gone"
             />
 
+        <TextView android:id="@+id/conversation_unread_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="top|end"
+            android:layout_marginEnd="@dimen/dimen_5_dp"
+            android:background="@drawable/bg_conversation_red_dot"
+            android:gravity="center"
+            android:paddingStart="@dimen/dimen_5_dp"
+            android:paddingEnd="@dimen/dimen_5_dp"
+            android:layout_marginTop="@dimen/dimen_40_dp"
+            android:textColor="@color/color_white"
+            android:textSize="@dimen/text_size_12"
+            android:visibility="gone" />
     </FrameLayout>
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0.5dp"
+        android:background="#E0E0E0"
+        android:layout_marginTop="@dimen/dimen_75_dp"
+         />
+
 </FrameLayout>

conversationkit-ui/src/main/res-normal/layout/team_view_holder_layout.xml

@@ -12,28 +12,17 @@
 
     <FrameLayout
         android:id="@+id/conversation_avatar_fl"
-        android:layout_width="@dimen/dimen_52_dp"
-        android:layout_height="@dimen/dimen_42_dp"
+        android:layout_width="@dimen/dimen_45_dp"
+        android:layout_height="@dimen/dimen_45_dp"
         android:layout_marginVertical="17dp"
-        android:layout_marginStart="@dimen/dimen_20_dp">
+        android:layout_marginStart="@dimen/dimen_14_dp">
 
         <com.netease.yunxin.kit.common.ui.widgets.ContactAvatarView
             android:id="@+id/avatar_view"
             android:layout_width="@dimen/dimen_42_dp"
             android:layout_height="@dimen/dimen_42_dp" />
 
-        <TextView android:id="@+id/conversation_unread_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="top|end"
-            android:layout_marginEnd="@dimen/dimen_5_dp"
-            android:background="@drawable/bg_conversation_red_dot"
-            android:gravity="center"
-            android:paddingStart="@dimen/dimen_5_dp"
-            android:paddingEnd="@dimen/dimen_5_dp"
-            android:textColor="@color/color_white"
-            android:textSize="@dimen/text_size_12"
-            android:visibility="gone" />
+
     </FrameLayout>
 
     <FrameLayout
@@ -99,6 +88,26 @@
             android:src="@drawable/ic_conversation_mute"
             android:visibility="gone"
             />
+
+        <TextView android:id="@+id/conversation_unread_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="top|end"
+            android:layout_marginEnd="@dimen/dimen_5_dp"
+            android:background="@drawable/bg_conversation_red_dot"
+            android:gravity="center"
+            android:paddingStart="@dimen/dimen_5_dp"
+            android:paddingEnd="@dimen/dimen_5_dp"
+            android:textColor="@color/color_white"
+            android:textSize="@dimen/text_size_12"
+            android:layout_marginTop="@dimen/dimen_40_dp"
+            android:visibility="gone" />
     </FrameLayout>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0.5dp"
+        android:background="#E0E0E0"
+        android:layout_marginTop="@dimen/dimen_75_dp"
+        />
 
 </FrameLayout>

conversationkit-ui/src/main/res/values/colors.xml

@@ -5,7 +5,7 @@
     <color name="color_337eff">#337eff</color>
     <color name="color_ededef">#ededef</color>
     <color name="color_666666">#666666</color>
-    <color name="color_ff4e54">#ff4e54</color>
+    <color name="color_ff4e54">#FF4E54</color>
     <color name="color_ff4e54_t">#88ff4e54</color>
 
     <color name="color_999999">#999999</color>