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..9c57281 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 @@ -262,23 +262,23 @@ public class NewsListActivity extends BaseActivity { .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(); - } +// 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() .build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL_INTERFACE) .withString("id", rowsBean.getNewsContentId()) @@ -288,7 +288,7 @@ public class NewsListActivity extends BaseActivity { .withString("isCollect", rowsBean.getNewsContentCollectStatus()) .withString("photo", BaseUrlApi.BASE_NEWS_IMG_URL + rowsBean.getNewsContentCoverList().get(0).getContentCoverId()) .withString("title", rowsBean.getNewsContentTitle()) - .withInt("type", newsType) + .withInt("type", -1) .navigation(); } } 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..6d260e4 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,27 +142,14 @@ 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 { + 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自定义列表 @@ -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", -1) + .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 2ef5a1d..355a78c 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 @@ -470,26 +470,14 @@ public class HomeFragment extends BaseFragment { * @param type */ private void showNewsDetail(NewsItemBean.RowsBean rowsBean, int type) { - ARouter.getInstance() - .build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL_INTERFACE) - .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("title", rowsBean.getNewsContentTitle()) -// .withString("url", rowsBean.getNewsContentContent()) -// .navigation(); -// } else { + 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自定义列表 @@ -507,8 +495,18 @@ public class HomeFragment extends BaseFragment { // 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", -1) + .navigation(); + } } private void getBannerData() { 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 df862a1..a45656a 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,27 +114,14 @@ public class NewsFragment extends BaseFragment { } 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",-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 { + 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自定义列表 @@ -152,8 +139,18 @@ public class NewsFragment extends BaseFragment { // 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", -1) + .navigation(); + } } private void getNewsListByTypeToken(int page) { 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..cb364b8 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(); - } +// 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() .build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL_INTERFACE) .withString("id", rowsBean.getNewsContentId()) @@ -100,7 +100,7 @@ public class CollectActivity extends BaseActivity { .withString("isCollect", rowsBean.getNewsContentCollectStatus()) .withString("photo", BaseUrlApi.BASE_NEWS_IMG_URL + rowsBean.getNewsContentCoverList().get(0).getContentCoverId()) .withString("title", rowsBean.getNewsContentTitle()) - .withInt("type", newsType) + .withInt("type", -1) .navigation(); } }