From 2ce05c2f109d97d1c7a69e166d24d08af938f23b Mon Sep 17 00:00:00 2001 From: huangjian Date: Sat, 28 Nov 2020 18:48:14 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=94=B9=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yizhuan/erban/MainActivity.java | 24 -- .../home/activity/HomeMoreRoomActivity.java | 32 +- .../home/adapter/HomeConcernsAdapter.java | 14 +- .../adapter/MainMagicIndicatorAdapter.java | 18 +- .../erban/home/event/HomeScrollEvent.java | 12 - .../erban/home/fragment/GameHomeFragment.java | 354 ++++++++++-------- .../home/fragment/HomeDynamicFragment.java | 106 +----- .../erban/home/fragment/HomePlayFragment.java | 115 ++---- .../erban/ui/user/UserInfoActivity.java | 4 +- .../drawable-xhdpi/ic_online_user_count.png | Bin 0 -> 1015 bytes .../res/drawable/shape_add_friends_e8f9ff.xml | 10 + .../res/drawable/shape_add_friends_f4f1ff.xml | 10 + .../main/res/layout/fragment_game_home.xml | 277 +++++++------- .../main/res/layout/item_home_concerns.xml | 33 +- app/src/main/res/layout/item_home_play.xml | 184 +++++---- app/src/main/res/layout/layout_ktv_empty.xml | 2 +- .../res/layout/fragment_home_dynamic.xml | 9 +- .../home/event/HomeDynamicEvent.java | 17 - .../home/model/GameHomeModel.java | 28 +- 19 files changed, 543 insertions(+), 706 deletions(-) delete mode 100644 app/src/main/java/com/yizhuan/erban/home/event/HomeScrollEvent.java create mode 100644 app/src/main/res/drawable-xhdpi/ic_online_user_count.png create mode 100644 app/src/main/res/drawable/shape_add_friends_e8f9ff.xml create mode 100644 app/src/main/res/drawable/shape_add_friends_f4f1ff.xml delete mode 100644 core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/event/HomeDynamicEvent.java diff --git a/app/src/main/java/com/yizhuan/erban/MainActivity.java b/app/src/main/java/com/yizhuan/erban/MainActivity.java index 1f4e6083a..8fdb5bcd6 100644 --- a/app/src/main/java/com/yizhuan/erban/MainActivity.java +++ b/app/src/main/java/com/yizhuan/erban/MainActivity.java @@ -15,7 +15,6 @@ import android.util.Log; import android.util.LongSparseArray; import android.view.GestureDetector; import android.view.KeyEvent; -import android.view.MotionEvent; import android.view.View; import android.view.animation.LinearInterpolator; import android.widget.LinearLayout; @@ -25,11 +24,9 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; -import com.coorchice.library.utils.LogUtils; import com.microquation.linkedme.android.LinkedME; import com.netease.nim.uikit.api.NimUIKit; import com.netease.nim.uikit.api.model.contact.ContactEventListener; -import com.netease.nim.uikit.api.model.main.CustomPushContentProvider; import com.netease.nim.uikit.api.model.session.SessionCustomization; import com.netease.nim.uikit.api.model.session.SessionEventListener; import com.netease.nim.uikit.business.session.actions.BaseAction; @@ -49,9 +46,7 @@ import com.netease.nimlib.sdk.team.model.Team; import com.netease.nimlib.sdk.uinfo.model.NimUserInfo; import com.orhanobut.logger.Logger; import com.qiyukf.unicorn.api.Unicorn; - import com.tencent.bugly.crashreport.CrashReport; -import com.tongdaxing.erban.upgrade.AppUpgradeHelper; import com.trello.rxlifecycle3.android.ActivityEvent; import com.yizhuan.erban.application.ActivityStackManager; import com.yizhuan.erban.avroom.activity.AVRoomActivity; @@ -69,7 +64,6 @@ import com.yizhuan.erban.decoration.view.widgets.ShowCarGuideDialog; import com.yizhuan.erban.family.view.activity.FamilyHomeActivity; import com.yizhuan.erban.guide.GuideActivity; import com.yizhuan.erban.home.dialog.RecommendRoomForNewerDialog; -import com.yizhuan.erban.home.fragment.CommunityNoticeAct; import com.yizhuan.erban.home.fragment.ContactsListFragment; import com.yizhuan.erban.home.fragment.GameHomeFragment; import com.yizhuan.erban.home.fragment.MeFragment; @@ -130,7 +124,6 @@ import com.yizhuan.xchat_android_core.community.event.SquareTaskEvent; import com.yizhuan.xchat_android_core.community.event.UnReadCountEvent; import com.yizhuan.xchat_android_core.community.im.WorldDynamicAttachment; import com.yizhuan.xchat_android_core.customer_server.event.CustomerServerMsgEvent; -import com.yizhuan.xchat_android_core.home.event.HomeDynamicEvent; import com.yizhuan.xchat_android_core.home.model.HomeModel; import com.yizhuan.xchat_android_core.im.custom.bean.AssistantAttachment; import com.yizhuan.xchat_android_core.im.custom.bean.CarAttachment; @@ -151,7 +144,6 @@ import com.yizhuan.xchat_android_core.im.custom.bean.OpenRoomNotiAttachment; import com.yizhuan.xchat_android_core.im.custom.bean.OpenSignInAttachment; import com.yizhuan.xchat_android_core.im.custom.bean.RedPackageAttachment; import com.yizhuan.xchat_android_core.im.custom.bean.RedPacketAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomInviteFansAttachment; import com.yizhuan.xchat_android_core.im.custom.bean.SysMsgAttachment; import com.yizhuan.xchat_android_core.im.custom.bean.SysMsgV2Attachment; import com.yizhuan.xchat_android_core.level.event.CharmLevelUpEvent; @@ -175,7 +167,6 @@ import com.yizhuan.xchat_android_core.recall.bean.CheckLostUserInfo; import com.yizhuan.xchat_android_core.recall.event.CheckLostUserEvent; import com.yizhuan.xchat_android_core.redPacket.bean.RedPacketInfoV2; import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.giftvalue.helper.GiftValueMrg; import com.yizhuan.xchat_android_core.statistic.StatisticManager; import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_core.user.UserModel; @@ -191,7 +182,6 @@ import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; import com.yizhuan.xchat_android_library.threadmgr.ThreadPoolManager; import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil; import com.yizhuan.xchat_android_library.utils.JavaUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; import com.yizhuan.xchat_android_library.utils.codec.DESUtils; import com.yizhuan.xchat_android_library.utils.pref.CommonPref; @@ -202,7 +192,6 @@ import org.greenrobot.eventbus.ThreadMode; import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.concurrent.TimeUnit; import io.reactivex.Single; @@ -516,7 +505,6 @@ public class MainActivity extends BaseMvpActivity if (avatarLayout.getVisibility() == View.VISIBLE) { userLivingView.start(); } - EventBus.getDefault().post(new HomeDynamicEvent(false)); } @Override @@ -525,7 +513,6 @@ public class MainActivity extends BaseMvpActivity if (avatarLayout.getVisibility() == View.VISIBLE) { userLivingView.stop(); } - EventBus.getDefault().post(new HomeDynamicEvent(true)); } private void initView() { @@ -627,7 +614,6 @@ public class MainActivity extends BaseMvpActivity limitEnterRoomHelper.release(); } IMBroadcastManager.get().onDestroy(); - EventBus.getDefault().post(new HomeDynamicEvent(true)); } /** @@ -1281,14 +1267,4 @@ public class MainActivity extends BaseMvpActivity } } - - @Override - public boolean dispatchTouchEvent(MotionEvent ev) { - if (ev.getAction() == MotionEvent.ACTION_DOWN) { - EventBus.getDefault().post(new HomeDynamicEvent(true)); - }else if (ev.getAction() == MotionEvent.ACTION_UP) { - EventBus.getDefault().post(new HomeDynamicEvent(false)); - } - return super.dispatchTouchEvent(ev); - } } diff --git a/app/src/main/java/com/yizhuan/erban/home/activity/HomeMoreRoomActivity.java b/app/src/main/java/com/yizhuan/erban/home/activity/HomeMoreRoomActivity.java index 067ed5a35..110c2c542 100644 --- a/app/src/main/java/com/yizhuan/erban/home/activity/HomeMoreRoomActivity.java +++ b/app/src/main/java/com/yizhuan/erban/home/activity/HomeMoreRoomActivity.java @@ -71,7 +71,7 @@ import static com.yizhuan.xchat_android_core.certification.CertificationModel.CE import static com.yizhuan.xchat_android_core.certification.CertificationModel.CER_TYPE_NONE; @CreatePresenter(MainFragmentPresenter.class) -public class HomeMoreRoomActivity extends BaseMvpActivity implements IMainFragmentView,MainMagicIndicatorAdapter.OnItemSelectListener { +public class HomeMoreRoomActivity extends BaseMvpActivity implements IMainFragmentView, MainMagicIndicatorAdapter.OnItemSelectListener { @BindView(R.id.magic_indicator) MagicIndicator magicIndicator; @@ -90,7 +90,7 @@ public class HomeMoreRoomActivity extends BaseMvpActivity list = adapter.getData(); - if (position > 0 && position < list.size()) { - HomeConcernsInfo record = list.get(position); - AVRoomActivity.start(HomeMoreRoomActivity.this, record.getRoomUid()); - } + mFollowRoomsAdapter.setOnItemClickListener((adapter, view, position) -> { + StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_SEARCH_RECENT_ENTER_ROOM, "最近进房记录"); + if (position == 0) { + openRoom(); + return; + } + if (mFollowRoomsAdapter.getItem(position) != null) { + AVRoomActivity.start(HomeMoreRoomActivity.this, mFollowRoomsAdapter.getItem(position).getRoomUid()); } }); rvFollowRoom.setAdapter(mFollowRoomsAdapter); @@ -302,13 +297,13 @@ public class HomeMoreRoomActivity extends BaseMvpActivity mTitleList; private boolean mIsShowIndicator; - public MainMagicIndicatorAdapter(Context context, List charSequences,boolean isShowIndicator) { + public MainMagicIndicatorAdapter(Context context, List charSequences, boolean isShowIndicator) { this.mContext = context; this.mTitleList = charSequences; this.mIsShowIndicator = isShowIndicator; @@ -38,12 +39,12 @@ public class MainMagicIndicatorAdapter extends CommonNavigatorAdapter { @Override public IPagerTitleView getTitleView(Context context, final int i) { ScaleTransitionPagerTitleView scaleTransitionPagerTitleView = new ScaleTransitionPagerTitleView(context, true, 8); - scaleTransitionPagerTitleView.setNormalColor(mIsShowIndicator?ContextCompat.getColor(mContext, R.color.color_white):ContextCompat.getColor(mContext, R.color.color_666666)); - scaleTransitionPagerTitleView.setSelectedColor(mIsShowIndicator?ContextCompat.getColor(mContext, R.color.color_white):ContextCompat.getColor(mContext, R.color.color_333333)); + scaleTransitionPagerTitleView.setNormalColor(ContextCompat.getColor(mContext, R.color.color_666666)); + scaleTransitionPagerTitleView.setSelectedColor(mIsShowIndicator ? ContextCompat.getColor(mContext, R.color.appColor) : ContextCompat.getColor(mContext, R.color.color_333333)); scaleTransitionPagerTitleView.setMinScale(0.8f); - scaleTransitionPagerTitleView.setTextSize(18); + scaleTransitionPagerTitleView.setTextSize(16); int padding = UIUtil.dip2px(context, 5); - scaleTransitionPagerTitleView.setPadding(padding,0,padding,0); + scaleTransitionPagerTitleView.setPadding(padding, 0, padding, 0); // scaleTransitionPagerTitleView.setTextSize(TypedValue.COMPLEX_UNIT_PX, 36); scaleTransitionPagerTitleView.setText(mTitleList.get(i)); scaleTransitionPagerTitleView.setOnClickListener(view -> { @@ -61,16 +62,19 @@ public class MainMagicIndicatorAdapter extends CommonNavigatorAdapter { @Override public IPagerIndicator getIndicator(Context context) { + + if (!mIsShowIndicator) return null; + LinePagerIndicator indicator = new LinePagerIndicator(context); indicator.setMode(LinePagerIndicator.MODE_EXACTLY); indicator.setLineHeight(UIUtil.dip2px(mContext, 5)); indicator.setRoundRadius(UIUtil.dip2px(mContext, 5)); indicator.setLineWidth(UIUtil.dip2px(mContext, 9)); - indicator.setColors(context.getResources().getColor(R.color.white)); + indicator.setColors(context.getResources().getColor(R.color.appColor)); FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT); lp.bottomMargin = UIUtil.dip2px(mContext, 0); indicator.setLayoutParams(lp); - return mIsShowIndicator?indicator:null; + return indicator; } private OnItemSelectListener mOnItemSelectListener; diff --git a/app/src/main/java/com/yizhuan/erban/home/event/HomeScrollEvent.java b/app/src/main/java/com/yizhuan/erban/home/event/HomeScrollEvent.java deleted file mode 100644 index d3eb04354..000000000 --- a/app/src/main/java/com/yizhuan/erban/home/event/HomeScrollEvent.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.yizhuan.erban.home.event; - -import lombok.Data; - -@Data -public class HomeScrollEvent { - private boolean nestScrollEnable; - - public HomeScrollEvent(boolean nestScrollEnable) { - this.nestScrollEnable = nestScrollEnable; - } -} diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java index 6eddc61b6..798bd09e1 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java @@ -1,8 +1,10 @@ package com.yizhuan.erban.home.fragment; +import android.annotation.SuppressLint; import android.app.Activity; import android.graphics.Bitmap; import android.graphics.Color; +import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.graphics.drawable.GradientDrawable; import android.os.Bundle; @@ -19,13 +21,13 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.coordinatorlayout.widget.CoordinatorLayout; import androidx.core.content.ContextCompat; -import androidx.core.widget.NestedScrollView; import androidx.databinding.DataBindingUtil; import androidx.fragment.app.Fragment; import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; -import com.amap.api.location.AMapLocation; import com.amap.api.location.AMapLocationClient; import com.amap.api.location.AMapLocationClientOption; import com.amap.api.location.AMapLocationListener; @@ -48,8 +50,8 @@ import com.yizhuan.erban.databinding.FragmentGameHomeBinding; 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.HomePlayAdapter; import com.yizhuan.erban.home.adapter.MainMagicIndicatorAdapter; -import com.yizhuan.erban.home.event.HomeScrollEvent; import com.yizhuan.erban.home.presenter.MainFragmentPresenter; import com.yizhuan.erban.home.view.IMainFragmentView; import com.yizhuan.erban.location.LocationManager; @@ -67,9 +69,11 @@ import com.yizhuan.xchat_android_core.auth.AuthModel; import com.yizhuan.xchat_android_core.certification.CertificationModel; 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.HomePlayInfo; import com.yizhuan.xchat_android_core.home.bean.HomeTagInfo; import com.yizhuan.xchat_android_core.home.bean.TagListInfo; import com.yizhuan.xchat_android_core.home.event.RefreshHomeDataEvent; +import com.yizhuan.xchat_android_core.home.model.GameHomeModel; import com.yizhuan.xchat_android_core.initial.InitialModel; import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; import com.yizhuan.xchat_android_core.market_verify.MarketVerifyModel; @@ -91,11 +95,20 @@ import com.yizhuan.xchat_android_library.utils.SizeUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; +import org.jetbrains.annotations.NotNull; import java.security.MessageDigest; import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import java.util.concurrent.TimeUnit; + +import io.reactivex.Observable; +import io.reactivex.Observer; +import io.reactivex.android.schedulers.AndroidSchedulers; +import io.reactivex.disposables.Disposable; +import io.reactivex.functions.BiFunction; +import io.reactivex.functions.Consumer; import static com.yizhuan.xchat_android_core.certification.CertificationModel.CER_TYPE_FORCE; import static com.yizhuan.xchat_android_core.certification.CertificationModel.CER_TYPE_GUIDE; @@ -111,29 +124,31 @@ public class GameHomeFragment extends BaseMvpFragment { + long uid = AuthModel.get().getCurrentUid(); + if (aMapLocation != null && aMapLocation.getErrorCode() == 0 && uid != 0L) { + try { + LocationManager.saveUploadTime(); + getMvpPresenter().uploadAddress(AuthModel.get().getCurrentUid(), aMapLocation.getAddress(), Integer.parseInt(aMapLocation.getAdCode()), aMapLocation.getLongitude(), aMapLocation.getLatitude()); + } catch (NumberFormatException e) { + e.printStackTrace(); } } }; - //声明AMapLocationClientOption对象 - private AMapLocationClientOption mLocationOption = null; @NonNull private final List mFragments = new ArrayList<>(); private List mFragmentsBottom; - private volatile boolean isUserLogin; private Handler uiHandler; + private boolean needAutoScroll = true; + + private HomePlayAdapter playAdapter; + + private List homePlayList; + + @Nullable + private Disposable playDisposable; + /** * 动态 @@ -218,7 +233,6 @@ public class GameHomeFragment extends BaseMvpFragment { + mBinding.refreshLayout.setEnabled(i >= 0); }); + mBinding.magicIndicatorBottom.onPageSelected(InitialModel.get().getDefaultHomeTab()); + mBinding.viewPagerBottom.setCurrentItem(InitialModel.get().getDefaultHomeTab()); + mBinding.rvFollowRoom.setVisibility(View.VISIBLE); } - private void initLocation() { //初始化定位 //声明AMapLocationClient类对象 @@ -273,7 +270,8 @@ public class GameHomeFragment extends BaseMvpFragment list) { if (list != null && list.size() > 0) { -// mBinding.rvFollowRoom.setVisibility(View.VISIBLE); + mBinding.rvFollowRoom.setVisibility(View.VISIBLE); mFollowRoomsAdapter.setNewData(list); + if (needAutoScroll) { + needAutoScroll = false; + mBinding.rvFollowRoom.post(() -> { + int distance = mBinding.rvFollowRoom.getHeight(); + CoordinatorLayout.Behavior behavior = ((CoordinatorLayout.LayoutParams) mBinding.appBarLayout.getLayoutParams()).getBehavior(); + if (behavior != null) + behavior.onNestedPreScroll(mBinding.coordinatorLayout, mBinding.appBarLayout, mBinding.rvFollowRoom, 0, distance, new int[]{0, 0}, 0); + }); + } } else { mBinding.rvFollowRoom.setVisibility(View.GONE); } @@ -512,21 +519,16 @@ public class GameHomeFragment extends BaseMvpFragment list = adapter.getData(); - if (position > 0 && position < list.size()) { - HomeConcernsInfo record = list.get(position); - StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_HOME_INTO_FOLLOW_ROOM_CLICK, "首页_进入收藏房间"); - AVRoomActivity.start(mContext, record.getRoomUid()); - } + mFollowRoomsAdapter.setOnItemClickListener((adapter, view, position) -> { + StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_SEARCH_RECENT_ENTER_ROOM, "最近进房记录"); + if (position == 0) { + StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_HOME_INTO_MY_ROOM_CLICK, "首页_进入我的房间"); + openRoom(); + return; + } + if (mFollowRoomsAdapter.getItem(position) != null) { + StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_HOME_INTO_FOLLOW_ROOM_CLICK, "首页_进入收藏房间"); + AVRoomActivity.start(mContext, mFollowRoomsAdapter.getItem(position).getRoomUid()); } }); mBinding.rvFollowRoom.setAdapter(mFollowRoomsAdapter); @@ -536,8 +538,8 @@ public class GameHomeFragment extends BaseMvpFragment getMvpPresenter().getRoomShortcut(),1800); + private void getRoomShortcut() { + uiHandler.postDelayed(() -> getMvpPresenter().getRoomShortcut(), 1800); } @Override @@ -584,7 +586,7 @@ public class GameHomeFragment extends BaseMvpFragment { + if (TuTuGuideHelper.isNeedHiGuide(TuTuGuideHelper.KEY_GUIDE_MAIN_HOME)) { - Activity activity = getActivity(); - if (activity == null) { - return; - } - View rootView = activity.findViewById(android.R.id.content); - if (!(rootView instanceof FrameLayout)) { - return; - } - TuTuGuideHelper.setNoNeedHiGuide(TuTuGuideHelper.KEY_GUIDE_MAIN_HOME); - FrameLayout contentView = (FrameLayout) rootView; - View view = getLayoutInflater().inflate(R.layout.layout_home_guide, contentView, false); - View skipView = view.findViewById(R.id.tv_skip); - View logoIconView = view.findViewById(R.id.iv_logo_icon); - ImageView bgView = view.findViewById(R.id.iv_bg); - GlideApp.with(activity) - .load(R.drawable.ic_guide_home_1) - .apply(RequestOptions.bitmapTransform(new BitmapTransformation() { - - @Override - public void updateDiskCacheKey(MessageDigest messageDigest) { - - } - - @Override - protected Bitmap transform(@NonNull BitmapPool pool, @NonNull Bitmap toTransform, int outWidth, int outHeight) { - Bitmap bitmap; - bitmap = Bitmap.createBitmap(toTransform, 0, 0, outWidth, outHeight); - return bitmap; - } - - })) - .into(bgView); - contentView.addView(view, -1, -1); - skipView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - contentView.removeView(view); - } - }); - - view.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (v.getTag() == null) { - GlideApp.with(activity) - .load(R.drawable.ic_guide_home_2) - .apply(RequestOptions.bitmapTransform(new BitmapTransformation() { - - @Override - public void updateDiskCacheKey(MessageDigest messageDigest) { - - } - - @Override - protected Bitmap transform(@NonNull BitmapPool pool, @NonNull Bitmap toTransform, int outWidth, int outHeight) { - Bitmap bitmap; - bitmap = Bitmap.createBitmap(toTransform, 0, 0, outWidth, outHeight); - return bitmap; - } - - })) - .into(bgView); - - skipView.setVisibility(View.GONE); - logoIconView.setVisibility(View.VISIBLE); - v.setTag(1); - - } else { - contentView.removeView(view); - } - } - }); + Activity activity = getActivity(); + if (activity == null) { + return; } + View rootView = activity.findViewById(android.R.id.content); + if (!(rootView instanceof FrameLayout)) { + return; + } + TuTuGuideHelper.setNoNeedHiGuide(TuTuGuideHelper.KEY_GUIDE_MAIN_HOME); + FrameLayout contentView = (FrameLayout) rootView; + View view = getLayoutInflater().inflate(R.layout.layout_home_guide, contentView, false); + View skipView = view.findViewById(R.id.tv_skip); + View logoIconView = view.findViewById(R.id.iv_logo_icon); + ImageView bgView = view.findViewById(R.id.iv_bg); + GlideApp.with(activity) + .load(R.drawable.ic_guide_home_1) + .apply(RequestOptions.bitmapTransform(new BitmapTransformation() { + + @Override + public void updateDiskCacheKey(MessageDigest messageDigest) { + + } + + @Override + protected Bitmap transform(@NonNull BitmapPool pool, @NonNull Bitmap toTransform, int outWidth, int outHeight) { + Bitmap bitmap; + bitmap = Bitmap.createBitmap(toTransform, 0, 0, outWidth, outHeight); + return bitmap; + } + + })) + .into(bgView); + contentView.addView(view, -1, -1); + skipView.setOnClickListener(v -> contentView.removeView(view)); + + view.setOnClickListener(v -> { + if (v.getTag() == null) { + GlideApp.with(activity) + .load(R.drawable.ic_guide_home_2) + .apply(RequestOptions.bitmapTransform(new BitmapTransformation() { + + @Override + public void updateDiskCacheKey(MessageDigest messageDigest) { + + } + + @Override + protected Bitmap transform(@NonNull BitmapPool pool, @NonNull Bitmap toTransform, int outWidth, int outHeight) { + Bitmap bitmap; + bitmap = Bitmap.createBitmap(toTransform, 0, 0, outWidth, outHeight); + return bitmap; + } + + })) + .into(bgView); + + skipView.setVisibility(View.GONE); + logoIconView.setVisibility(View.VISIBLE); + v.setTag(1); + + } else { + contentView.removeView(view); + } + }); } }, 2000); } - private void setBanner(List bannerList){ + private void setBanner(List bannerList) { //审核中状态,去掉跳转房间banner if (MarketVerifyModel.get().isMarketChecking()) { Iterator iterator = bannerList.iterator(); @@ -845,4 +832,73 @@ public class GameHomeFragment extends BaseMvpFragment mBinding.tvAddFriends.setVisibility(View.GONE)) + .subscribe(homePlayInfos -> { + if (ListUtils.isListEmpty(homePlayInfos)) { + mBinding.tvAddFriends.setVisibility(View.GONE); + } else { + homePlayList = homePlayInfos; + if (homePlayList.size() > 2) { + playAdapter.setNewData(homePlayList.subList(0, 2)); + loopHomePlay(); + } else { + playAdapter.setNewData(homePlayList); + } + } + }); + } + + + private void loopHomePlay() { + if (playDisposable != null) playDisposable.dispose(); + Observable listObservable = Observable.fromIterable(homePlayList.subList(2, homePlayList.size())); + + Observable timerObservable = Observable.interval(3000, TimeUnit.MILLISECONDS); + + Observable.zip(listObservable, timerObservable, (homePlayInfo, aLong) -> homePlayInfo) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@NonNull Disposable d) { + playDisposable = d; + } + + @Override + public void onNext(@NonNull HomePlayInfo homePlayInfo) { + playAdapter.remove(0); + playAdapter.addData(homePlayInfo); + } + + @Override + public void onError(@NonNull Throwable e) { + + } + + @Override + public void onComplete() { + loadHomPlay(); + } + }); + } + } diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/HomeDynamicFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/HomeDynamicFragment.java index f35d72a41..744ebd209 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/HomeDynamicFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/HomeDynamicFragment.java @@ -3,32 +3,29 @@ package com.yizhuan.erban.home.fragment; import android.annotation.SuppressLint; import android.graphics.Rect; import android.os.Bundle; -import android.os.Handler; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; +import com.netease.nim.uikit.common.util.sys.ScreenUtil; import com.yizhuan.erban.R; import com.yizhuan.erban.base.BaseFragment; +import com.yizhuan.erban.common.EmptyViewHelper; import com.yizhuan.erban.home.adapter.HomeDynamicAdapter; -import com.yizhuan.erban.home.event.HomeScrollEvent; import com.yizhuan.xchat_android_core.home.bean.HomeDynamicInfo; -import com.yizhuan.xchat_android_core.home.event.HomeDynamicEvent; import com.yizhuan.xchat_android_core.home.event.RefreshHomeDataEvent; import com.yizhuan.xchat_android_core.home.model.GameHomeModel; -import com.yizhuan.xchat_android_core.initial.InitialModel; import com.yizhuan.xchat_android_core.user.event.LoadLoginUserInfoEvent; import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.SizeUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; +import org.jetbrains.annotations.NotNull; import java.util.ArrayList; import java.util.List; @@ -40,17 +37,13 @@ import butterknife.Unbinder; /** * create by lvzebiao @2020/1/7 */ -public class HomeDynamicFragment extends BaseFragment{ - - public static final String EXTRA_SQUARE_TYPE = "square_type"; +public class HomeDynamicFragment extends BaseFragment { Unbinder unbinder; @BindView(R.id.recycler_view) RecyclerView recyclerView; private HomeDynamicAdapter dynamicAdapter; - private Handler handler = new Handler(); - private Runnable runnable; private final List dynamicList = new ArrayList<>(); public static HomeDynamicFragment newInstance() { @@ -69,31 +62,19 @@ public class HomeDynamicFragment extends BaseFragment{ return mView; } - @Override - public void onFindViews() { - - } - - @Override - public void onSetListener() { - - } - @Override public void initiate() { recyclerView.addItemDecoration(new RecyclerView.ItemDecoration() { @Override - public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) { + public void getItemOffsets(@NotNull Rect outRect, @NotNull View view, @NotNull RecyclerView parent, @NotNull RecyclerView.State state) { super.getItemOffsets(outRect, view, parent, state); - int position = parent.getChildLayoutPosition(view); - int bottom = SizeUtils.dp2px(getContext(), 10); - int top = SizeUtils.dp2px(getContext(), 5); + int bottom = ScreenUtil.dip2px(10); + int top = ScreenUtil.dip2px(5); outRect.set(0, top, 0, bottom); } }); recyclerView.setLayoutManager(new LinearLayoutManager(mContext)); -// recyclerView.setNestedScrollingEnabled(false); dynamicAdapter = new HomeDynamicAdapter(getActivity()); recyclerView.setAdapter(dynamicAdapter); } @@ -104,49 +85,22 @@ public class HomeDynamicFragment extends BaseFragment{ } @SuppressLint("CheckResult") - private void getHomeDynamic(){ + private void getHomeDynamic() { GameHomeModel.get().getHomeDynamic().subscribe((serviceResult, throwable) -> { if (throwable != null) { + dynamicAdapter.setEmptyView(EmptyViewHelper.createEmptyView(getContext(),"暂无数据")); } else { dynamicList.clear(); dynamicList.addAll(serviceResult); if (ListUtils.isListEmpty(dynamicList)) { - showNoData(R.drawable.icon_common_failure, "这里什么都没有"); - }else { - hideStatus(); + dynamicAdapter.setEmptyView(EmptyViewHelper.createEmptyView(getContext(),"暂无数据")); + } else { dynamicAdapter.setNewData(dynamicList); - refreshData(); } } }); } - private void refreshData(){ - int REFRESH_SPEED = InitialModel.get().getDynamicRefresh() > 0?InitialModel.get().getDynamicRefresh()*1000:3000;//默认3秒 - - if (ListUtils.isListEmpty(dynamicList) || runnable != null){ - return; - } - runnable = new Runnable() { - @Override - public void run() { - if (getActivity() != null) { - dynamicAdapter.addData(0,dynamicList.get(dynamicList.size()-1)); - dynamicAdapter.remove(dynamicList.size()-1); - handler.postDelayed(this, REFRESH_SPEED); - } - } - }; - handler.postDelayed(runnable,REFRESH_SPEED); - } - - private List getConvertData(List dynamicList){ - List convertedList = new ArrayList<>(dynamicList); - convertedList.add(convertedList.get(convertedList.size()-1)); - convertedList.remove(convertedList.size()-1); - return convertedList; - } - @Subscribe(threadMode = ThreadMode.MAIN) public void onLoadLoginUserInfoEvent(LoadLoginUserInfoEvent event) { getHomeDynamic(); @@ -157,26 +111,6 @@ public class HomeDynamicFragment extends BaseFragment{ getHomeDynamic(); } - @Subscribe(threadMode = ThreadMode.MAIN) - public void onAutoRunningEvent(HomeDynamicEvent event) { - if (event.isRunning()){ - stopTimer(); - }else { - refreshData(); - } - } - - @Subscribe(threadMode = ThreadMode.MAIN) - public void onHomeScrollEvent(HomeScrollEvent event) { - recyclerView.setNestedScrollingEnabled(event.isNestScrollEnable()); - } - - - @Override - public int getRootLayoutId() { - return 0; - } - @Override public void onDestroyView() { EventBus.getDefault().unregister(this); @@ -184,22 +118,4 @@ public class HomeDynamicFragment extends BaseFragment{ unbinder.unbind(); } - private void stopTimer(){ - handler.removeCallbacks(runnable); - runnable = null; - } - - @Override - public void onDestroy() { - super.onDestroy(); - stopTimer(); - } - - @Override - public void onPause() { - super.onPause(); - stopTimer(); - } - - } diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/HomePlayFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/HomePlayFragment.java index 96efa5dc4..4e4cba3b7 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/HomePlayFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/HomePlayFragment.java @@ -3,32 +3,29 @@ package com.yizhuan.erban.home.fragment; import android.annotation.SuppressLint; import android.graphics.Rect; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import android.os.Handler; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import com.coorchice.library.utils.LogUtils; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.netease.nim.uikit.common.util.sys.ScreenUtil; import com.yizhuan.erban.R; import com.yizhuan.erban.base.BaseFragment; +import com.yizhuan.erban.common.EmptyViewHelper; import com.yizhuan.erban.home.adapter.HomePlayAdapter; -import com.yizhuan.erban.home.event.HomeScrollEvent; import com.yizhuan.xchat_android_core.home.bean.HomePlayInfo; -import com.yizhuan.xchat_android_core.home.event.HomeDynamicEvent; import com.yizhuan.xchat_android_core.home.event.RefreshHomeDataEvent; import com.yizhuan.xchat_android_core.home.model.GameHomeModel; -import com.yizhuan.xchat_android_core.initial.InitialModel; import com.yizhuan.xchat_android_core.user.event.LoadLoginUserInfoEvent; import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.SizeUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; +import org.jetbrains.annotations.NotNull; import java.util.List; @@ -39,17 +36,11 @@ import butterknife.Unbinder; /** * create by lvzebiao @2020/1/7 */ -public class HomePlayFragment extends BaseFragment{ - - public static final String EXTRA_SQUARE_TYPE = "square_type"; +public class HomePlayFragment extends BaseFragment { Unbinder unbinder; @BindView(R.id.recycler_view) RecyclerView recyclerView; -// @BindView(R.id.refresh_layout) -// SwipeRefreshLayout refreshLayout; - private Handler handler = new Handler(); - private Runnable runnable; private List homePlayList; private boolean isLoading = false; @@ -86,17 +77,15 @@ public class HomePlayFragment extends BaseFragment{ recyclerView.addItemDecoration(new RecyclerView.ItemDecoration() { @Override - public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) { + public void getItemOffsets(@NotNull Rect outRect, @NotNull View view, @NotNull RecyclerView parent, @NotNull RecyclerView.State state) { super.getItemOffsets(outRect, view, parent, state); - int position = parent.getChildLayoutPosition(view); - int bottom = SizeUtils.dp2px(getContext(), 10); - int top = SizeUtils.dp2px(getContext(), 5); + int bottom = ScreenUtil.dip2px(10); + int top = ScreenUtil.dip2px(5); outRect.set(0, top, 0, bottom); } }); recyclerView.setLayoutManager(new LinearLayoutManager(mContext)); playAdapter = new HomePlayAdapter(getActivity()); - recyclerView.setAdapter(playAdapter); } @@ -110,54 +99,22 @@ public class HomePlayFragment extends BaseFragment{ } @SuppressLint("CheckResult") - private void getHomPlay(){ - GameHomeModel.get().getHomePlay().subscribe((serviceResult, throwable) -> { - if (throwable != null) { - isLoading = false; - } else { - isLoading = false; - homePlayList = serviceResult; - if (ListUtils.isListEmpty(homePlayList)) { - showNoData(R.drawable.icon_common_failure, "这里什么都没有"); - }else { - hideStatus(); - playAdapter.setNewData(homePlayList); - refreshData(); - } - } - }); - } - - private void refreshData(){ - int REFRESH_SPEED = InitialModel.get().getDynamicRefresh() > 0?InitialModel.get().getDynamicRefresh()*1000:3000;//默认3秒 - - LogUtils.e("REFRESH_SPEED"+REFRESH_SPEED); - if (ListUtils.isListEmpty(homePlayList) || runnable != null){ - return; - } - runnable = new Runnable() { - @Override - public void run() { - if (getActivity() != null) { - if (homePlayList.size() <= 1){ - return; + private void getHomPlay() { + GameHomeModel.get().getHomePlay() + .subscribe((serviceResult, throwable) -> { + if (throwable != null) { + isLoading = false; + playAdapter.setEmptyView(EmptyViewHelper.createEmptyView(getContext(),"暂无数据")); + } else { + isLoading = false; + homePlayList = serviceResult; + if (ListUtils.isListEmpty(homePlayList)) { + playAdapter.setEmptyView(EmptyViewHelper.createEmptyView(getContext(),"暂无数据")); + } else { + playAdapter.setNewData(homePlayList); + } } - playAdapter.addData(0,homePlayList.get(homePlayList.size()-1)); - playAdapter.remove(homePlayList.size()-1); - handler.postDelayed(this, REFRESH_SPEED); - } - } - }; - handler.postDelayed(runnable,REFRESH_SPEED); - } - - @Subscribe(threadMode = ThreadMode.MAIN) - public void onAutoRunningEvent(HomeDynamicEvent event) { - if (event.isRunning()){ - stopTimer(); - }else { - refreshData(); - } + }); } @Override @@ -175,10 +132,6 @@ public class HomePlayFragment extends BaseFragment{ loadData(); } - @Subscribe(threadMode = ThreadMode.MAIN) - public void onHomeScrollEvent(HomeScrollEvent event) { - recyclerView.setNestedScrollingEnabled(event.isNestScrollEnable()); - } @Override public int getRootLayoutId() { @@ -192,20 +145,4 @@ public class HomePlayFragment extends BaseFragment{ unbinder.unbind(); } - private void stopTimer(){ - handler.removeCallbacks(runnable); - runnable = null; - } - - @Override - public void onDestroy() { - super.onDestroy(); - stopTimer(); - } - - @Override - public void onPause() { - super.onPause(); - stopTimer(); - } } diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java b/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java index c64d8016b..e0fd86adb 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java @@ -335,8 +335,8 @@ public class UserInfoActivity extends BaseBindingActivity applyJoinHall(hallInfo.getHallId())); + mBinding.tvNoFamilyApplyHall.setVisibility(View.VISIBLE); + mBinding.tvNoFamilyApplyHall.setOnClickListener(v -> applyJoinHall(hallInfo.getHallId())); } } } else { diff --git a/app/src/main/res/drawable-xhdpi/ic_online_user_count.png b/app/src/main/res/drawable-xhdpi/ic_online_user_count.png new file mode 100644 index 0000000000000000000000000000000000000000..fae49b185f72c45456c3865493327af90c21114b GIT binary patch literal 1015 zcmV^4;1_JI-wD|}lWgjPG%wsN$8%a02d+)9feQ=&G+?n~!|C}@b zGla7==qz!O85~8?4FDb`qFVr52H-*fzXAAxncoBOviJUztU^-3qobo&g%Bp0`Cg#y zL79m5DW%4zr>DP5J3w2oF=i_>zYgF$0H*+WrPTghF8A5g)YR`|V`CRAFE4KD z0M-HclZdukYY(-9w**H~bT<*b1t7=FuMyEs=iJY&Hq%;P!pysf=s^H6GvDvM-`{F} zQ?M~+BQqZr1w{0$wf32`(5?K}T9*OH{8P-l#e4r%v$ajZTI+)VwgPz7Irnf@=qmUt z03HHx$T@dMCUCJ>+@h5FNKPC=xTaF6{L(47R4QFuuh+kph=mXaDwWES#y!?3)>`id z@Faj2opVog3SFgo4}cxayxV)fGYj~A05=oS?bh1E-GYrVw=wg(M0CVjJCFtZBY;cm z^?H78ZtkaU!BXV_Wc{LZu0IR7E>~!Aaq*m5t+p%+q9__yO63+77A9-8THLrvp-{;6 z_xF#75MuBBr2H=w3cY=OeM|D~oLiI9W;tE}&?l-_?yc7PgxDlAZ}#4Q-UyDO=sF@g z2H=EqZiD>qM)8LL23F@-Yi(sOW`5IqUuXmyWA-xhwtvJqlSJuOB0Ahjj@MN6$jHbQ zA%sr>oC{!Y2w_4g^^IINrIeV(0{~7crLLcunfX3Z+*wr{V+NR6RG)E=6W@L#fj5di zNkrRL{JB^xu9t%)&UcfwR(#=%(UEfv4-aq1<#JB}xD&v70Ael&;y8YOc6Rpoe{!xQ zKi5ibl5R8MoD=`eG*)@_U(9@CM_!%4|LsoV*#O4dbtkdOIF6-ni??^zomQkpQFI>> zy_6_F-H)01o!;KwV{Q7ebfw3<_iwigQR)jsYkf6<7XaLq7Hc_F(zm}&o7)zwwZ1&* zt&afcP1{TigqbJu`FyopE{CoZ8)L*Ub|qn!O%4)~yeK|cT3R|@tycdS92`8qr>AEl z5lNMcfow`(A4@-W&VAVm-s(D?zWm9eeMI!Mwf2h?#bk`x&dkpNxDtR=^$zcSwb{B> z;Ku<>iA_4^q@pvAQmM2qj^jPdJP2UgIakUImWe|{Ll@1@&;Od4*f3EZi}`&1K)GC& lZntKnR&}@Fv~~YK@ZWCjzAnodODzBZ002ovPDHLkV1kCs<|Y6D literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/shape_add_friends_e8f9ff.xml b/app/src/main/res/drawable/shape_add_friends_e8f9ff.xml new file mode 100644 index 000000000..f65c32ac9 --- /dev/null +++ b/app/src/main/res/drawable/shape_add_friends_e8f9ff.xml @@ -0,0 +1,10 @@ + + + + + diff --git a/app/src/main/res/drawable/shape_add_friends_f4f1ff.xml b/app/src/main/res/drawable/shape_add_friends_f4f1ff.xml new file mode 100644 index 000000000..eb7fdcc0b --- /dev/null +++ b/app/src/main/res/drawable/shape_add_friends_f4f1ff.xml @@ -0,0 +1,10 @@ + + + + + diff --git a/app/src/main/res/layout/fragment_game_home.xml b/app/src/main/res/layout/fragment_game_home.xml index 4d03bce27..42101d11d 100644 --- a/app/src/main/res/layout/fragment_game_home.xml +++ b/app/src/main/res/layout/fragment_game_home.xml @@ -5,7 +5,8 @@ - + + @@ -15,7 +16,7 @@ type="Boolean" /> - @@ -25,7 +26,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:adjustViewBounds="true" - android:scaleType="fitXY" android:src="@mipmap/bg_home_top" app:layout_constraintTop_toTopOf="parent" /> @@ -58,13 +58,12 @@ android:layout_width="wrap_content" android:layout_height="@dimen/dp_32" android:layout_gravity="center" - android:src="@mipmap/ic_home_ranking" - android:layout_marginEnd="@dimen/dp_15" android:layout_marginStart="@dimen/dp_13" + android:layout_marginEnd="@dimen/dp_15" + android:onClick="@{click}" android:paddingStart="8dp" android:paddingEnd="8dp" - android:onClick="@{click}" - /> + android:src="@mipmap/ic_home_ranking" /> + android:src="@drawable/icon_to_sign_in" + android:visibility="gone" /> + + android:layout_height="match_parent" + android:layout_marginTop="48dp"> - + android:layout_height="match_parent"> - + android:layout_height="wrap_content" + android:background="@color/translucent" + app:elevation="0dp"> - + app:contentScrim="@color/translucent" + app:layout_scrollFlags="scroll|enterAlwaysCollapsed"> - - - - - - - - - - - - - - - + android:layout_height="wrap_content" + android:orientation="vertical"> + + + + + + + + + + + + + + + - + + + + + + + android:background="@color/color_F9F9F9"> + - - - - - - - - - - - - - + - + - + - + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_concerns.xml b/app/src/main/res/layout/item_home_concerns.xml index e862519ce..7f970c0a2 100644 --- a/app/src/main/res/layout/item_home_concerns.xml +++ b/app/src/main/res/layout/item_home_concerns.xml @@ -1,27 +1,26 @@ - + android:layout_height="wrap_content"> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + app:cborder_color="@color/appColor" + app:cborder_width="2dp" + tools:src="@drawable/default_avatar" /> + tools:visibility="visible" /> @@ -44,11 +43,11 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" - android:textSize="@dimen/dp_12" android:textColor="@color/white" - tools:text="小小问问小问问小问问问问" - app:layout_constraintStart_toStartOf="parent" + android:textSize="@dimen/dp_12" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toBottomOf="@id/fl_room_history_avatar_container"/> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/fl_room_history_avatar_container" + tools:text="小小问问小问问小问问问问" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_play.xml b/app/src/main/res/layout/item_home_play.xml index 8da38cefe..edf8c91ed 100644 --- a/app/src/main/res/layout/item_home_play.xml +++ b/app/src/main/res/layout/item_home_play.xml @@ -1,127 +1,117 @@ + android:layout_width="match_parent" + android:layout_height="80dp" + android:layout_marginEnd="@dimen/dp_15" + android:orientation="vertical"> + + + + + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="@id/view_bg" /> + + android:ellipsize="end" + android:lines="1" + android:textColor="@color/color_333333" + android:textSize="13sp" + app:layout_constraintBottom_toTopOf="@id/ll_avatar" + app:layout_constraintStart_toEndOf="@+id/iv_mic_user_one" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_chainStyle="packed" + tools:text="官方交友厅" /> - - + android:layout_marginTop="@dimen/dp_5" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toEndOf="@+id/iv_mic_user_one" + app:layout_constraintTop_toBottomOf="@id/tv_title"> + + android:id="@+id/iv_mic_user_five" + android:layout_width="@dimen/dp_30" + android:layout_height="@dimen/dp_30" + android:layout_marginStart="85dp" + android:src="@drawable/default_avatar" /> + + + + - - - + android:src="@drawable/default_avatar" /> + - + - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/layout_ktv_empty.xml b/app/src/main/res/layout/layout_ktv_empty.xml index 496325cd2..041ab682e 100644 --- a/app/src/main/res/layout/layout_ktv_empty.xml +++ b/app/src/main/res/layout/layout_ktv_empty.xml @@ -2,7 +2,7 @@ diff --git a/app/src/module_community/res/layout/fragment_home_dynamic.xml b/app/src/module_community/res/layout/fragment_home_dynamic.xml index 4ebaade2f..e9654aaf3 100644 --- a/app/src/module_community/res/layout/fragment_home_dynamic.xml +++ b/app/src/module_community/res/layout/fragment_home_dynamic.xml @@ -1,16 +1,13 @@ - + android:layout_height="match_parent"> - + android:background="@color/color_F9F9F9" /> \ No newline at end of file diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/event/HomeDynamicEvent.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/event/HomeDynamicEvent.java deleted file mode 100644 index 584790849..000000000 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/event/HomeDynamicEvent.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.yizhuan.xchat_android_core.home.event; - -public class HomeDynamicEvent { - private boolean isRunning; - - public HomeDynamicEvent(boolean isRunning) { - this.isRunning = isRunning; - } - - public boolean isRunning() { - return isRunning; - } - - public void setRunning(boolean running) { - isRunning = running; - } -} diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/GameHomeModel.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/GameHomeModel.java index 0c68ed80c..c6549dc56 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/GameHomeModel.java +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/GameHomeModel.java @@ -58,16 +58,16 @@ public class GameHomeModel extends BaseModel { .compose(RxHelper.handleSchedulers()); } - public Single> getHomeTabHome(String tabId) { - return api.apiHomeTabHome(tabId,String.valueOf(AuthModel.get().getCurrentUid()), - CommunityConstant.VERSION_VALID_TYPE, - AuthModel.get().getTicket()) - .compose(RxHelper.handleBeanData()) - .compose(RxHelper.handleSchedulers()); - } + public Single> getHomeTabHome(String tabId) { + return api.apiHomeTabHome(tabId, String.valueOf(AuthModel.get().getCurrentUid()), + CommunityConstant.VERSION_VALID_TYPE, + AuthModel.get().getTicket()) + .compose(RxHelper.handleBeanData()) + .compose(RxHelper.handleSchedulers()); + } public Single> getHomeBanner(String type) { - return api.apiHomeBanner(type,String.valueOf(AuthModel.get().getCurrentUid()), + return api.apiHomeBanner(type, String.valueOf(AuthModel.get().getCurrentUid()), CommunityConstant.VERSION_VALID_TYPE, AuthModel.get().getTicket()) .compose(RxHelper.handleBeanData()) @@ -82,7 +82,7 @@ public class GameHomeModel extends BaseModel { .compose(RxHelper.handleSchedulers()); } - public Single getRoomShortcut(){ + public Single getRoomShortcut() { return api.apiRoomShortcut(String.valueOf(AuthModel.get().getCurrentUid()), CommunityConstant.VERSION_VALID_TYPE, AuthModel.get().getTicket()) @@ -100,11 +100,11 @@ public class GameHomeModel extends BaseModel { } - private interface Api { /** * 首页动态 + * * @return - */ @GET("/home/dynamic") @@ -115,6 +115,7 @@ public class GameHomeModel extends BaseModel { /** * 首页交友聊天 + * * @return - */ @GET("/home/play") @@ -126,6 +127,7 @@ public class GameHomeModel extends BaseModel { /** * 首页推荐房间标签 + * * @param uid * @param types * @param ticket @@ -139,6 +141,7 @@ public class GameHomeModel extends BaseModel { /** * 首页更多房间 + * * @param tabId * @param page * @param pageSize @@ -158,6 +161,7 @@ public class GameHomeModel extends BaseModel { /** * 首页推荐房间 + * * @param tabId * @param uid * @param types @@ -173,6 +177,7 @@ public class GameHomeModel extends BaseModel { /** * 首页Banner + * * @param type * @param uid * @param types @@ -188,6 +193,7 @@ public class GameHomeModel extends BaseModel { /** * 首页顶部收藏房间列表 + * * @param uid * @param types * @param ticket @@ -208,6 +214,4 @@ public class GameHomeModel extends BaseModel { } - - }