gaojian/xz_cultural
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

页面调整

Browse Source
This commit is contained in:
itgaojian 2023-03-10 15:14:39 +08:00
parent 5618891fd1
commit a27214a9bb
8 changed files with 149 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsMainActivity.java
View File

@ -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())) {

44
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/HomeFragment.java
View File

@ -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<MainCommendBean> 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<NewsTabBean> 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<PlaceListBean> 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();
}

77
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/NewsFragment.java
View File

@ -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) {

4
modulemain/src/main/res/layout/activity_news_local_detail.xml
View File

@ -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" />
</LinearLayout>

2
modulemain/src/main/res/layout/fragment_home.xml
View File

@ -19,6 +19,7 @@
android:layout_height="220dp" />
<RelativeLayout
android:id="@+id/rl_main_func"
android:layout_width="match_parent"
android:layout_height="wrap_content">
@ -93,6 +94,7 @@
android:background="@color/gray_line" />
<RelativeLayout
android:id="@+id/rl_commend"
android:layout_width="match_parent"
android:layout_height="wrap_content">

21
modulemain/src/main/res/layout/item_news_category.xml
View File

@ -1,13 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="wrap_content"
xmlns:tools="http://schemas.android.com/tools"
android:layout_height="wrap_content">
<com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
android:id="@+id/tv_category"
android:layout_width="wrap_content"
tools:text="1"
android:padding="10dp"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content"
android:orientation="vertical">
<com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
android:id="@+id/tv_category"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:padding="15dp"
android:textColor="@color/white"
android:textSize="@dimen/text_14"
tools:text="1" />
</LinearLayout>

59
modulemain/src/main/res/layout/item_skeleton_main_func_grid.xml Executable file
View File

@ -0,0 +1,59 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="80dp"
android:orientation="horizontal">
<View
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_margin="3dp"
android:layout_weight="1"
android:background="@color/light_transparent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_weight="1" />
<View
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_margin="3dp"
android:layout_weight="1"
android:background="@color/light_transparent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_weight="1" />
<View
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_margin="3dp"
android:layout_weight="1"
android:background="@color/light_transparent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_weight="1" />
<View
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_margin="3dp"
android:layout_weight="1"
android:background="@color/light_transparent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_weight="1" />
</LinearLayout>

2
modulemain/src/main/res/layout/item_skeleton_news_content_local.xml Normal file → Executable file
View File

@ -368,4 +368,4 @@
android:background="@color/light_transparent" />
</LinearLayout>
</LinearLayout>
</LinearLayout>