代码优化

GoodMoney/app/src/main/java/com/mints/goodmoney/mvp/model/AccountMsgBean.java

@@ -3,8 +3,9 @@ package com.mints.goodmoney.mvp.model;
 import java.io.Serializable;
 
 public class AccountMsgBean implements Serializable {
+
     /**
-     * toDoKey : C7852652F2EE0EDA035C39349A1AB1C05DA97B9C4BEABDFF4F7DBDB2B5E505F35F433703067DF5142735505C42F58997
+     * toDoKey : CFC2C1A1AC592E07891FF5EC993AA1695DA97B9C4BEABDFF4F7DBDB2B5E505F35F433703067DF5142735505C42F58997
      * mobileUser : {"head":null,"contribution":0,"sons":0,"account":"18311400069","coin":0}
      * wxUser : {"head":"https://thirdwx.qlogo.cn/mmopen/vi_32/zo9QSE4Hgv2M2zGLTyTHyyaM6SKxKkIeJJhU0nxNZxXGAQV0SnBKwqfXkspujZjI23tvgWBJMqlziaq5Cw7r0vg/132","contribution":0,"sons":0,"account":"神秘嘉宾 🦅","coin":2050}
      */

GoodMoney/app/src/main/java/com/mints/goodmoney/net/LoanService.java

@@ -4,6 +4,7 @@ import android.text.TextUtils;
 
 import com.google.gson.JsonObject;
 import com.mints.goodmoney.BuildConfig;
+import com.mints.goodmoney.mvp.model.AccountMsgBean;
 import com.mints.goodmoney.mvp.model.BannerBean;
 import com.mints.goodmoney.mvp.model.BaseResponse;
 import com.mints.goodmoney.mvp.model.DrawcashBean;
@@ -417,7 +418,7 @@ public interface LoanService {
      * @return
      */
     @POST("api/getKeepAccountMsg")
-    Observable<BaseResponse<Object>> getKeepAccountMsg(@Body Map<String, Object> vo);
+    Observable<BaseResponse<AccountMsgBean>> getKeepAccountMsg(@Body Map<String, Object> vo);
 
     /**
      * 保留账号用户信息

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/AccountMergeActivity.kt

@@ -135,10 +135,10 @@ class AccountMergeActivity : BaseActivity(), View.OnClickListener, AccountMergeV
             tv_coin_left.text = "" + it.wxUser.coin
             tv_bonus_left.text = "" + it.wxUser.contribution
             tv_invited_left.text = "" + it.wxUser.sons
-            tv_name_right.text = "" + it.wxUser.account
-            tv_coin_right.text = "" + it.wxUser.coin
-            tv_bonus_right.text = "" + it.wxUser.contribution
-            tv_invited_right.text = "" + it.wxUser.sons
+            tv_name_right.text = "" + it.mobileUser.account
+            tv_coin_right.text = "" + it.mobileUser.coin
+            tv_bonus_right.text = "" + it.mobileUser.contribution
+            tv_invited_right.text = "" + it.mobileUser.sons
         }
     }
 

GoodMoney/app/src/main/res/layout/activity_account_merge.xml

@@ -48,7 +48,7 @@
 
                 <TextView
                     android:id="@+id/tv_coin_left"
-                    android:layout_width="wrap_content"
+                    android:layout_width="100dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="30dp"
                     android:drawablePadding="6dp"
@@ -58,7 +58,7 @@
 
                 <TextView
                     android:id="@+id/tv_bonus_left"
-                    android:layout_width="wrap_content"
+                    android:layout_width="100dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="20dp"
                     android:drawablePadding="6dp"
@@ -68,7 +68,7 @@
 
                 <TextView
                     android:id="@+id/tv_invited_left"
-                    android:layout_width="wrap_content"
+                    android:layout_width="100dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="20dp"
                     android:drawablePadding="6dp"
@@ -125,7 +125,7 @@
 
                 <TextView
                     android:id="@+id/tv_coin_right"
-                    android:layout_width="wrap_content"
+                    android:layout_width="100dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="30dp"
                     android:drawablePadding="6dp"
@@ -135,7 +135,7 @@
 
                 <TextView
                     android:id="@+id/tv_bonus_right"
-                    android:layout_width="wrap_content"
+                    android:layout_width="100dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="20dp"
                     android:drawablePadding="6dp"
@@ -145,7 +145,7 @@
 
                 <TextView
                     android:id="@+id/tv_invited_right"
-                    android:layout_width="wrap_content"
+                    android:layout_width="100dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="20dp"
                     android:drawablePadding="6dp"