修复测试反馈问题

OneToOne/src/main/java/com/shayu/onetoone/activity/ExchangeRecordActivity.java

@@ -41,8 +41,8 @@ public class ExchangeRecordActivity extends AbsOTOActivity {
 
     @Override
     protected void main(Bundle savedInstanceState) {
-        if (getIntent() != null && getIntent().getBundleExtra("bundle") != null) {
+        if (getIntent() != null && getIntent().getExtras() != null) {
-            mType = getIntent().getBundleExtra("bundle").getString("type");
+            mType = getIntent().getExtras().getString("type");
             if (TextUtils.equals(mType, "yuanbao")) {
                 type = "11";
             } else {

OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MyFragment.java

@@ -279,6 +279,7 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
                     String golds = obj.getString("gold");
                     String coins = obj.getString("coin");
                     String yuanbaos = obj.getString("yuanbao");
+                    UserManager.saveMoney(yuanbaos);
                     if (golds.length() > 8) {
                         gold.setText(golds.substring(0, golds.length() - 6) + "M");
                     } else if (golds.length() > 6) {

OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/home/HomeRankFragment.java

@@ -73,7 +73,7 @@ public class HomeRankFragment extends BaseFragment {
         rootView = findViewById(R.id.rootView);
         mRecyclerView = findViewById(R.id.recyclerView);
         mRefreshLayout = findViewById(R.id.swipeRefreshLayout);
-        adapter = new HomeRankListAdapter(getContext());
+        adapter = new HomeRankListAdapter(getContext(), type);
         hv = new HeadView(rootView);
         mRecyclerView.setAdapter(adapter);
         mRefreshLayout.setRefreshHeader(new RongRefreshHeader(this.getContext()));
@@ -201,7 +201,8 @@ public class HomeRankFragment extends BaseFragment {
             getItem(position, mVotes1, mVotes2, mVotes3).setText(user.getMoney());
             if (user.isFollow()) {
                 getItem(position, mBtnFollow1, mBtnFollow2, mBtnFollow3).setVisibility(View.GONE);
-            } else if (CommonAppConfig.getInstance().getUserBean().getId().equals(user.getId())) {
+            }
+            if (user.getUid().equals(UserManager.getUserBean().getUser().getId() + "")) {
                 getItem(position, mBtnFollow1, mBtnFollow2, mBtnFollow3).setVisibility(View.GONE);
             } else {
                 getItem(position, mBtnFollow1, mBtnFollow2, mBtnFollow3).setVisibility(View.VISIBLE);

OneToOne/src/main/java/com/shayu/onetoone/adapter/HomeRankListAdapter.java

@@ -13,6 +13,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.makeramen.roundedimageview.RoundedImageView;
 import com.shayu.onetoone.R;
+import com.shayu.onetoone.activity.fragments.home.HomeRankFragment;
 import com.shayu.onetoone.bean.FollowBean;
 import com.shayu.onetoone.bean.HomeRankBean;
 import com.shayu.onetoone.manager.OTONetManager;
@@ -29,9 +30,11 @@ import java.util.List;
 public class HomeRankListAdapter extends RecyclerView.Adapter<HomeRankListAdapter.ViewHolder> {
     private Context mContext;
     private List<HomeRankBean> list;
+    private int type;
 
-    public HomeRankListAdapter(Context mContext) {
+    public HomeRankListAdapter(Context mContext, int type) {
         this.mContext = mContext;
+        this.type = type;
         list = new ArrayList<>();
     }
 
@@ -90,7 +93,6 @@ public class HomeRankListAdapter extends RecyclerView.Adapter<HomeRankListAdapte
         private void setData(HomeRankBean bean, int position) {
             rank.setText(position + 4 + "");
             user_name.setText(bean.getUserNicename());
-            level.setText("Lv." + bean.getLevel());
             money.setText(bean.getMoney());
 
             if (bean.getSex() == 1) {
@@ -103,7 +105,16 @@ public class HomeRankListAdapter extends RecyclerView.Adapter<HomeRankListAdapte
             } else {
                 follow.setVisibility(View.VISIBLE);
             }
+            if (type == HomeRankFragment.TYPE_CHARM) {
+                level.setText("Lv." + bean.getCharmLevel());
+            } else {
+                level.setText("Lv." + bean.getWealthLevel());
+            }
+            ImgLoader.display(mContext, bean.getIconsss(), ic_level);
             ImgLoader.display(mContext, bean.getAvatar(), avatar);
+            if(bean.getUid().equals(UserManager.getUserBean().getUser().getId()+"")){
+                follow.setVisibility(View.GONE);
+            }
             follow.setText(R.string.layout_home_ranking_tips1);
             follow.setTag(bean.getUid());
             ViewClicksAntiShake.clicksAntiShake(avatar, new ViewClicksAntiShake.ViewClicksCallBack() {

OneToOne/src/main/java/com/shayu/onetoone/bean/HomeRankBean.java

@@ -21,15 +21,26 @@ public class HomeRankBean extends BaseModel {
     private String userNicename;
     private int sex;
     private int level;
+    @SerializedName("charm_level")
     private int charmLevel;
+    @SerializedName("wealth_level")
     private int wealthLevel;
     private String icon;
     private String charmIcon;
     private String wealthIcon;
+    private String iconsss;
 
     public HomeRankBean() {
     }
 
+    public String getIconsss() {
+        return iconsss;
+    }
+
+    public void setIconsss(String iconsss) {
+        this.iconsss = iconsss;
+    }
+
     public String getId() {
         return id;
     }

OneToOne/src/main/java/com/shayu/onetoone/utils/UserManager.java

@@ -46,10 +46,10 @@ public class UserManager {
         userBean = bean;
         if (StringUtil.isEmpty(bean.getUser().getTokenRong())) {
             IMLoginModel model = IMLoginManager.get(mContext).getUserInfo();
-            ;
             bean.getUser().setTokenRong(model.getTokenRong());
             bean.getUser().setToken(model.getToken());
         }
+        saveMoney(bean.getUser().getYuanbao());
         System.out.println("保存用户信息" + JSONObject.toJSONString(bean));
         IMLoginManager.get(mContext).setupLoginUser(bean.getUser());
         SpUtil.setStringValue("oto_user_info", JSONObject.toJSONString(bean));

OneToOne/src/main/res/layout/activity_msg_config.xml

@@ -2,6 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout 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="@color/rc_white_color"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 

OneToOne/src/main/res/layout/activity_search.xml

@@ -2,6 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout 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="@color/rc_white_color"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 

OneToOne/src/main/res/layout/item_home_recommend.xml

@@ -107,6 +107,7 @@
                     android:layout_gravity="center"
                     android:layout_width="10dp"
                     android:layout_height="12dp"
+                    android:scaleType="centerCrop"
                     android:layout_marginStart="5dp"
                     app:srcCompat="@mipmap/icon_level" />