修复测试反馈问题

OneToOne/src/main/AndroidManifest.xml

@@ -199,10 +199,6 @@
             android:name=".activity.MyFriendListActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
-        <activity
-            android:name=".activity.setting.BindUserActivity"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden|adjustResize" />
 
 
         <activity

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

@@ -28,6 +28,7 @@ public class MyFriendListActivity extends AbsOTOActivity {
     public static final int TYPE_FANS = 1;
     public static final int TYPE_FOLLOW = 2;
     private int type;
+    private String num;
     int page = 1;
     MyFriendListAdapter adapter;
     SmartRefreshLayout mRefreshLayout;
@@ -42,6 +43,7 @@ public class MyFriendListActivity extends AbsOTOActivity {
     protected void main(Bundle savedInstanceState) {
         Bundle extras = getIntent().getExtras();
         type = extras.getInt("type", TYPE_FRIEND);
+        num = extras.getString("num", "0");
         mRefreshLayout = findViewById(R.id.swipeRefreshLayout);
         recyclerView = findViewById(R.id.recyclerView);
         adapter = new MyFriendListAdapter(mContext);
@@ -92,7 +94,7 @@ public class MyFriendListActivity extends AbsOTOActivity {
                     break;
             }
             if (data.isEmpty()) {
-                setTitle(title + "(" + adapter.getItemCount() + WordUtil.getNewString(R.string.activity_my_friend_list_people)+")");
+                setTitle(title + "(" + num + WordUtil.getNewString(R.string.activity_my_friend_list_people)+")");
                 recyclerView.loadMoreFinish(true, false);
                 return;
             }
@@ -103,7 +105,7 @@ public class MyFriendListActivity extends AbsOTOActivity {
                 adapter.addList(data);
             }
             page++;
-            setTitle(title + "(" + adapter.getItemCount() +  WordUtil.getNewString(R.string.activity_my_friend_list_people)+")");
+            setTitle(title + "(" + num +  WordUtil.getNewString(R.string.activity_my_friend_list_people)+")");
         }
 
         @Override

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

@@ -81,8 +81,18 @@ public class FriendsFragment extends BaseFragment {
                 return fragments.size();
             }
         });
-        findViewById(R.id.btn_top).setOnClickListener(v -> RouteManager.forwardActivity(RouteManager.ACTIVITY_HOME_RANK));
+        ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.btn_top), new ViewClicksAntiShake.ViewClicksCallBack() {
-        findViewById(R.id.btn_filter).setOnClickListener(v -> RouteManager.forwardActivity(RouteManager.ACTIVITY_HOME_SCREEN));
+            @Override
+            public void onViewClicks() {
+                RouteManager.forwardActivity(RouteManager.ACTIVITY_HOME_RANK);
+            }
+        });
+        ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.btn_filter), new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                RouteManager.forwardActivity(RouteManager.ACTIVITY_HOME_SCREEN);
+            }
+        });
 
         Bundle screen = getActivity().getIntent().getBundleExtra("screen");
         if (screen != null) {

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

@@ -145,20 +145,32 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
         friendLayout = itemView.findViewById(R.id.friend_layout);
         sex = itemView.findViewById(R.id.sex);
 
-        fansLayout.setOnClickListener(v -> {
+        ViewClicksAntiShake.clicksAntiShake(fansLayout, new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
                 Bundle bundle = new Bundle();
                 bundle.putInt("type", MyFriendListActivity.TYPE_FANS);
+                bundle.putString("num", fansNum.getText().toString());
                 RouteManager.forwardActivity(RouteManager.ACTIVITY_MY_FRIEND_LIST, bundle);
+            }
         });
-        followLayout.setOnClickListener(v -> {
+        ViewClicksAntiShake.clicksAntiShake(followLayout, new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
                 Bundle bundle = new Bundle();
                 bundle.putInt("type", MyFriendListActivity.TYPE_FOLLOW);
+                bundle.putString("num", followNum.getText().toString());
                 RouteManager.forwardActivity(RouteManager.ACTIVITY_MY_FRIEND_LIST, bundle);
+            }
         });
-        friendLayout.setOnClickListener(v -> {
+        ViewClicksAntiShake.clicksAntiShake(friendLayout, new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
                 Bundle bundle = new Bundle();
                 bundle.putInt("type", MyFriendListActivity.TYPE_FRIEND);
+                bundle.putString("num", friendNum.getText().toString());
                 RouteManager.forwardActivity(RouteManager.ACTIVITY_MY_FRIEND_LIST, bundle);
+            }
         });
 
         user_noble_ico = (ImageView) itemView.findViewById(R.id.user_noble_ico);
@@ -174,19 +186,60 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
         banner_me = (Banner) itemView.findViewById(R.id.banner_me);
         lt_advertisement = (LinearLayout) itemView.findViewById(R.id.lt_advertisement);
         tv_setting = (TextView) itemView.findViewById(R.id.tv_setting);
-        itemView.findViewById(R.id.lt_star_coin).setOnClickListener(this);
-        itemView.findViewById(R.id.btn_coin).setOnClickListener(this);
-        itemView.findViewById(R.id.btn_gold).setOnClickListener(this);
 
-        itemView.findViewById(R.id.rt_kefu).setOnClickListener(this);
-        itemView.findViewById(R.id.rt_setting).setOnClickListener(this);
-        itemView.findViewById(R.id.lt_noble).setOnClickListener(this);
-        itemView.findViewById(R.id.lt_name).setOnClickListener(this);
-        itemView.findViewById(R.id.signature).setOnClickListener(this);
 
-        btnCopy.setOnClickListener(new View.OnClickListener() {
+        ViewClicksAntiShake.clicksAntiShake(itemView.findViewById(R.id.lt_star_coin), new ViewClicksAntiShake.ViewClicksCallBack() {
             @Override
-            public void onClick(View v) {
+            public void onViewClicks() {
+                onClick(itemView.findViewById(R.id.lt_star_coin));
+            }
+        });
+        ViewClicksAntiShake.clicksAntiShake(itemView.findViewById(R.id.btn_coin), new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                onClick(itemView.findViewById(R.id.btn_coin));
+            }
+        });
+        ViewClicksAntiShake.clicksAntiShake(itemView.findViewById(R.id.btn_gold), new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                onClick(itemView.findViewById(R.id.btn_gold));
+            }
+        });
+        ViewClicksAntiShake.clicksAntiShake(itemView.findViewById(R.id.rt_kefu), new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                onClick(itemView.findViewById(R.id.rt_kefu));
+            }
+        });
+        ViewClicksAntiShake.clicksAntiShake(itemView.findViewById(R.id.rt_setting), new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                onClick(itemView.findViewById(R.id.rt_setting));
+            }
+        });
+        ViewClicksAntiShake.clicksAntiShake(itemView.findViewById(R.id.lt_noble), new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                onClick(itemView.findViewById(R.id.lt_noble));
+            }
+        });
+        ViewClicksAntiShake.clicksAntiShake(itemView.findViewById(R.id.lt_name), new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                onClick(itemView.findViewById(R.id.lt_name));
+            }
+        });
+        ViewClicksAntiShake.clicksAntiShake(itemView.findViewById(R.id.signature), new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                onClick(itemView.findViewById(R.id.signature));
+            }
+        });
+
+        ViewClicksAntiShake.clicksAntiShake(btnCopy, new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
                 ClipboardManager cm = (ClipboardManager) mContext.getSystemService(Context.CLIPBOARD_SERVICE);
                 cm.setText(mID.getText() + "");
                 Toast.makeText(mContext, R.string.copy_success, Toast.LENGTH_SHORT).show();

OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/ChatMessageFragment.java

@@ -890,7 +890,6 @@ public class ChatMessageFragment extends AbsConversationFragment {
             giftPanel.updateMoney(event.getMoney());
         }
     }
-
     @Subscribe
     public void event(MessageMsgBusEvent event) {
         if (event.getType() == MessageMsgBusEvent.TYPE_UPDATE_POINT) {
@@ -902,6 +901,8 @@ public class ChatMessageFragment extends AbsConversationFragment {
                 numLayout.setVisibility(View.VISIBLE);
             }
             num.setText(event.getNum() + "");
+        }else if(event.getType()==MessageMsgBusEvent.TYPE_UPDATE_STAR){
+            giftPanel.updateMoney(event.getContent());
         }
     }
 }

OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/MsgFriendFragment.java

@@ -34,6 +34,8 @@ import com.yunbao.common.utils.ToastUtil;
 import org.greenrobot.eventbus.Subscribe;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 import io.rong.common.RLog;
@@ -162,6 +164,7 @@ public class MsgFriendFragment extends BaseFragment implements BaseAdapter.OnIte
                         }
                         itemBeans = data;
                         if (data.isEmpty()) {
+                            Collections.sort(list,new ChatListComparator());
                             mAdapter.setDataCollection(list);
                             mAdapter.notifyDataSetChanged();
                             mRefreshLayout.finishRefresh();
@@ -208,6 +211,7 @@ public class MsgFriendFragment extends BaseFragment implements BaseAdapter.OnIte
                         list.add(new SingleConversation(mContext, conversation));
                     }
                     if (over) {
+                        Collections.sort(list,new ChatListComparator());
                         mAdapter.setDataCollection(list);
                         mAdapter.notifyDataSetChanged();
                         mRefreshLayout.finishRefresh();
@@ -225,6 +229,14 @@ public class MsgFriendFragment extends BaseFragment implements BaseAdapter.OnIte
 
     }
 
+    private class ChatListComparator implements Comparator<BaseUiConversation> {
+
+        @Override
+        public int compare(BaseUiConversation singleConversation, BaseUiConversation t1) {
+            return (int) (singleConversation.mCore.getSentTime()-t1.mCore.getSentTime());
+        }
+    }
+
     private SingleConversation setTopData(String title, String content, long time, String avatar, int num, int id, int sex, String exp) {
         if (StringUtil.isEmpty(content)) {
             content = "";

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

@@ -121,7 +121,7 @@ public class HomeHotListAdapter extends RecyclerView.Adapter<HomeHotListAdapter.
                     UserManager.toHomePage(bean.getId());
                 }
             });
-            ViewClicksAntiShake.clicksAntiShake(itemView, new ViewClicksAntiShake.ViewClicksCallBack() {
+            ViewClicksAntiShake.clicksAntiShake(chat, new ViewClicksAntiShake.ViewClicksCallBack() {
                 @Override
                 public void onViewClicks() {
                     if (bean.getIs_accost() == 0) {

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

@@ -110,10 +110,9 @@ public class HomeRankListAdapter extends RecyclerView.Adapter<HomeRankListAdapte
             } 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.setVisibility(View.INVISIBLE);
             }
             follow.setText(R.string.layout_home_ranking_tips1);
             follow.setTag(bean.getUid());

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

@@ -1,5 +1,6 @@
 package com.shayu.onetoone.bean;
 
+import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.bean.BaseModel;
 
 import java.util.List;
@@ -261,6 +262,9 @@ public class HomeItemBean extends BaseModel {
     }
 
     public String getAvatar() {
+        if (!avatar.startsWith("http")) {
+            avatar = CommonAppConfig.HOST+"/" + avatar;
+        }
         return avatar;
     }
 

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

@@ -1,6 +1,7 @@
 package com.shayu.onetoone.bean;
 
 import com.google.gson.annotations.SerializedName;
+import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.bean.BaseModel;
 
 public class HomeRankBean extends BaseModel {
@@ -130,6 +131,9 @@ public class HomeRankBean extends BaseModel {
     }
 
     public String getAvatar() {
+        if (!avatar.startsWith("http")) {
+            avatar = CommonAppConfig.HOST+"/" + avatar;
+        }
         return avatar;
     }
 

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

@@ -1,5 +1,7 @@
 package com.shayu.onetoone.bean;
 
+import com.yunbao.common.CommonAppConfig;
+
 public class TargetUserInfoBean {
     private String user_nicename;
     private String avatar;
@@ -20,6 +22,9 @@ public class TargetUserInfoBean {
     }
 
     public String getAvatar() {
+        if (!avatar.startsWith("http")) {
+            avatar = CommonAppConfig.HOST+"/" + avatar;
+        }
         return avatar;
     }
 

OneToOne/src/main/java/com/shayu/onetoone/dialog/MsgMoreDialog.java

@@ -14,11 +14,12 @@ import com.shayu.onetoone.utils.UserManager;
 import com.yunbao.common.bean.IMLoginModel;
 import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.utils.Bus;
+import com.yunbao.common.views.weight.ViewClicksAntiShake;
 
 /**
  * 消息右上角更多菜单
  */
-public class MsgMoreDialog extends AttachPopupView implements View.OnClickListener {
+public class MsgMoreDialog extends AttachPopupView{
     View config, read;
 
     public MsgMoreDialog(@NonNull Context context) {
@@ -35,22 +36,24 @@ public class MsgMoreDialog extends AttachPopupView implements View.OnClickListen
         super.onCreate();
         config = findViewById(R.id.ll_config);
         read = findViewById(R.id.ll_read);
-        config.setOnClickListener(this);
+        ViewClicksAntiShake.clicksAntiShake(config, new ViewClicksAntiShake.ViewClicksCallBack() {
-        read.setOnClickListener(this);
+            @Override
+            public void onViewClicks() {
+                RouteManager.forwardMsgMoreConfigActivity();
+                dismiss();
+            }
+        });
+        ViewClicksAntiShake.clicksAntiShake(read, new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                Bus.get().post(new MessageMsgBusEvent(MessageMsgBusEvent.TYPE_ALL_READ));
+                dismiss();
+            }
+        });
         UserBean bean = UserManager.getUserBean();
         if (bean.getInfo().getSage_auth()!=2) {
           //  config.setVisibility(GONE);
         }
     }
 
-    @Override
-    public void onClick(View v) {
-        int id = v.getId();
-        if (id == R.id.ll_config) {
-            RouteManager.forwardMsgMoreConfigActivity();
-        } else if (id == R.id.ll_read) {
-            Bus.get().post(new MessageMsgBusEvent(MessageMsgBusEvent.TYPE_ALL_READ));
-        }
-        dismiss();
-    }
 }

OneToOne/src/main/java/com/shayu/onetoone/view/MsgInputPanelForGift.java

@@ -17,6 +17,7 @@ import com.shayu.onetoone.bean.MessageChatGiftContent;
 import com.shayu.onetoone.bean.PurseBean;
 import com.shayu.onetoone.bean.SendConsumeBean;
 import com.shayu.onetoone.dialog.TipsDialog;
+import com.shayu.onetoone.event.MessageMsgBusEvent;
 import com.shayu.onetoone.event.MoneyUpdateEvent;
 import com.shayu.onetoone.listener.OnDialogClickListener;
 import com.shayu.onetoone.listener.OnSendMessageListener;
@@ -37,6 +38,7 @@ import com.yunbao.common.utils.WordUtil;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
 
 import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -63,6 +65,12 @@ public class MsgInputPanelForGift extends AbsInputPanel {
 
     @Override
     public int show() {
+        UserManager.getMoney(mContext, targetId, new OnItemClickListener<String>() {
+            @Override
+            public void onItemClick(String bean, int position) {
+                money.setText(bean);
+            }
+        });
         return super.show();
     }
 
@@ -181,5 +189,4 @@ public class MsgInputPanelForGift extends AbsInputPanel {
         });
     }
 
-
 }

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

@@ -69,8 +69,8 @@
 
     <LinearLayout
         android:id="@+id/linearLayout3"
-        android:layout_width="48dp"
+        android:layout_width="38dp"
-        android:layout_height="15dp"
+        android:layout_height="13dp"
         android:background="@mipmap/bg_home_hot_live"
         android:gravity="center"
         android:orientation="horizontal"
@@ -81,21 +81,21 @@
             android:id="@+id/ic_level"
             android:layout_width="10dp"
             android:layout_height="12dp"
-            android:layout_marginStart="5dp"
+            android:layout_marginStart="2dp"
             app:srcCompat="@mipmap/icon_level" />
 
         <TextView
             android:id="@+id/level"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="2dp"
+            android:layout_marginStart="1dp"
             android:text="LV.21"
             android:textColor="#FFF"
-            android:textSize="10sp" />
+            android:textSize="8sp" />
     </LinearLayout>
 
     <LinearLayout
-        android:layout_width="35dp"
+        android:layout_width="30dp"
         android:layout_height="15dp"
         android:layout_marginStart="4dp"
         android:background="@drawable/bg_home_hot_sex"
@@ -110,7 +110,7 @@
             android:id="@+id/sex"
             android:layout_width="10dp"
             android:layout_height="12dp"
-            android:layout_marginStart="5dp"
+            android:layout_marginStart="2dp"
             app:srcCompat="@mipmap/ic_home_hot_woman" />
 
         <TextView
@@ -120,6 +120,6 @@
             android:gravity="center_horizontal"
             android:text="21"
             android:textColor="#FFF"
-            android:textSize="10sp" />
+            android:textSize="8sp" />
     </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_marginBottom="13dp">
-    android:layout_marginBottom="13dp"
-    xmlns:tools="http://schemas.android.com/tools">
 
     <com.makeramen.roundedimageview.RoundedImageView
         android:id="@+id/avatar"
@@ -18,6 +18,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:riv_oval="true" />
+
     <ImageView
         android:id="@+id/sex"
         android:layout_width="16dp"
@@ -28,11 +29,14 @@
 
     <TextView
         android:id="@+id/uname"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="7dp"
         android:layout_marginTop="6dp"
+        android:ellipsize="end"
+        android:singleLine="true"
         android:text="TextView"
+        app:layout_constraintEnd_toStartOf="@+id/submit"
         app:layout_constraintStart_toEndOf="@+id/avatar"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -57,9 +61,9 @@
         android:layout_width="65dp"
         android:layout_height="30dp"
         android:layout_gravity="center|bottom"
-        android:enabled="false"
         android:layout_marginEnd="16dp"
         android:background="@drawable/bg_my_follow_btn"
+        android:enabled="false"
         android:text="@string/layout_choose_label_tip4"
         android:textColor="@color/white"
         app:layout_constraintBottom_toBottomOf="parent"

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

@@ -7,8 +7,9 @@
 
     <ImageView
         android:id="@+id/btn_back"
-        android:layout_width="15dp"
+        android:layout_width="25dp"
-        android:layout_height="18dp"
+        android:layout_height="25dp"
+        android:scaleType="center"
         android:layout_margin="16dp"
         android:layout_marginStart="25dp"
         android:layout_marginTop="25dp"
@@ -43,6 +44,7 @@
         android:layout_width="16dp"
         android:layout_height="16dp"
         android:background="@drawable/bg_message_msg_bar_read_num"
+        app:layout_constraintBottom_toBottomOf="@+id/btn_back"
         app:layout_constraintStart_toEndOf="@+id/btn_back"
         app:layout_constraintTop_toTopOf="@+id/btn_back">
 
@@ -51,13 +53,13 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
-            tools:text="99"
             android:textColor="#555555"
             android:textSize="10sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="99" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 

common/src/main/java/com/yunbao/common/bean/IMLoginModel.java

@@ -3,6 +3,7 @@ package com.yunbao.common.bean;
 import android.text.TextUtils;
 
 import com.google.gson.annotations.SerializedName;
+import com.yunbao.common.CommonAppConfig;
 
 import java.util.List;
 
@@ -467,6 +468,9 @@ public class IMLoginModel extends BaseModel {
     }
 
     public String getAvatar() {
+        if (!avatar.startsWith("http")) {
+            avatar = CommonAppConfig.HOST+"/" + avatar;
+        }
         return avatar;
     }