Merge remote-tracking branch 'origin/develop_new' into develop_new

app/src/main/java/com/yizhuan/erban/MainActivity.java

@@ -856,7 +856,7 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
                 @Override
                 public void accept(UserInfo userInfo) throws Exception {
                     if (userInfo != null) {
-                        displayAvatarLayout(userInfo.getAvatar(), userInfo.getNick(), userInfo.getErbanNo());
+                        displayAvatarLayout(userInfo.getAvatar(), roomInfo.getTitle(), userInfo.getErbanNo());
                     } else {
                         NimUserInfo nimUserInfo = NimUserInfoCache.getInstance().getUserInfo(roomInfo.getUid() + "");
                         if (nimUserInfo == null) {
@@ -864,12 +864,12 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
                                 @Override
                                 public void onResult(int i, NimUserInfo nimUserInfo, Throwable throwable) {
                                     if (nimUserInfo != null) {
-                                        displayAvatarLayout(nimUserInfo.getAvatar(), userInfo.getNick(), userInfo.getUid());
+                                        displayAvatarLayout(nimUserInfo.getAvatar(),roomInfo.getTitle(), userInfo.getUid());
                                     }
                                 }
                             });
                         } else {
-                            displayAvatarLayout(nimUserInfo.getAvatar(), userInfo.getNick(), userInfo.getUid());
+                            displayAvatarLayout(nimUserInfo.getAvatar(), roomInfo.getTitle(), userInfo.getUid());
                         }
                     }
                 }

app/src/main/java/com/yizhuan/erban/home/activity/CollectionRoomActivity.java

@@ -14,7 +14,7 @@ import com.yizhuan.erban.R;
 import com.yizhuan.erban.avroom.activity.AVRoomActivity;
 import com.yizhuan.erban.base.BaseActivity;
 import com.yizhuan.erban.home.adapter.CollectionRoomAdapter;
-import com.yizhuan.erban.home.bean.CollectionRoomInfo;
+import com.yizhuan.xchat_android_core.home.bean.CollectionRoomInfo;
 import com.yizhuan.erban.home.model.CollectionRoomModel;
 import com.yizhuan.xchat_android_core.auth.AuthModel;
 import com.yizhuan.xchat_android_library.utils.ListUtils;

app/src/main/java/com/yizhuan/erban/home/activity/HomeMoreRoomActivity.java

@@ -19,17 +19,15 @@ import com.yizhuan.erban.avroom.adapter.RoomContributeListAdapter;
 import com.yizhuan.erban.base.BaseMvpActivity;
 import com.yizhuan.erban.home.adapter.HomeConcernsAdapter;
 import com.yizhuan.erban.home.adapter.MainMagicIndicatorAdapter;
-import com.yizhuan.erban.home.bean.HomeTagInfo;
+import com.yizhuan.xchat_android_core.home.bean.HomeTagInfo;
 import com.yizhuan.erban.home.fragment.HomeTabMapFragment;
 import com.yizhuan.erban.home.presenter.HomeMorePresenter;
 import com.yizhuan.erban.home.presenter.IHomeMoreRoomView;
-import com.yizhuan.erban.ui.search.RoomHistoryAdapter;
 import com.yizhuan.erban.ui.widget.OnPageSelectedListener;
 import com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator;
 import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper;
 import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator;
 import com.yizhuan.erban.ui.widget.recyclerview.decoration.VerticalDecoration;
-import com.yizhuan.xchat_android_core.bean.RoomHistoryInfo;
 import com.yizhuan.xchat_android_core.home.bean.HomeConcernsInfo;
 import com.yizhuan.xchat_android_core.statistic.StatisticManager;
 import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;

app/src/main/java/com/yizhuan/erban/home/adapter/CollectionRoomAdapter.java

@@ -5,7 +5,7 @@ import android.widget.ImageView;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.yizhuan.erban.R;
-import com.yizhuan.erban.home.bean.CollectionRoomInfo;
+import com.yizhuan.xchat_android_core.home.bean.CollectionRoomInfo;
 import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2;
 
 /**

app/src/main/java/com/yizhuan/erban/home/adapter/CommunityNoticeAdapter.java

@@ -33,19 +33,10 @@ public class CommunityNoticeAdapter extends BaseQuickAdapter<CommunityNoticeInfo
         helper.setText(R.id.tv_name_mini_world, "#" + worldName)
                 .setGone(R.id.tv_name_mini_world, !TextUtils.isEmpty(worldName));
         helper.setText(R.id.tv_name_community_notice_list, item.getNick());
-        helper.setText(R.id.tv_age_community_notice_list, String.valueOf(item.getAge()));
 
-        helper.setGone(R.id.tv_age_community_notice_list, false)
-                .setGone(R.id.iv_gender, false);
-        if (item.isShowAge()) {
-            helper.setBackgroundRes(R.id.tv_age_community_notice_list,
-                    item.isMale() ? R.drawable.ic_male_community_notice : R.drawable.ic_female_age_community_notice)
-                    .setGone(R.id.tv_age_community_notice_list, true);
-        } else {
-            helper.setGone(R.id.iv_gender, true)
+        helper.setGone(R.id.iv_gender, true)
                     .setImageResource(R.id.iv_gender, item.isMale() ? R.drawable.ic_gender_male : R.drawable.ic_gender_female);
-        }
-
+        
         helper.setGone(R.id.tv_right_content, false)
                 .setGone(R.id.rriv_right_content, false);
         DynamicMedia dynamicMedia = item.getDynamicRes();

app/src/main/java/com/yizhuan/erban/home/adapter/HomeDynamicAdapter.java

@@ -14,7 +14,7 @@ import com.yizhuan.erban.R;
 import com.yizhuan.erban.avroom.activity.AVRoomActivity;
 import com.yizhuan.erban.community.dynamic.view.DynamicDetailActivity;
 import com.yizhuan.erban.community.widget.DynamicNickDetailWidget;
-import com.yizhuan.erban.home.bean.HomeDynamicInfo;
+import com.yizhuan.xchat_android_core.home.bean.HomeDynamicInfo;
 import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2;
 import com.yizhuan.xchat_android_core.community.dynamic.DynamicModel;
 import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver;

app/src/main/java/com/yizhuan/erban/home/adapter/HomePlayAdapter.java

@@ -2,27 +2,16 @@ package com.yizhuan.erban.home.adapter;
 
 
 import android.content.Context;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.netease.nim.uikit.common.util.log.LogUtil;
 import com.netease.nim.uikit.support.glide.GlideApp;
 import com.yizhuan.erban.R;
 import com.yizhuan.erban.avroom.activity.AVRoomActivity;
 import com.yizhuan.erban.common.widget.CircleImageView;
-import com.yizhuan.erban.community.dynamic.view.DynamicDetailActivity;
-import com.yizhuan.erban.community.widget.DynamicNickDetailWidget;
-import com.yizhuan.erban.home.bean.HomePlayInfo;
+import com.yizhuan.xchat_android_core.home.bean.HomePlayInfo;
 import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2;
-import com.yizhuan.xchat_android_core.community.dynamic.DynamicModel;
 import com.yizhuan.xchat_android_core.utils.TextUtils;
-import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver;
-import com.yizhuan.xchat_android_core.utils.net.RxHelper;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
 
 /**
  * create by lvzebiao @2019/11/13

app/src/main/java/com/yizhuan/erban/home/adapter/HomeRoomFragmentAdapter.java

@@ -2,7 +2,6 @@ package com.yizhuan.erban.home.adapter;
 
 import android.content.Context;
 import android.graphics.Color;
-import android.graphics.drawable.Drawable;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
@@ -10,10 +9,9 @@ import android.widget.ImageView;
 import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.netease.nim.uikit.support.glide.GlideApp;
-import com.netease.nim.uikit.support.glide.GlideRequest;
 import com.yizhuan.erban.R;
 import com.yizhuan.erban.avroom.activity.AVRoomActivity;
-import com.yizhuan.erban.home.bean.HomeTabMapInfo;
+import com.yizhuan.xchat_android_core.home.bean.HomeTabMapInfo;
 import com.yizhuan.erban.ui.utils.ImageLoadUtils;
 import com.yizhuan.erban.ui.widget.LivingIconView;
 

app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java

@@ -13,8 +13,6 @@ import android.text.Spannable;
 import android.text.SpannableStringBuilder;
 import android.text.style.ForegroundColorSpan;
 import android.util.Log;
-import android.view.GestureDetector;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
@@ -25,7 +23,6 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
-import androidx.core.widget.NestedScrollView;
 import androidx.databinding.DataBindingUtil;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -56,7 +53,7 @@ import com.yizhuan.erban.home.activity.HomeMoreRoomActivity;
 import com.yizhuan.erban.home.adapter.BannerAdapter;
 import com.yizhuan.erban.home.adapter.HomeConcernsAdapter;
 import com.yizhuan.erban.home.adapter.MainMagicIndicatorAdapter;
-import com.yizhuan.erban.home.bean.HomeTagInfo;
+import com.yizhuan.xchat_android_core.home.bean.HomeTagInfo;
 import com.yizhuan.erban.home.event.RefreshHomeDataEvent;
 import com.yizhuan.erban.home.presenter.MainFragmentPresenter;
 import com.yizhuan.erban.home.view.IMainFragmentView;
@@ -611,15 +608,20 @@ public class GameHomeFragment extends BaseMvpFragment<IMainFragmentView, MainFra
     @Override
     public void onGetHomeTagSuccess(List<HomeTagInfo> info) {
         boolean changed = false;
+
         List<CharSequence> oldTabInfoList = new ArrayList<>(mTabInfoList);
+
         for (HomeTagInfo tagInfo : info) {
             if (!oldTabInfoList.contains(tagInfo.getName())) {
                 changed = true;
                 break;
             }
         }
+
+
         //只有HomeTagInfo发生改变才刷新数据,否则刷新当前可见的那个Fragment
         if (changed) {
+            LogUtils.e(changed+":oldTabInfoList");
             mTabInfoList.clear();
             mFragments.clear();
             for (int i = 0; i < info.size(); i++) {

app/src/main/java/com/yizhuan/erban/home/fragment/HomeDynamicFragment.java

@@ -15,7 +15,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.yizhuan.erban.R;
 import com.yizhuan.erban.base.BaseFragment;
 import com.yizhuan.erban.home.adapter.HomeDynamicAdapter;
-import com.yizhuan.erban.home.bean.HomeDynamicInfo;
+import com.yizhuan.xchat_android_core.home.bean.HomeDynamicInfo;
 import com.yizhuan.erban.home.event.HomeDynamicEvent;
 import com.yizhuan.erban.home.event.RefreshHomeDataEvent;
 import com.yizhuan.erban.home.model.HomeModel;

app/src/main/java/com/yizhuan/erban/home/fragment/HomePlayFragment.java

@@ -12,7 +12,7 @@ import android.view.ViewGroup;
 import com.yizhuan.erban.R;
 import com.yizhuan.erban.base.BaseFragment;
 import com.yizhuan.erban.home.adapter.HomePlayAdapter;
-import com.yizhuan.erban.home.bean.HomePlayInfo;
+import com.yizhuan.xchat_android_core.home.bean.HomePlayInfo;
 import com.yizhuan.erban.home.event.RefreshHomeDataEvent;
 import com.yizhuan.erban.home.model.HomeModel;
 import com.yizhuan.xchat_android_core.user.event.LoadLoginUserInfoEvent;

app/src/main/java/com/yizhuan/erban/home/fragment/HomeTabHomeFragment.java

@@ -11,12 +11,11 @@ import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.coorchice.library.utils.LogUtils;
 import com.trello.rxlifecycle3.android.FragmentEvent;
 import com.yizhuan.erban.R;
 import com.yizhuan.erban.common.NoDataFragment;
 import com.yizhuan.erban.home.adapter.HomeRoomFragmentAdapter;
-import com.yizhuan.erban.home.bean.HomeTabMapInfo;
+import com.yizhuan.xchat_android_core.home.bean.HomeTabMapInfo;
 import com.yizhuan.erban.home.model.HomeModel;
 import com.yizhuan.xchat_android_core.initial.InitialModel;
 import com.yizhuan.xchat_android_core.utils.net.RxHelper;
@@ -31,7 +30,7 @@ import java.util.Random;
 import java.util.concurrent.CancellationException;
 
 /**
- * 语音排队 没用下拉式的tab
+ *
  */
 public class HomeTabHomeFragment extends LazyLoadFragment {
     public static final int ROWS = 3;

app/src/main/java/com/yizhuan/erban/home/fragment/HomeTabMapFragment.java

@@ -13,7 +13,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.yizhuan.erban.R;
 import com.yizhuan.erban.base.BaseMvpFragment;
 import com.yizhuan.erban.home.adapter.HomeRoomFragmentAdapter;
-import com.yizhuan.erban.home.bean.HomeTabMapInfo;
+import com.yizhuan.xchat_android_core.home.bean.HomeTabMapInfo;
 import com.yizhuan.erban.home.presenter.HomeTabMapPresenter;
 import com.yizhuan.erban.home.presenter.IHomeTabMapView;
 import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;

app/src/main/java/com/yizhuan/erban/home/fragment/MainFragment.java

@@ -18,7 +18,7 @@ import com.yizhuan.erban.base.BaseMvpFragment;
 import com.yizhuan.erban.common.widget.dialog.DialogManager;
 import com.yizhuan.erban.home.adapter.FragmentViewPagerAdapter;
 import com.yizhuan.erban.home.adapter.TopMagicIndicatorAdapter;
-import com.yizhuan.erban.home.bean.HomeTagInfo;
+import com.yizhuan.xchat_android_core.home.bean.HomeTagInfo;
 import com.yizhuan.erban.home.dialog.CreateRoomDialog;
 import com.yizhuan.erban.home.presenter.MainFragmentPresenter;
 import com.yizhuan.erban.home.view.IMainFragmentTabBg;

app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java

@@ -20,8 +20,7 @@ import com.yizhuan.erban.common.widget.dialog.DialogManager;
 import com.yizhuan.erban.databinding.FragmentMeBinding;
 import com.yizhuan.erban.decoration.view.MyDecorationActivity;
 import com.yizhuan.erban.home.activity.CollectionRoomActivity;
-import com.yizhuan.erban.home.bean.HomeTagInfo;
-import com.yizhuan.erban.home.dialog.CreateRoomDialog;
+import com.yizhuan.xchat_android_core.home.bean.HomeTagInfo;
 import com.yizhuan.erban.home.presenter.MainFragmentPresenter;
 import com.yizhuan.erban.home.view.IMainFragmentView;
 import com.yizhuan.erban.module_hall.hall.activity.ModuleHallActivity;
@@ -37,7 +36,6 @@ import com.yizhuan.xchat_android_core.auth.AuthModel;
 import com.yizhuan.xchat_android_core.certification.CertificationModel;
 import com.yizhuan.xchat_android_core.customer_server.CustomerServerModel;
 import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo;
-import com.yizhuan.xchat_android_core.family.bean.HomeBannerInfo;
 import com.yizhuan.xchat_android_core.home.bean.BannerInfo;
 import com.yizhuan.xchat_android_core.home.bean.HomeConcernsInfo;
 import com.yizhuan.xchat_android_core.home.bean.TagListInfo;

app/src/main/java/com/yizhuan/erban/home/model/CollectionRoomModel.java

@@ -1,13 +1,11 @@
 package com.yizhuan.erban.home.model;
 
-import com.yizhuan.erban.home.bean.CollectionRoomInfo;
-import com.yizhuan.erban.ui.praise.Utils;
+import com.yizhuan.xchat_android_core.home.bean.CollectionRoomInfo;
 import com.yizhuan.xchat_android_core.auth.AuthModel;
 import com.yizhuan.xchat_android_core.base.BaseModel;
 import com.yizhuan.xchat_android_core.bean.response.ServiceResult;
 import com.yizhuan.xchat_android_core.utils.net.RxHelper;
 import com.yizhuan.xchat_android_library.net.rxnet.RxNet;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
 
 import io.reactivex.Single;
 import io.reactivex.SingleSource;

app/src/main/java/com/yizhuan/erban/home/model/HomeModel.java

@@ -1,9 +1,9 @@
 package com.yizhuan.erban.home.model;
 
-import com.yizhuan.erban.home.bean.HomeDynamicInfo;
-import com.yizhuan.erban.home.bean.HomePlayInfo;
-import com.yizhuan.erban.home.bean.HomeTabMapInfo;
-import com.yizhuan.erban.home.bean.HomeTagInfo;
+import com.yizhuan.xchat_android_core.home.bean.HomeDynamicInfo;
+import com.yizhuan.xchat_android_core.home.bean.HomePlayInfo;
+import com.yizhuan.xchat_android_core.home.bean.HomeTabMapInfo;
+import com.yizhuan.xchat_android_core.home.bean.HomeTagInfo;
 import com.yizhuan.xchat_android_core.auth.AuthModel;
 import com.yizhuan.xchat_android_core.base.BaseModel;
 import com.yizhuan.xchat_android_core.bean.response.ServiceResult;

app/src/main/java/com/yizhuan/erban/home/model/IHomeModel.java

@@ -1,10 +1,6 @@
 package com.yizhuan.erban.home.model;
 
-import com.yizhuan.erban.home.bean.HomeDynamicInfo;
-import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean;
-import com.yizhuan.xchat_android_core.community.bean.WorldDynamicListResult;
-
-import java.util.List;
+import com.yizhuan.xchat_android_core.home.bean.HomeDynamicInfo;
 
 import io.reactivex.Single;
 

app/src/main/java/com/yizhuan/erban/home/presenter/HomeTabMapPresenter.java

@@ -1,7 +1,7 @@
 package com.yizhuan.erban.home.presenter;
 
 import com.yizhuan.erban.base.BaseMvpPresenter;
-import com.yizhuan.erban.home.bean.HomeTabMapInfo;
+import com.yizhuan.xchat_android_core.home.bean.HomeTabMapInfo;
 import com.yizhuan.erban.home.model.HomeModel;
 import com.yizhuan.xchat_android_core.Constants;
 

app/src/main/java/com/yizhuan/erban/home/presenter/IHomeMoreRoomView.java

@@ -1,6 +1,6 @@
 package com.yizhuan.erban.home.presenter;
 
-import com.yizhuan.erban.home.bean.HomeTagInfo;
+import com.yizhuan.xchat_android_core.home.bean.HomeTagInfo;
 import com.yizhuan.xchat_android_core.home.bean.HomeConcernsInfo;
 import com.yizhuan.xchat_android_library.base.IMvpBaseView;
 

app/src/main/java/com/yizhuan/erban/home/presenter/IHomeTabMapView.java

@@ -1,6 +1,6 @@
 package com.yizhuan.erban.home.presenter;
 
-import com.yizhuan.erban.home.bean.HomeTabMapInfo;
+import com.yizhuan.xchat_android_core.home.bean.HomeTabMapInfo;
 import com.yizhuan.xchat_android_library.base.IMvpBaseView;
 
 import java.util.List;

app/src/main/java/com/yizhuan/erban/home/presenter/MainFragmentPresenter.java

@@ -7,10 +7,9 @@ import android.text.TextUtils;
 
 import com.netease.nim.uikit.common.util.log.LogUtil;
 import com.yizhuan.erban.base.BaseMvpPresenter;
-import com.yizhuan.erban.home.bean.HomeTagInfo;
+import com.yizhuan.xchat_android_core.home.bean.HomeTagInfo;
 import com.yizhuan.erban.home.view.IMainFragmentView;
 import com.yizhuan.xchat_android_core.auth.AuthModel;
-import com.yizhuan.xchat_android_core.family.bean.HomeBannerInfo;
 import com.yizhuan.xchat_android_core.home.bean.BannerInfo;
 import com.yizhuan.xchat_android_core.home.bean.TagListInfo;
 import com.yizhuan.xchat_android_core.home.model.HomeModel;

app/src/main/java/com/yizhuan/erban/home/view/IMainFragmentView.java

@@ -1,12 +1,10 @@
 package com.yizhuan.erban.home.view;
 
-import com.yizhuan.erban.home.bean.HomeTagInfo;
-import com.yizhuan.xchat_android_core.family.bean.HomeBannerInfo;
+import com.yizhuan.xchat_android_core.home.bean.HomeTagInfo;
 import com.yizhuan.xchat_android_core.home.bean.BannerInfo;
 import com.yizhuan.xchat_android_core.home.bean.HomeConcernsInfo;
 import com.yizhuan.xchat_android_core.home.bean.TagListInfo;
 import com.yizhuan.xchat_android_library.base.IMvpBaseView;
-import com.yizhuan.xchat_android_core.home.bean.HomeItem;
 
 import java.util.List;
 

app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderGift.java

@@ -55,9 +55,9 @@ public class MsgViewHolderGift extends MsgViewHolderBase {
                 GiftModel.get().findGiftInfoById(attachment.getGiftReceiveInfo().getGiftId()) : giftInfo;
 
         boolean isSelf = attachment.getGiftReceiveInfo().getUid() == AuthModel.get().getCurrentUid();
-        giftName.setTextColor(isSelf ? ContextCompat.getColor(context, R.color.white) : ContextCompat.getColor(context, R.color.color_333333));
-        number.setTextColor(isSelf ? ContextCompat.getColor(context, R.color.white) : ContextCompat.getColor(context, R.color.color_333333));
-        tvTargetNick.setTextColor(isSelf ? ContextCompat.getColor(context, R.color.white_transparent_80) : ContextCompat.getColor(context, R.color.color_999999));
+        giftName.setTextColor(isSelf ? ContextCompat.getColor(context, R.color.color_333333) : ContextCompat.getColor(context, R.color.color_333333));
+        number.setTextColor(isSelf ? ContextCompat.getColor(context, R.color.color_333333) : ContextCompat.getColor(context, R.color.color_333333));
+        tvTargetNick.setTextColor(isSelf ? ContextCompat.getColor(context, R.color.color_999999) : ContextCompat.getColor(context, R.color.color_999999));
         flGiftImg.setBackgroundResource(isSelf ? R.drawable.bg_msg_gift_img : R.drawable.bg_msg_gift_img_normal);
 
         if (giftInfo != null) {

app/src/main/java/com/yizhuan/erban/ui/user/adapter/GiftAdapter.java

@@ -6,10 +6,8 @@ import android.widget.ImageView;
 import androidx.annotation.Nullable;
 
 import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
-import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.yizhuan.erban.R;
-import com.yizhuan.erban.home.bean.HomeTabMapInfo;
 import com.yizhuan.erban.ui.utils.ImageLoadUtils;
 import com.yizhuan.xchat_android_core.user.bean.UserDetailInfo;
 

app/src/module_community/res/layout/item_community_notice_list.xml

@@ -71,18 +71,7 @@
                 tools:src="@drawable/ic_gender_female"
                 tools:visibility="visible" />
 
-            <TextView
-                android:id="@+id/tv_age_community_notice_list"
-                android:layout_width="30dp"
-                android:layout_height="14dp"
-                android:paddingEnd="5dp"
-                android:layout_marginStart="4dp"
-                android:includeFontPadding="false"
-                tools:background="@drawable/ic_female_age_community_notice"
-                tools:text="19"
-                android:textColor="@color/white"
-                android:gravity="center_vertical|end"
-                android:textSize="10sp"/>
+
 
             <TextView
                 android:id="@+id/tv_label_community_notice_list"

core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java

@@ -46,7 +46,7 @@ public class XChatConstants {
     /**
      * bugly key (RELEASE)
      */
-    public static final String BUGLY_KEY_RELEASE = "d2dec194c0";//已更改
+    public static final String BUGLY_KEY_RELEASE = "0797a01eba";//已更改
 
     /**
      * 云信 key (DEBUG)

core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/CollectionRoomInfo.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.home.bean;
+package com.yizhuan.xchat_android_core.home.bean;
 
 import java.util.List;
 

core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeDynamicInfo.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.home.bean;
+package com.yizhuan.xchat_android_core.home.bean;
 
 import com.yizhuan.xchat_android_core.user.bean.BaseUserInfo;
 

core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeDynamicResult.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.home.bean;
+package com.yizhuan.xchat_android_core.home.bean;
 
 import java.util.List;
 

core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomePlayInfo.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.home.bean;
+package com.yizhuan.xchat_android_core.home.bean;
 
 import java.util.List;
 

core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeTabMapInfo.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.home.bean;
+package com.yizhuan.xchat_android_core.home.bean;
 
 import com.chad.library.adapter.base.entity.MultiItemEntity;
 

core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeTagInfo.java

@@ -1,4 +1,4 @@
-package com.yizhuan.erban.home.bean;
+package com.yizhuan.xchat_android_core.home.bean;
 
 public class HomeTagInfo {