From a27214a9bb630cad333a4d4ebbdb7e6fcfe7fa61 Mon Sep 17 00:00:00 2001 From: itgaojian Date: Fri, 10 Mar 2023 15:14:39 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activitys/news/NewsMainActivity.java | 2 +- .../cultural/fragment/HomeFragment.java | 44 ++++++++--- .../cultural/fragment/NewsFragment.java | 77 ++++++++++--------- .../res/layout/activity_news_local_detail.xml | 4 +- .../src/main/res/layout/fragment_home.xml | 2 + .../main/res/layout/item_news_category.xml | 21 +++-- .../layout/item_skeleton_main_func_grid.xml | 59 ++++++++++++++ .../item_skeleton_news_content_local.xml | 2 +- 8 files changed, 149 insertions(+), 62 deletions(-) create mode 100755 modulemain/src/main/res/layout/item_skeleton_main_func_grid.xml mode change 100644 => 100755 modulemain/src/main/res/layout/item_skeleton_news_content_local.xml diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsMainActivity.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsMainActivity.java index a8b16c0..77392c7 100755 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsMainActivity.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsMainActivity.java @@ -104,7 +104,7 @@ public class NewsMainActivity extends BaseActivity { Bundle bundle = new Bundle(); bundle.putString("type", newsTabBeans.get(i).getNewsDirectoriesId()); bundle.putBoolean("isAll","全部".equals(newsTabBeans.get(i).getDirectoriesName())); - bundle.putString("pId", ""); + bundle.putString("pId", newsTabBeans.get(i).getNewsDirectoriesId()); BaseFragment fragment = null; //0 外部链接 1存在子集 2没有子集 if ("0".equals(newsTabBeans.get(i).getDirectoriesView())) { diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/HomeFragment.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/HomeFragment.java index de5e954..2ef5a1d 100755 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/HomeFragment.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/HomeFragment.java @@ -97,6 +97,11 @@ public class HomeFragment extends BaseFragment { TypeFaceTextView mTvLive; @BindView(R2.id.ll_live) LinearLayout mLlLive; + @BindView(R2.id.rl_main_func) + RelativeLayout mRlMainFunc; + @BindView(R2.id.rl_commend) + RelativeLayout mRlCommend; + // @BindView(R2.id.ll_main_news) // LinearLayout mLlMainNews; @BindView(R2.id.ll_news_content) @@ -109,12 +114,14 @@ public class HomeFragment extends BaseFragment { private NewsAdapter mMAdapter; private ViewSkeletonScreen mNewsSkeleton; private MainCommendAdapter mCommendAdapter; - private RecyclerViewSkeletonScreen mCommendSkeleton; private ViewSkeletonScreen mBannerSkeleton; private RecyclerViewSkeletonScreen mLiveSkeleton; private LiveAdapter mLiveAdapter; private BannerImageTextAdapter mBannerImageAdapter; private List mMainCommendBeans = new ArrayList<>(); + private ViewSkeletonScreen mFuncSkeleton; + private MainFuncAdapter mFuncAdapter; + private ViewSkeletonScreen mCommendSkeleton; @Override protected void setDataToView(View dataView) { @@ -183,10 +190,6 @@ public class HomeFragment extends BaseFragment { mNewsSkeleton = Skeleton.bind(mLlNewsContent) .load(R.layout.item_skeleton_news_content) .show(); - mCommendSkeleton = Skeleton.bind(mRlvCommend) - .adapter(mCommendAdapter) - .load(R.layout.item_skeleton_image) - .show(); mBannerSkeleton = Skeleton.bind(mBanner) .load(R.layout.item_skeleton_banner) @@ -196,6 +199,13 @@ public class HomeFragment extends BaseFragment { .count(5) .load(R.layout.item_skeleton_live_grid) .show(); + mFuncSkeleton = Skeleton.bind(mRlMainFunc) + .load(R.layout.item_skeleton_main_func_grid) + .show(); + mCommendSkeleton = Skeleton.bind(mRlCommend) + .load(R.layout.item_skeleton_main_func_grid) + .show(); + buildMainFuncMenu(null); buildBannerData(); getMainFuncMenu();//获取首页功能按钮 @@ -277,6 +287,7 @@ public class HomeFragment extends BaseFragment { * 获取首页功能 */ private void getMainFuncMenu() { + mFuncSkeleton.show(); RetrofitManager.getInstance() .create(HomeApi.class) .getMainFunc() @@ -290,19 +301,21 @@ public class HomeFragment extends BaseFragment { @Override public void onNext(List newsTabBeans) { - if (newsTabBeans != null && newsTabBeans.size() > 0) { - buildMainFuncMenu(newsTabBeans); - } + buildMainFuncMenu(newsTabBeans); } @Override public void onError(Throwable e) { e.printStackTrace(); + buildMainFuncMenu(null); } @Override public void onComplete() { mSrlView.finishRefresh(); + if (mFuncSkeleton != null) { + mFuncSkeleton.hide(); + } } }); } @@ -312,6 +325,10 @@ public class HomeFragment extends BaseFragment { * 3条场馆 3条活动 */ private void getMainCommendList() { + if (mCommendSkeleton != null) { + mCommendSkeleton.show(); + } + Observable[] mObservales = new Observable[2]; Observable hot = RetrofitManager.getInstance() .create(HomeApi.class) @@ -384,6 +401,9 @@ public class HomeFragment extends BaseFragment { @Override public void onComplete() { mSrlView.finishRefresh(); + if (mCommendSkeleton != null) { + mCommendSkeleton.hide(); + } } }); @@ -719,12 +739,12 @@ public class HomeFragment extends BaseFragment { mFuncBeans.add(placeBean); mFuncBeans.add(culturalBean); - MainFuncAdapter funcAdapter = new MainFuncAdapter(getActivity(), mFuncBeans); + mFuncAdapter = new MainFuncAdapter(getActivity(), mFuncBeans); LinearLayoutManager manager = new LinearLayoutManager(mActivity, LinearLayoutManager.HORIZONTAL, false); mRlvMainFunc.setLayoutManager(manager); - mRlvMainFunc.setAdapter(funcAdapter); + mRlvMainFunc.setAdapter(mFuncAdapter); - funcAdapter.addOnItemClickListener(this::chooseFuncPage); + mFuncAdapter.addOnItemClickListener(this::chooseFuncPage); mRlvMainFunc.addOnScrollListener(new RecyclerView.OnScrollListener() { @Override public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) { @@ -789,7 +809,7 @@ public class HomeFragment extends BaseFragment { } else { ARouter.getInstance().build(PathConfig.PATH_MODULE_MAIN_NEWS_MAIN) .withString("title", mainFuncBean.getDirectoriesName()) - .withString("pId", mainFuncBean.getDirectoriesParentId()) + .withString("pId", mainFuncBean.getNewsDirectoriesId()) .withString("id", mainFuncBean.getNewsDirectoriesId()) .navigation(); } diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/NewsFragment.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/NewsFragment.java index 98b23ed..df862a1 100755 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/NewsFragment.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/NewsFragment.java @@ -114,45 +114,46 @@ public class NewsFragment extends BaseFragment { } private void showNewsDetail(NewsItemBean.RowsBean rowsBean, int type) { - String url = ""; - if ("6".equals(rowsBean.getNewsContentType())) { - //链接新闻 - ARouter.getInstance() - .build(PathConfig.PATH_MODULE_MAIN_NEWS_WEB) - .withString("url", rowsBean.getNewsContentContent()) - .withString("title", rowsBean.getNewsContentTitle()) - .navigation(); - } else { - int newsType = 0; - if (type == 1) { - //1自定义列表 - //3列表详情 - if ("1".equals(rowsBean.getNewsConfigWebSwitch())) { - //列表 - url = rowsBean.getTemplateRecordUrl(); - newsType = 0; - } else { - //内容 - url = rowsBean.getNewsConfigDescriptionText(); - newsType = 1; - } - } else { - newsType = 0; - url = rowsBean.getTemplateRecordUrl(); - } - ARouter.getInstance() + ARouter.getInstance() // .build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL)//TODO 详情模板 - .build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL_INTERFACE)//TODO 接口方式 - .withString("id", rowsBean.getNewsContentId()) - .withString("url", url) - .withString("isComment", rowsBean.getNewsConfigComment())//是否可以评论 - .withString("isCommentImg", rowsBean.getNewsConfigCommentImage())//评论是否可以上传图片 - .withString("isCollect", rowsBean.getNewsContentCollectStatus()) - .withString("photo", BaseUrlApi.BASE_NEWS_IMG_URL + rowsBean.getNewsContentCoverList().get(0).getContentCoverId()) - .withString("title", rowsBean.getNewsContentTitle()) - .withInt("type", newsType) - .navigation(); - } + .build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL_INTERFACE)//TODO 接口方式 + .withString("id", rowsBean.getNewsContentId()) + .withString("url", "") + .withString("isComment", rowsBean.getNewsConfigComment())//是否可以评论 + .withString("isCommentImg", rowsBean.getNewsConfigCommentImage())//评论是否可以上传图片 + .withString("isCollect", rowsBean.getNewsContentCollectStatus()) + .withString("photo", BaseUrlApi.BASE_NEWS_IMG_URL + rowsBean.getNewsContentCoverList().get(0).getContentCoverId()) + .withString("title", rowsBean.getNewsContentTitle()) + .withInt("type",-1 ) + .navigation(); +// String url = ""; +// if ("6".equals(rowsBean.getNewsContentType())) { +// //链接新闻 +// ARouter.getInstance() +// .build(PathConfig.PATH_MODULE_MAIN_NEWS_WEB) +// .withString("url", rowsBean.getNewsContentContent()) +// .withString("title", rowsBean.getNewsContentTitle()) +// .navigation(); +// } else { +// int newsType = 0; +// if (type == 1) { +// //1自定义列表 +// //3列表详情 +// if ("1".equals(rowsBean.getNewsConfigWebSwitch())) { +// //列表 +// url = rowsBean.getTemplateRecordUrl(); +// newsType = 0; +// } else { +// //内容 +// url = rowsBean.getNewsConfigDescriptionText(); +// newsType = 1; +// } +// } else { +// newsType = 0; +// url = rowsBean.getTemplateRecordUrl(); +// } +// +// } } private void getNewsListByTypeToken(int page) { diff --git a/modulemain/src/main/res/layout/activity_news_local_detail.xml b/modulemain/src/main/res/layout/activity_news_local_detail.xml index 5aa8635..c0d8da2 100644 --- a/modulemain/src/main/res/layout/activity_news_local_detail.xml +++ b/modulemain/src/main/res/layout/activity_news_local_detail.xml @@ -208,11 +208,11 @@ android:id="@+id/nwv_content" android:layout_width="match_parent" android:layout_height="300dp" + android:layout_marginLeft="10dp" + android:layout_marginRight="10dp" android:focusable="true" android:focusableInTouchMode="true" android:paddingLeft="10dp" - android:paddingRight="10dp" - android:scrollbars="none" android:visibility="gone" /> diff --git a/modulemain/src/main/res/layout/fragment_home.xml b/modulemain/src/main/res/layout/fragment_home.xml index c42af81..8b35f44 100755 --- a/modulemain/src/main/res/layout/fragment_home.xml +++ b/modulemain/src/main/res/layout/fragment_home.xml @@ -19,6 +19,7 @@ android:layout_height="220dp" /> @@ -93,6 +94,7 @@ android:background="@color/gray_line" /> diff --git a/modulemain/src/main/res/layout/item_news_category.xml b/modulemain/src/main/res/layout/item_news_category.xml index 02e20cf..c7f4f9d 100644 --- a/modulemain/src/main/res/layout/item_news_category.xml +++ b/modulemain/src/main/res/layout/item_news_category.xml @@ -1,13 +1,18 @@ - + android:layout_height="wrap_content" + android:orientation="vertical"> + + + \ No newline at end of file diff --git a/modulemain/src/main/res/layout/item_skeleton_main_func_grid.xml b/modulemain/src/main/res/layout/item_skeleton_main_func_grid.xml new file mode 100755 index 0000000..cebf4d0 --- /dev/null +++ b/modulemain/src/main/res/layout/item_skeleton_main_func_grid.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modulemain/src/main/res/layout/item_skeleton_news_content_local.xml b/modulemain/src/main/res/layout/item_skeleton_news_content_local.xml old mode 100644 new mode 100755 index 80a8f0e..7ecf064 --- a/modulemain/src/main/res/layout/item_skeleton_news_content_local.xml +++ b/modulemain/src/main/res/layout/item_skeleton_news_content_local.xml @@ -368,4 +368,4 @@ android:background="@color/light_transparent" /> - + \ No newline at end of file