diff --git a/app/src/main/java/com/nnbc123/app/qiyukefu/CustomerServerHelper.java b/app/src/main/java/com/nnbc123/app/qiyukefu/CustomerServerHelper.java index 575f7afd1..984247872 100644 --- a/app/src/main/java/com/nnbc123/app/qiyukefu/CustomerServerHelper.java +++ b/app/src/main/java/com/nnbc123/app/qiyukefu/CustomerServerHelper.java @@ -74,6 +74,11 @@ public class CustomerServerHelper { .setValue(userInfo.isNewUser() ? "是" : "否") .setIndex(4)); + userData.add(new CustomerItemInfo("uid") + .setLabel("uid：") + .setValue("uid:" + userInfo.getUid()) + .setIndex(4)); + ysfUserInfo.data = new Gson().toJson(userData); Unicorn.setUserInfo(ysfUserInfo); @@ -86,15 +91,7 @@ public class CustomerServerHelper { } isInit = true; YSFOptions options = new YSFOptions(); - options.inputPanelOptions = new InputPanelOptions(); - options.inputPanelOptions.showActionPanel = true; - options.inputPanelOptions.actionPanelOptions = new ActionPanelOptions(); options.uiCustomization = new UICustomization(); - if (userInfo != null) { - options.uiCustomization.rightAvatar = userInfo.getAvatar(); - } - options.uiCustomization.titleBarStyle = 0; - options.uiCustomization.leftAvatar = AVATAR_URL; options.uiCustomization.hideKeyboardOnEnterConsult = true; options.uiCustomization.titleCenter = true; diff --git a/app/src/module_community/java/com/nnbc123/app/community/square/SquareFragment.java b/app/src/module_community/java/com/nnbc123/app/community/square/SquareFragment.java index 313eb139d..365b2cb30 100644 --- a/app/src/module_community/java/com/nnbc123/app/community/square/SquareFragment.java +++ b/app/src/module_community/java/com/nnbc123/app/community/square/SquareFragment.java @@ -17,8 +17,11 @@ import android.widget.TextView; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import androidx.viewpager.widget.ViewPager; +import com.chad.library.adapter.base.BaseQuickAdapter; import com.netease.nim.uikit.common.ui.draggablebubbles.BubbleView; import com.netease.nim.uikit.common.util.sys.ScreenUtil; import com.nnbc123.app.R; @@ -30,6 +33,8 @@ import com.nnbc123.app.community.publish.view.PublishActivity; import com.nnbc123.app.home.activity.CommunityNoticeAct; import com.nnbc123.app.home.adapter.MainMagicIndicatorAdapter; import com.nnbc123.app.miniworld.activity.TopicMainActivity; +import com.nnbc123.app.miniworld.adapter.RecommendTopicListAdapter; +import com.nnbc123.app.miniworld.listener.DoubleClickCheckListener; import com.nnbc123.app.ui.utils.ImageLoadKt; import com.nnbc123.app.ui.widget.OnPageSelectedListener; import com.nnbc123.app.ui.widget.magicindicator.MagicIndicator; @@ -87,21 +92,21 @@ public class SquareFragment extends BaseFragment implements MainMagicIndicatorAd MagicIndicator magicIndicator; @BindView(R.id.view_pager) ViewPager viewPager; - Unbinder unbinder; @BindView(R.id.iv_square_publish) DragLayout ivSquarePublish; @BindView(R.id.fl_contact_list) FrameLayout flContactList; @BindView(R.id.msg_number) View tvCommunityUnread; - @BindView(R.id.roll_view) - RollPagerView rollView; + Unbinder unbinder; + private RecommendTopicListAdapter mRecommendTopicAdapter; public static SquareFragment newInstance() { return new SquareFragment(); } + @SuppressLint("CheckResult") @Override public void initiate() { List fragmentPos = new ArrayList<>(); @@ -155,54 +160,12 @@ public class SquareFragment extends BaseFragment implements MainMagicIndicatorAd magicIndicator.setNavigator(commonNavigator); ViewPagerHelper.bind(magicIndicator, viewPager); viewPager.setCurrentItem(TAB_TYPE_RECOMMEND); - initTopic(); - } - - @SuppressLint({"CheckResult", "SetTextI18n"}) - private void initTopic() { - rollView.setHintView(new ColorPointHintView(mContext, Color.WHITE, mContext.getResources().getColor(R.color.color_66FFFFFF)) { - @Override - public Drawable makeFocusDrawable() { - GradientDrawable dotFocus = new GradientDrawable(); - dotFocus.setColor(Color.WHITE); - dotFocus.setCornerRadius(Util.dip2px(getContext(), 2)); - dotFocus.setSize(Util.dip2px(getContext(), 9), Util.dip2px(getContext(), 4)); - return dotFocus; - } - - @Override - public Drawable makeNormalDrawable() { - GradientDrawable dotNormal = new GradientDrawable(); - dotNormal.setColor(mContext.getResources().getColor(R.color.color_66FFFFFF)); - dotNormal.setCornerRadius(Util.dip2px(getContext(), 2)); - dotNormal.setSize(Util.dip2px(getContext(), 4), Util.dip2px(getContext(), 4)); - return dotNormal; - } - }); - + initRecyclerView(); MiniWorldModel.getInstance().getCategoryMiniWorldList("0", 1, 500) .compose(RxHelper.handleSchAndExce()) .compose(bindToLifecycle()) .subscribe((miniWorldInfos, throwable) -> { - if (miniWorldInfos != null) { - rollView.setAdapter(new StaticPagerAdapter() { - @Override - public View getView(ViewGroup container, int position) { - MiniWorldInfo worldInfo = miniWorldInfos.get(position); - View flRoot = LayoutInflater.from(container.getContext()).inflate(R.layout.item_square_topic_banner, container, false); - ImageView imgBanner = flRoot.findViewById(R.id.iv_cover); - ImageLoadKt.load(imgBanner, worldInfo.getIcon(), 12); - flRoot.setOnClickListener(v -> TopicMainActivity.start(mContext, String.valueOf(worldInfo.getId()))); - return flRoot; - } - - @Override - public int getCount() { - return miniWorldInfos.size(); - } - }); - rollView.setPlayDelay(5000); - } + mRecommendTopicAdapter.setNewData(miniWorldInfos); }); } @@ -219,6 +182,32 @@ public class SquareFragment extends BaseFragment implements MainMagicIndicatorAd } } + private void initRecyclerView() { + RecyclerView recyclerView = mView.findViewById(R.id.rv_topic); + LinearLayoutManager layoutManager = new LinearLayoutManager(getContext()); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + recyclerView.setLayoutManager(layoutManager); + List list = new ArrayList<>(); + for (int i = 0; i < 100; i++) { + list.add(new MiniWorldInfo()); + } + mRecommendTopicAdapter = new RecommendTopicListAdapter(list); + mRecommendTopicAdapter.setEnableLoadMore(false); + mRecommendTopicAdapter.setOnItemClickListener(new DoubleClickCheckListener() { + @Override + protected void onItemClickSingle(BaseQuickAdapter adapter, View view, int position) { + MiniWorldInfo miniWorldInfo = mRecommendTopicAdapter.getItem(position); + if (miniWorldInfo == null) { + return; + } + StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_SQUARE_DONGTAI_TJ_HJ_CLICK, + "广场动态页_推荐_点击话题"); + TopicMainActivity.start(mContext, String.valueOf(miniWorldInfo.getId())); + } + }); + recyclerView.setAdapter(mRecommendTopicAdapter); + } + @Nullable @Override public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { diff --git a/app/src/module_community/res/layout/fragment_square.xml b/app/src/module_community/res/layout/fragment_square.xml index 7e6e046f0..d51a0aec8 100644 --- a/app/src/module_community/res/layout/fragment_square.xml +++ b/app/src/module_community/res/layout/fragment_square.xml @@ -33,8 +33,8 @@ android:layout_marginBottom="15dp" android:layout_height="wrap_content"> - tvWorldDescription.setAlpha((200 + verticalOffset) / 200f)); + ivBack.setOnClickListener(v -> finish()); } @Override @@ -276,7 +286,8 @@ public class TopicMainActivity extends BaseMvpActivity - - + android:layout_height="match_parent" + android:layout_marginBottom="@dimen/dp_50"> - - - - - - - + android:background="@color/transparent" + app:elevation="0dp"> - + + + + + + + - + + + + + + + + + + + + + + + + - - - +