feat:完成消息页UI改版（删除部分无用代码）

app/src/main/java/com/chwl/app/MainActivity.java

@@ -159,7 +159,6 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
 
     {
         fragmentArray.put(MainTabType.TAB_TYPE_HOME, new HomeFragment());
-//        fragmentArray.put(MainTabType.TAB_TYPE_SQUARE, new SquareFragment());
         fragmentArray.put(MainTabType.TAB_TYPE_MSG, new ContactsListFragment());
         fragmentArray.put(MainTabType.TAB_TYPE_ME, new MeFragment());
     }
@@ -194,12 +193,6 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
             AVRoomActivity.start(context, Long.parseLong(linkedInfo.getRoomUid()));
         } else if (!TextUtils.isEmpty(linkedInfo.getUrl()) && linkedInfo.getType().equals("3")) {
             CommonWebViewActivity.start(context, UriProvider.getLinkUrl(linkedInfo.getUrl()));
-//        } else if (!TextUtils.isEmpty(linkedInfo.getWorldId()) && linkedInfo.getType().equals("5")) {
-//            MiniWorldGuestPageActivity.start(context, linkedInfo.getWorldId());
-//        } else if (linkedInfo.getType().equals("6") && !TextUtils.isEmpty(linkedInfo.getWorldId()) &&
-//                !TextUtils.isEmpty(linkedInfo.getDynamicId())) {
-//            DynamicDetailActivity.start(context, JavaUtil.str2long(linkedInfo.getDynamicId()),
-//                    JavaUtil.str2long(linkedInfo.getWorldId()), 6);
         } else if (linkedInfo.getType().equals("7") && !TextUtils.isEmpty(linkedInfo.getUid())) {
             NimP2PMessageActivity.start(context, linkedInfo.getUid());
         } else {
@@ -316,34 +309,9 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
         UserInfo userInfo = UserModel.get().getCacheLoginUserInfo();
         if (userInfo != null) {
             handleLinkedJump(this);
-//            if (userInfo.isShowLimitCharge() &&
-//                    PmDialogShowMrg.get().isHasShow() &&
-//                    DemoCache.readNewUserChargeGift() == 1) {
-//                StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_NUGIFT_POP_SHOW, getString(R.string.enjoy_the_popup_exposure));
-//                NewUserChargeGiftDialog.start(context);
-//                DemoCache.saveNewUserChargeGift(2);
-//            }
-//            checkShowAnchorCardView();
         }
     }
 
-//    private void checkShowAnchorCardView() {
-//        if (touchRunnable != null || !mResumed || AvRoomDataManager.get().mCurrentRoomInfo != null)
-//            return;
-//        int anchorCardViewType = DemoCache.readAnchorCardView();
-//        if (anchorCardViewType == 2) {
-//            if (CurrentTimeUtils.getCurrentTime() - DemoCache.readAnchorCardViewTime() > 15 * 60 * 1000) {
-//                touchRunnable = () -> {
-//                    touchRunnable = null;
-//                    homeViewModel.requestAnchorInfo();
-//                };
-//                mMainTabLayout.postDelayed(touchRunnable, 5000);
-//            }
-//        } else if (anchorCardViewType == 1 || DemoCache.readLaunchCount() == 1) {
-//            homeViewModel.requestAnchorInfo();
-//        }
-//    }
-
     @Override
     protected void onPause() {
         super.onPause();

app/src/main/java/com/chwl/app/application/App.java

@@ -66,9 +66,7 @@ import com.chwl.core.interceptor.TimeSyncInterceptor;
 import com.chwl.core.manager.IMMessageManager;
 import com.chwl.core.manager.IMSystemMsgManager;
 import com.chwl.core.market_verify.MarketVerifyModel;
-import com.chwl.core.mentoring_relationship.model.MentoringRelationshipModel;
 import com.chwl.core.pay.PayModel;
-import com.chwl.core.public_chat_hall.model.PublicChatHallModel;
 import com.chwl.core.radish.RadishModel;
 import com.chwl.core.radish.signin.bean.ImNotice;
 import com.chwl.core.room.face.DynamicFaceModel;
@@ -480,11 +478,8 @@ public class App extends BaseApp {
         ChannelModel.get();
         MarketVerifyModel.get();
         GiftModel.get();
-        PublicChatHallModel.get();
         // 模厅
         HallDataManager.get().application();
-        // 师徒
-        MentoringRelationshipModel.get();
         //全局处理
         GlobalHandleManager.get().init();
 

app/src/main/java/com/chwl/app/avroom/ButtonItemFactory.java

@@ -26,7 +26,6 @@ import com.chwl.core.initial.bean.InitInfo;
 import com.chwl.core.kick.KickModel;
 import com.chwl.core.manager.AvRoomDataManager;
 import com.chwl.core.manager.IMNetEaseManager;
-import com.chwl.core.public_chat_hall.manager.PublicChatHallDataManager;
 import com.chwl.core.room.bean.RoomInfo;
 import com.chwl.core.room.model.AvRoomModel;
 import com.chwl.core.statistic.StatLogKey;

app/src/main/java/com/chwl/app/ui/im/recent/RecentListFragment.java

@@ -3,21 +3,15 @@ package com.chwl.app.ui.im.recent;
 import android.annotation.SuppressLint;
 import android.os.Bundle;
 import android.text.TextUtils;
-import android.util.Log;
-import android.view.View;
-import android.widget.FrameLayout;
 
 import androidx.annotation.Nullable;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 
 import com.google.gson.Gson;
 import com.netease.nim.uikit.business.recent.RecentContactsCallback;
 import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
 import com.netease.nimlib.sdk.msg.model.RecentContact;
-import com.trello.rxlifecycle3.android.FragmentEvent;
 import com.chwl.app.R;
 import com.chwl.app.base.BaseFragment;
 import com.chwl.app.module_hall.im.NimHelper;
@@ -30,8 +24,6 @@ import com.chwl.app.room_chat.activity.NimTeamRoomMessageActivity;
 import com.chwl.core.auth.AuthModel;
 import com.chwl.core.auth.event.LoginEvent;
 import com.chwl.core.im.RefreshInRoomListEvent;
-import com.chwl.core.mentoring_relationship.bean.GrabApprenticesInfo;
-import com.chwl.core.mentoring_relationship.model.MentoringRelationshipModel;
 import com.chwl.core.user.AttentionModel;
 import com.chwl.core.user.bean.AttentionInfo;
 import com.chwl.core.user.bean.AttentionItem;
@@ -100,28 +92,6 @@ public class RecentListFragment extends BaseFragment {
         super.onStart();
     }
 
-    @SuppressLint("CheckResult")
-    private void grabApprentice(GrabApprenticesInfo item) {
-        if (item == null) return;
-        List<GrabApprenticesInfo> grabApprenticesInfoList =
-                MentoringRelationshipModel.get().getGrabApprenticesInfoList();
-        if (grabApprenticesInfoList == null) return;
-        // 删除 item
-        grabApprenticesInfoList.remove(item);
-        // 点击抢徒弟按钮，打点
-        MentoringRelationshipModel.get()
-                .grabApprentices(item.getUid())
-                .compose(bindUntilEvent(FragmentEvent.DESTROY))
-                .subscribe((s, throwable) -> {
-                    if (throwable == null) {
-                        NimP2PMessageActivity.start(getContext(), s);
-                        // 抢徒弟成功，打点
-                    } else {
-                        toast(throwable.getMessage());
-                    }
-                });
-    }
-
     @Override
     public void onSetListener() {
     }

app/src/main/java/com/chwl/app/ui/webview/JSInterface.java

@@ -38,7 +38,6 @@ import com.chwl.core.market_verify.MarketVerifyModel;
 import com.chwl.core.pay.PayModel;
 import com.chwl.core.pay.bean.WalletInfo;
 import com.chwl.core.praise.PraiseModel;
-import com.chwl.core.public_chat_hall.manager.PublicChatHallDataManager;
 import com.chwl.core.room.bean.RoomInfo;
 import com.chwl.core.user.UserModel;
 import com.chwl.core.web.bean.WebJsBeanInfo;

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

@@ -6,17 +6,10 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <!--    <com.chwl.app.ui.widget.RecyclerViewNoViewpagerScroll-->
-    <!--        android:id="@+id/rv_attention_online"-->
-    <!--        android:layout_width="match_parent"-->
-    <!--        android:layout_height="wrap_content"-->
-    <!--        android:visibility="gone"-->
-    <!--        tools:visibility="visible"/>-->
-
     <FrameLayout
-        android:paddingTop="8dp"
         android:id="@+id/recent_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:layout_marginTop="15dp"
         android:background="@drawable/base_shape_ffffff_top_12dp" />
 </LinearLayout>