From ad2eb0fea36a2ef5f21eade9c2a3157893b9c707 Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 29 Jul 2020 20:35:36 +0800 Subject: [PATCH 1/2] [add]ratingbar --- .../panel/adapter/ShareEventAdapter.java | 9 +++++++++ .../res/drawable/icon_enthusiasm_choose.png | Bin 0 -> 2490 bytes .../res/drawable/icon_enthusiasm_unchoose.png | Bin 0 -> 2532 bytes .../module_event_panel_share_description.xml | 18 +++++++++++++----- .../src/main/res/values/dimens.xml | 13 ++++++++++++- 5 files changed, 34 insertions(+), 6 deletions(-) create mode 100644 modules/mogo-module-event-panel/src/main/res/drawable/icon_enthusiasm_choose.png create mode 100644 modules/mogo-module-event-panel/src/main/res/drawable/icon_enthusiasm_unchoose.png diff --git a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/adapter/ShareEventAdapter.java b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/adapter/ShareEventAdapter.java index c5a302e305..516f08f9b7 100644 --- a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/adapter/ShareEventAdapter.java +++ b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/adapter/ShareEventAdapter.java @@ -1,10 +1,12 @@ package com.zhidao.mogo.module.event.panel.adapter; import android.content.Context; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Button; +import android.widget.RatingBar; import android.widget.TextView; import androidx.annotation.NonNull; @@ -71,20 +73,24 @@ public class ShareEventAdapter extends RecyclerView.Adapter position) { ShareEventDescription.ResultBean.EnthusiasmIndexBean data = (ShareEventDescription.ResultBean.EnthusiasmIndexBean) dataArrayList.get(position); if (data != null) { String shareNum = String.valueOf(data.getShareNum()); String likeNum = String.valueOf(data.getLikeNum()); + double enthusiasmIndex = data.getEnthusiasmIndex(); if (shareNum != null) { ((shareDescriptionViewHolder) holder).shareNumTextView.setText(shareNum); } if (likeNum != null) { ((shareDescriptionViewHolder) holder).approveNumTextView.setText(likeNum); } + ((shareDescriptionViewHolder) holder).ratingBar.setRating((float) enthusiasmIndex); } } } else if (holder instanceof shareItemViewHolder) { + //分享列表 if (dataArrayList.size() > position) { ShareEventItem.ResultBean.PageBean.ContentBean data = (ShareEventItem.ResultBean.PageBean.ContentBean) dataArrayList.get(position); if (data != null) { @@ -159,11 +165,14 @@ public class ShareEventAdapter extends RecyclerView.Adapterj3uHmw#uaLj7kQB>79j{v4@hIB&3pUELpBy zykfG179`nKwl*cAx4HH$(>sH=di&h_dp_qm=XcKcdzR06{&*sf9<~$*L%;w4h+APT zaC|K%kWHfe_gg>X1-=sYFtalQfU?*vUx_08JJc16vjc!YRRB024ggDh*ZDC3@X-c< zac2NPCjx-17rWZth#v?i;jP^5>;QGXy$KKjNdrQB3&ei_5Cjlp<6D3=Xy!uOiTVTi`~( zp{o$qzl`B{yQ5HZI)en&)!MJ64L1Qpp->}+n>!k3fmx^XZ^m#>7Rw8bK=}FjY5DEb zqBA@YIw%whp^Zc!k(zvjCNqG>BKm96n96HO{+Gvs#B^nly;x*A4Jyb>bfNpOjNx!W zq3>s{PZrtzMPl0u!5kjzupEk3$_Ej%`?Zj4p?#OiIbG$$058IjzL`JVHlF8^WZa4uQrA!GwwVWqn(h-qaFi^|y)_ zp^J6gGZS({!NR4paZ>X~@23@hYT~V=Dh8Mk*`aVCOLCtrlYag@*XECK8`u*{sry;j zxIxIbUI+8}U_+#IZ12Qt(*)30Q8z|+a!X5h2A8v^NurmH!dLimOqY6~6H$_AW?Xn= zgWL@iR#|6GkGe&ZJ325NOIz%CsWcH1%;WZWeuUU*lT(fymRNY3b|pICR#UK*OnlTn zrOvrsA`$LHR1&_KC>80f(_w%4+1*30BRJ`_q{Msqn+v&EqS^gjy{NF|!tDW7$&V}8 z?YDaN%DP6zl(CAkitafR2vE~Br3YD$2JQ`31(TDb1NS`F=;^UcZ1$NwP3zphbGbP^ z0eWXo`-vnwwXuD8*+1fUyK7nV7ypzTAKC2@_+n>&)fQTZkf}n}!n=(h z&a^}KB47jhAP&_~5|usLp?rV|ZhX!q*wuSP+pB_P8c#+$PM?XhF2j}8L^JX2*3Vp% zzHR+j^(fC|+Cyc2MXC~K<~ss*oZs4j(8|=~859`$mV(XD2VzHjPCw~LMRxaZFIJ6r zaaFKv%j`?l*NCl2sHE~d8V8KMD(@&>{#X$Zr8uARA*ntCtta|^Z<%CY%vKfillJ{S zO2a{-o_;xV*F(-;yzuYms#mhouZW3@7PJO%d-Tkr@~+yWzm&_w7c{2VP(Js$3YT-T zu`PQ+xyh!vkfY%1>sL@3TiSh4)#CL=66K~?GLf2@0g){uDhG7n!gUMW ze71Mf%7C1kzTCI^Wr?RXX z`rbZEu!T;C9iQjkZVQbn{&eMPKB)lio7IbkwuydSELTHH^t=)>&sSG_Sfsl=)2vjs z)Hv!HG6S2r*KjFhp#PdhggTsnCq~OE?@}%I{-B3b3Wkf=yp@m3!HmgFRL9lLU$`Fo z*O-&TrHEOTL(5A(MQv%O?<@43n=q}Iy~Nr_4wrvBhB>VQDYw@)z;GmvvlUN3;-yB) zhBDOU-$Z>*=?K{BSb}gSyc%dhCpYIh^Y(+iWin6Xj7dWj10UvGJDIfL+I4UUr8v?i z6tF3lWgx3xi|8}hy^vg`CQ+pFjfa##?MN*xyyJ8M558uJ{d7tr+ZunL>!s(Y>L7;V zbkFpBX|qX~GQXIDz1n}bz3RaZD;H3;Q@rz&%?%jbtW3hUh;zJQ#nD% zBau~})w@b`L5*cXMDfxX8_IYav;f0t^X>WV~yLh@46 zMXGLx_W5q2w(ko0kg_yb-8Zi2_+@Ht+tf0gUgCR1rb_*ti@b=<^X0~URx8SWIZR#2 zfV5hL?Ir(-VILcP_TiB1`)#xNb;VAdOPMbfYEciPBV^0ZU1C4EWGy|9u|K7It5*Jc z$2pYD6-Y<0sx}gIZxKXbn9sK~1PbrroFb6jhoIf&)A1WytdQWi@>M-4w^D9#xtw}3EXpLyMOw$=* z56k{6_4iKjY{n^geS+FkLj15bCq0BQ{+Y|8EXu>^gIq?&f{Ead#Olyti;{!RVgCi! ClLr+5 literal 0 HcmV?d00001 diff --git a/modules/mogo-module-event-panel/src/main/res/drawable/icon_enthusiasm_unchoose.png b/modules/mogo-module-event-panel/src/main/res/drawable/icon_enthusiasm_unchoose.png new file mode 100644 index 0000000000000000000000000000000000000000..f64d27d31f33d2d37fff67d5b24b57c742a7f8c4 GIT binary patch literal 2532 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 literal 0 HcmV?d00001 diff --git a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_description.xml b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_description.xml index 864ddbe8fb..5b436aa95b 100644 --- a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_description.xml +++ b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_description.xml @@ -75,17 +75,25 @@ android:layout_weight="1" android:orientation="vertical"> - + diff --git a/modules/mogo-module-event-panel/src/main/res/values/dimens.xml b/modules/mogo-module-event-panel/src/main/res/values/dimens.xml index a6b3daec93..c5cfb1e040 100644 --- a/modules/mogo-module-event-panel/src/main/res/values/dimens.xml +++ b/modules/mogo-module-event-panel/src/main/res/values/dimens.xml @@ -1,2 +1,13 @@ - \ No newline at end of file + + + + \ No newline at end of file From ace242b9dd1224554c86932d38e52ec5dfcc5c5f Mon Sep 17 00:00:00 2001 From: liujing Date: Thu, 30 Jul 2020 20:42:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[add]=E6=9A=82=E6=97=B6=E5=9B=BE=E7=89=87,?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=8A=A0=E8=BD=BD=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../panel/adapter/ShareEventAdapter.java | 65 ++++++++++++---- .../panel/bean/ShareEventDescription.java | 5 +- .../event/panel/bean/ShareEventItem.java | 4 +- .../event/panel/bean/ShareEventItemEnum.java | 1 + .../panel/bean/ShareEventLoadMoreItem.java | 29 +++++++ .../panel/fragment/ShareEventsFragment.java | 72 ++++++++++++++---- .../panel/presenter/ShareEventsPresenter.java | 5 ++ .../res/drawable/icon_enthusiasm_second.png | Bin 0 -> 6831 bytes .../main/res/drawable/share_rating_bar.xml | 16 ++++ .../module_event_panel_share_description.xml | 11 +-- .../module_event_panel_share_load_status.xml | 19 ++--- .../src/main/res/values/dimens.xml | 17 +++-- 12 files changed, 187 insertions(+), 57 deletions(-) create mode 100644 modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/bean/ShareEventLoadMoreItem.java create mode 100644 modules/mogo-module-event-panel/src/main/res/drawable/icon_enthusiasm_second.png create mode 100644 modules/mogo-module-event-panel/src/main/res/drawable/share_rating_bar.xml diff --git a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/adapter/ShareEventAdapter.java b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/adapter/ShareEventAdapter.java index 516f08f9b7..a2e90045c2 100644 --- a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/adapter/ShareEventAdapter.java +++ b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/adapter/ShareEventAdapter.java @@ -1,7 +1,6 @@ package com.zhidao.mogo.module.event.panel.adapter; import android.content.Context; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -20,24 +19,24 @@ import com.zhidao.mogo.module.event.panel.R; import com.zhidao.mogo.module.event.panel.bean.ShareEventDescription; import com.zhidao.mogo.module.event.panel.bean.ShareEventItem; import com.zhidao.mogo.module.event.panel.bean.ShareEventItemEnum; +import com.zhidao.mogo.module.event.panel.bean.ShareEventLoadMoreItem; import com.zhidao.mogo.module.event.panel.fragment.EventPanelFragment; +import com.zhidao.mogo.module.event.panel.presenter.ShareEventsPresenter; import java.util.ArrayList; public class ShareEventAdapter extends RecyclerView.Adapter { private Context context; + private ShareEventsPresenter presenter; private ArrayList dataArrayList; private final LayoutInflater shareLayoutInflater; - private boolean emptylist;//分享空白页 private IMogoServiceApis mApis; - public void setEmptylist(boolean emptylist) { - this.emptylist = emptylist; - } - public ShareEventAdapter(Context context, ArrayList dataArrayList) { + public ShareEventAdapter(Context context, ArrayList dataArrayList, ShareEventsPresenter presenter) { this.context = context; this.dataArrayList = dataArrayList; + this.presenter = presenter; shareLayoutInflater = LayoutInflater.from(context); mApis = (IMogoServiceApis) ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation(context); } @@ -69,6 +68,31 @@ public class ShareEventAdapter extends RecyclerView.Adapter { EventPanelFragment.Companion.getInstance().hidePanel(); @@ -199,6 +227,15 @@ public class ShareEventAdapter extends RecyclerView.Adapter parameters = new HashMap<>(); parameters.put("data", GsonUtil.jsonFromObject(parameter)); @@ -118,8 +121,8 @@ public class ShareEventsFragment extends MvpFragment parameters = new HashMap<>(); parameters.put("data", GsonUtil.jsonFromObject(parameter)); @@ -129,13 +132,40 @@ public class ShareEventsFragment extends MvpFragment(RequestOptions.create(getContext())) { @Override public void onSuccess(ShareEventItem resultData) { - if (resultData != null && resultData.getResult() != null - && resultData.getResult().getPage().getContent().size() > 0) { - adapter.setEmptylist(false); - dataArrayList.addAll(resultData.getResult().getPage().getContent()); + ShareEventLoadMoreItem item = new ShareEventLoadMoreItem(); + if (resultData != null && resultData.getResult() != null) { + if (resultData.getResult().getPage() != null) { + int total = resultData.getResult().getPage().getTotal(); + if (total == 0) { + //空白 + item.setViewType(ShareEventItemEnum.ITEM_TYPE_SHARE_EMPTY); + dataArrayList.add(item); + } else { + if (resultData.getResult().getPage().getContent().size() > 0) { + //当前页有数据 + if (dataArrayList.size() > 0) { + Object data = dataArrayList.get(dataArrayList.size() - 1); + if (data instanceof ShareEventLoadMoreItem) { + dataArrayList.remove(dataArrayList.size() - 1); + } + } + dataArrayList.addAll(resultData.getResult().getPage().getContent()); + item.setViewType(ShareEventItemEnum.ITEM_TYPE_LOAD_MORE_STATUS); + item.setStatusText("查看更早记录"); + } else { + //当前页没有数据 + item.setViewType(ShareEventItemEnum.ITEM_TYPE_NO_MORE); + item.setStatusText("没有更多了"); + } + dataArrayList.add(item); + } + } Log.d(TAG, "分享列表---:" + dataArrayList.get(0)); } else { - adapter.setEmptylist(true); + //空白 + item.setViewType(ShareEventItemEnum.ITEM_TYPE_SHARE_EMPTY); + + dataArrayList.add(item); } adapter.notifyDataSetChanged(); } @@ -147,9 +177,23 @@ public class ShareEventsFragment extends MvpFragment 10) { + if (pageNum <= 1) {//没有分享 + item.setViewType(ShareEventItemEnum.ITEM_TYPE_SHARE_EMPTY); + } else {//没有更多了 + item.setViewType(ShareEventItemEnum.ITEM_TYPE_NO_MORE); + } + dataArray.add(item); + } + } + @NonNull @Override protected ShareEventsPresenter createPresenter() { return new ShareEventsPresenter(this); } + + } diff --git a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/presenter/ShareEventsPresenter.java b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/presenter/ShareEventsPresenter.java index 4538dd7a7d..e1f7ef604c 100644 --- a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/presenter/ShareEventsPresenter.java +++ b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/presenter/ShareEventsPresenter.java @@ -8,4 +8,9 @@ public class ShareEventsPresenter extends Presenter { public ShareEventsPresenter(IView view) { super((ShareEventsFragment) view); } + + public void getMoreShareEventList(){ + mView.getShareEventList(mView.getPageNum()+1,10); + } + } diff --git a/modules/mogo-module-event-panel/src/main/res/drawable/icon_enthusiasm_second.png b/modules/mogo-module-event-panel/src/main/res/drawable/icon_enthusiasm_second.png new file mode 100644 index 0000000000000000000000000000000000000000..4894b507b26c027dbfb4bb099a8bd929e1bc8f5c GIT binary patch literal 6831 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 + + + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_description.xml b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_description.xml index 5b436aa95b..b4f42bea9f 100644 --- a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_description.xml +++ b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_description.xml @@ -77,23 +77,18 @@ + android:layout_marginTop="20dp"/> diff --git a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_load_status.xml b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_load_status.xml index 7a9c631005..8ed4a217d7 100644 --- a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_load_status.xml +++ b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_load_status.xml @@ -1,15 +1,16 @@ - + +