新闻详情PDF

This commit is contained in:
itgaojian 2023-03-13 15:17:26 +08:00
parent 1c52db7d3a
commit e388d3d748
6 changed files with 112 additions and 105 deletions

View File

@ -262,23 +262,23 @@ public class NewsListActivity extends BaseActivity {
.withString("title", rowsBean.getNewsContentTitle()) .withString("title", rowsBean.getNewsContentTitle())
.navigation(); .navigation();
} else { } else {
int newsType = 0; // int newsType = 0;
if (type == 1) { // if (type == 1) {
//1自定义列表 // //1自定义列表
//3列表详情 // //3列表详情
if ("1".equals(rowsBean.getNewsConfigWebSwitch())) { // if ("1".equals(rowsBean.getNewsConfigWebSwitch())) {
//列表 // //列表
url = rowsBean.getTemplateRecordUrl(); // url = rowsBean.getTemplateRecordUrl();
newsType = 0; // newsType = 0;
} else { // } else {
//内容 // //内容
url = rowsBean.getNewsConfigDescriptionText(); // url = rowsBean.getNewsConfigDescriptionText();
newsType = 1; // newsType = 1;
} // }
} else { // } else {
newsType = 0; // newsType = 0;
url = rowsBean.getTemplateRecordUrl(); // url = rowsBean.getTemplateRecordUrl();
} // }
ARouter.getInstance() ARouter.getInstance()
.build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL_INTERFACE) .build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL_INTERFACE)
.withString("id", rowsBean.getNewsContentId()) .withString("id", rowsBean.getNewsContentId())
@ -288,7 +288,7 @@ public class NewsListActivity extends BaseActivity {
.withString("isCollect", rowsBean.getNewsContentCollectStatus()) .withString("isCollect", rowsBean.getNewsContentCollectStatus())
.withString("photo", BaseUrlApi.BASE_NEWS_IMG_URL + rowsBean.getNewsContentCoverList().get(0).getContentCoverId()) .withString("photo", BaseUrlApi.BASE_NEWS_IMG_URL + rowsBean.getNewsContentCoverList().get(0).getContentCoverId())
.withString("title", rowsBean.getNewsContentTitle()) .withString("title", rowsBean.getNewsContentTitle())
.withInt("type", newsType) .withInt("type", -1)
.navigation(); .navigation();
} }
} }

View File

@ -383,6 +383,7 @@ public class NewsLocalDetailActivity extends BaseActivity {
createVideoView(newsDetailBean); createVideoView(newsDetailBean);
break; break;
case "5"://PDF case "5"://PDF
createPdf(newsDetailBean);
break; break;
case "6"://6链接 case "6"://6链接
createWebView(newsDetailBean); createWebView(newsDetailBean);
@ -402,6 +403,20 @@ public class NewsLocalDetailActivity extends BaseActivity {
} }
} }
/**
* 打开PDF
*
* @param newsDetailBean
*/
private void createPdf(NewsDetailBean newsDetailBean) {
ARouter.getInstance()
.build(PathConfig.PATH_MODULE_MAIN_NEWS_PDF)
.withString("title", newsDetailBean.getNewsContentTitle())
.withString("url", BaseUrlApi.BASE_IMG_URL + newsDetailBean.getFileList().get(0).getContentFileFileId())
.navigation();
finish();
}
private void showShareDialog() { private void showShareDialog() {
BottomDialogShareView shareView = new BottomDialogShareView.DialogBuilder(mActivity).build(); BottomDialogShareView shareView = new BottomDialogShareView.DialogBuilder(mActivity).build();
shareView.addOnChoseListener(new BottomDialogShareView.OnChoseListener() { shareView.addOnChoseListener(new BottomDialogShareView.OnChoseListener() {

View File

@ -142,27 +142,14 @@ public class NewsSearchActivity extends BaseActivity {
* @param type * @param type
*/ */
private void showNewsDetail(NewsItemBean.RowsBean rowsBean, int type) { private void showNewsDetail(NewsItemBean.RowsBean rowsBean, int type) {
ARouter.getInstance() String url = "";
// .build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL) //TODO 连接 if ("6".equals(rowsBean.getNewsContentType())) {
.build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL_INTERFACE)//TODO 接口方式 ARouter.getInstance()
.withString("id", rowsBean.getNewsContentId()) .build(PathConfig.PATH_MODULE_MAIN_NEWS_WEB)
.withString("url", "") .withString("url", rowsBean.getNewsContentContent())
.withString("isComment", rowsBean.getNewsConfigComment())//是否可以评论 .withString("title", rowsBean.getNewsContentTitle())
.withString("isCommentImg", rowsBean.getNewsConfigCommentImage())//评论是否可以上传图片 .navigation();
.withString("isCollect", rowsBean.getNewsContentCollectStatus()) } else {
.withString("photo",
BaseUrlApi.BASE_NEWS_IMG_URL + rowsBean.getNewsContentCoverList().get(0).getContentCoverId())
.withString("title", rowsBean.getNewsContentTitle())
.withInt("type", 2)
.navigation();
// String url = "";
// if ("6".equals(rowsBean.getNewsContentType())) {
// ARouter.getInstance()
// .build(PathConfig.PATH_MODULE_MAIN_NEWS_WEB)
// .withString("title", rowsBean.getNewsContentTitle())
// .withString("url", rowsBean.getNewsContentContent())
// .navigation();
// } else {
// int newsType = 0; // int newsType = 0;
// if (type == 1) { // if (type == 1) {
// //1自定义列表 // //1自定义列表
@ -180,8 +167,18 @@ public class NewsSearchActivity extends BaseActivity {
// newsType = 0; // newsType = 0;
// url = rowsBean.getTemplateRecordUrl(); // url = rowsBean.getTemplateRecordUrl();
// } // }
ARouter.getInstance()
// } .build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL_INTERFACE)
.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", -1)
.navigation();
}
} }
/** /**

View File

@ -470,26 +470,14 @@ public class HomeFragment extends BaseFragment {
* @param type * @param type
*/ */
private void showNewsDetail(NewsItemBean.RowsBean rowsBean, int type) { private void showNewsDetail(NewsItemBean.RowsBean rowsBean, int type) {
ARouter.getInstance() String url = "";
.build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL_INTERFACE) if ("6".equals(rowsBean.getNewsContentType())) {
.withString("id", rowsBean.getNewsContentId()) ARouter.getInstance()
.withString("url", "") .build(PathConfig.PATH_MODULE_MAIN_NEWS_WEB)
.withString("isComment", rowsBean.getNewsConfigComment())//是否可以评论 .withString("url", rowsBean.getNewsContentContent())
.withString("isCommentImg", rowsBean.getNewsConfigCommentImage())//评论是否可以上传图片 .withString("title", rowsBean.getNewsContentTitle())
.withString("isCollect", rowsBean.getNewsContentCollectStatus()) .navigation();
.withString("photo", } else {
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("title", rowsBean.getNewsContentTitle())
// .withString("url", rowsBean.getNewsContentContent())
// .navigation();
// } else {
// int newsType = 0; // int newsType = 0;
// if (type == 1) { // if (type == 1) {
// //1自定义列表 // //1自定义列表
@ -507,8 +495,18 @@ public class HomeFragment extends BaseFragment {
// newsType = 0; // newsType = 0;
// url = rowsBean.getTemplateRecordUrl(); // url = rowsBean.getTemplateRecordUrl();
// } // }
// ARouter.getInstance()
// } .build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL_INTERFACE)
.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", -1)
.navigation();
}
} }
private void getBannerData() { private void getBannerData() {

View File

@ -114,27 +114,14 @@ public class NewsFragment extends BaseFragment {
} }
private void showNewsDetail(NewsItemBean.RowsBean rowsBean, int type) { private void showNewsDetail(NewsItemBean.RowsBean rowsBean, int type) {
ARouter.getInstance() String url = "";
// .build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL)//TODO 详情模板 if ("6".equals(rowsBean.getNewsContentType())) {
.build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL_INTERFACE)//TODO 接口方式 ARouter.getInstance()
.withString("id", rowsBean.getNewsContentId()) .build(PathConfig.PATH_MODULE_MAIN_NEWS_WEB)
.withString("url", "") .withString("url", rowsBean.getNewsContentContent())
.withString("isComment", rowsBean.getNewsConfigComment())//是否可以评论 .withString("title", rowsBean.getNewsContentTitle())
.withString("isCommentImg", rowsBean.getNewsConfigCommentImage())//评论是否可以上传图片 .navigation();
.withString("isCollect", rowsBean.getNewsContentCollectStatus()) } else {
.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; // int newsType = 0;
// if (type == 1) { // if (type == 1) {
// //1自定义列表 // //1自定义列表
@ -152,8 +139,18 @@ public class NewsFragment extends BaseFragment {
// newsType = 0; // newsType = 0;
// url = rowsBean.getTemplateRecordUrl(); // url = rowsBean.getTemplateRecordUrl();
// } // }
// ARouter.getInstance()
// } .build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL_INTERFACE)
.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", -1)
.navigation();
}
} }
private void getNewsListByTypeToken(int page) { private void getNewsListByTypeToken(int page) {

View File

@ -70,27 +70,27 @@ public class CollectActivity extends BaseActivity {
if ("6".equals(rowsBean.getNewsContentType())) { if ("6".equals(rowsBean.getNewsContentType())) {
ARouter.getInstance() ARouter.getInstance()
.build(PathConfig.PATH_MODULE_MAIN_NEWS_WEB) .build(PathConfig.PATH_MODULE_MAIN_NEWS_WEB)
.withString("title", rowsBean.getNewsContentTitle())
.withString("url", rowsBean.getNewsContentContent()) .withString("url", rowsBean.getNewsContentContent())
.withString("title", rowsBean.getNewsContentTitle())
.navigation(); .navigation();
} else { } else {
int newsType = 0; // int newsType = 0;
if (type == 1) { // if (type == 1) {
//1自定义列表 // //1自定义列表
//3列表详情 // //3列表详情
if ("1".equals(rowsBean.getNewsConfigWebSwitch())) { // if ("1".equals(rowsBean.getNewsConfigWebSwitch())) {
//列表 // //列表
url = rowsBean.getTemplateRecordUrl(); // url = rowsBean.getTemplateRecordUrl();
newsType = 0; // newsType = 0;
} else { // } else {
//内容 // //内容
url = rowsBean.getNewsConfigDescriptionText(); // url = rowsBean.getNewsConfigDescriptionText();
newsType = 1; // newsType = 1;
} // }
} else { // } else {
newsType = 0; // newsType = 0;
url = rowsBean.getTemplateRecordUrl(); // url = rowsBean.getTemplateRecordUrl();
} // }
ARouter.getInstance() ARouter.getInstance()
.build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL_INTERFACE) .build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL_INTERFACE)
.withString("id", rowsBean.getNewsContentId()) .withString("id", rowsBean.getNewsContentId())
@ -100,7 +100,7 @@ public class CollectActivity extends BaseActivity {
.withString("isCollect", rowsBean.getNewsContentCollectStatus()) .withString("isCollect", rowsBean.getNewsContentCollectStatus())
.withString("photo", BaseUrlApi.BASE_NEWS_IMG_URL + rowsBean.getNewsContentCoverList().get(0).getContentCoverId()) .withString("photo", BaseUrlApi.BASE_NEWS_IMG_URL + rowsBean.getNewsContentCoverList().get(0).getContentCoverId())
.withString("title", rowsBean.getNewsContentTitle()) .withString("title", rowsBean.getNewsContentTitle())
.withInt("type", newsType) .withInt("type", -1)
.navigation(); .navigation();
} }
} }