From 4296f7679b5411bee39b031892fbc6574f64cee9 Mon Sep 17 00:00:00 2001 From: itgaojian Date: Mon, 13 Mar 2023 15:43:04 +0800 Subject: [PATCH] =?UTF-8?q?PDF=E6=96=B0=E9=97=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activitys/base/CommonSearchActivity.java | 2 +- .../activitys/news/NewsListActivity.java | 32 ++++++------- .../news/NewsLocalDetailActivity.java | 15 +++++++ .../activitys/news/NewsSearchActivity.java | 45 +++++++++---------- .../cultural/fragment/HomeFragment.java | 40 ++++++++--------- .../cultural/fragment/NewsFragment.java | 36 +++++++-------- .../modulemine/activity/CollectActivity.java | 34 +++++++------- 7 files changed, 106 insertions(+), 98 deletions(-) diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/CommonSearchActivity.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/CommonSearchActivity.java index ddf8db7..786ea97 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/CommonSearchActivity.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/CommonSearchActivity.java @@ -138,7 +138,7 @@ public class CommonSearchActivity extends BaseActivity { String params5 = String.format(getResources().getString(R.string.big_data_str), "QUERY", mKeywords, "志愿"); bigDataRead(params5); bundle.putString("keywords", mKeywords); - +// "活动", "非遗数据", "场馆", "直播", "志愿者活动" SearchActivityFragment activityFragment = new SearchActivityFragment(); activityFragment.setArguments(bundle); diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsListActivity.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsListActivity.java index b97d859..169ab72 100755 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsListActivity.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsListActivity.java @@ -263,22 +263,22 @@ public class NewsListActivity extends BaseActivity { .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(); - } +// 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() .build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL_INTERFACE) .withString("id", rowsBean.getNewsContentId()) diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsLocalDetailActivity.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsLocalDetailActivity.java index 0b01296..722ce5c 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsLocalDetailActivity.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsLocalDetailActivity.java @@ -383,6 +383,7 @@ public class NewsLocalDetailActivity extends BaseActivity { createVideoView(newsDetailBean); break; case "5"://PDF + createPdf(newsDetailBean); break; case "6"://6链接 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() { BottomDialogShareView shareView = new BottomDialogShareView.DialogBuilder(mActivity).build(); shareView.addOnChoseListener(new BottomDialogShareView.OnChoseListener() { diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsSearchActivity.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsSearchActivity.java index 82e2f9b..d746b03 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsSearchActivity.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsSearchActivity.java @@ -142,28 +142,15 @@ public class NewsSearchActivity extends BaseActivity { * @param type */ private void showNewsDetail(NewsItemBean.RowsBean rowsBean, int type) { - 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", "") - .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", 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; + 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列表详情 @@ -180,8 +167,18 @@ public class NewsSearchActivity extends BaseActivity { // newsType = 0; // 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", newsType) + .navigation(); + } } /** 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 e9db19a..0d6e6fb 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 @@ -474,37 +474,35 @@ public class HomeFragment extends BaseFragment { if ("6".equals(rowsBean.getNewsContentType())) { ARouter.getInstance() .build(PathConfig.PATH_MODULE_MAIN_NEWS_WEB) - .withString("title", rowsBean.getNewsContentTitle()) .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(); - } +// 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() -// .build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL) //TODO 连接 - .build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL_INTERFACE)//TODO 接口方式 + .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("photo", BaseUrlApi.BASE_NEWS_IMG_URL + rowsBean.getNewsContentCoverList().get(0).getContentCoverId()) .withString("title", rowsBean.getNewsContentTitle()) .withInt("type", newsType) .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..81aeaca 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 @@ -116,7 +116,6 @@ 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()) @@ -124,25 +123,24 @@ public class NewsFragment extends BaseFragment { .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(); - } +// 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() -// .build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL)//TODO 详情模板 - .build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL_INTERFACE)//TODO 接口方式 + .build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL_INTERFACE) .withString("id", rowsBean.getNewsContentId()) .withString("url", url) .withString("isComment", rowsBean.getNewsConfigComment())//是否可以评论 diff --git a/modulemine/src/main/java/com/tengshisoft/modulemine/activity/CollectActivity.java b/modulemine/src/main/java/com/tengshisoft/modulemine/activity/CollectActivity.java index ec4bbb5..85cd4eb 100755 --- a/modulemine/src/main/java/com/tengshisoft/modulemine/activity/CollectActivity.java +++ b/modulemine/src/main/java/com/tengshisoft/modulemine/activity/CollectActivity.java @@ -70,27 +70,27 @@ public class CollectActivity extends BaseActivity { if ("6".equals(rowsBean.getNewsContentType())) { ARouter.getInstance() .build(PathConfig.PATH_MODULE_MAIN_NEWS_WEB) - .withString("title", rowsBean.getNewsContentTitle()) .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(); - } +// 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() .build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL_INTERFACE) .withString("id", rowsBean.getNewsContentId())