PDF新闻
This commit is contained in:
parent
b617317536
commit
4296f7679b
@ -138,7 +138,7 @@ public class CommonSearchActivity extends BaseActivity {
|
|||||||
String params5 = String.format(getResources().getString(R.string.big_data_str), "QUERY", mKeywords, "志愿");
|
String params5 = String.format(getResources().getString(R.string.big_data_str), "QUERY", mKeywords, "志愿");
|
||||||
bigDataRead(params5);
|
bigDataRead(params5);
|
||||||
bundle.putString("keywords", mKeywords);
|
bundle.putString("keywords", mKeywords);
|
||||||
|
// "活动", "非遗数据", "场馆", "直播", "志愿者活动"
|
||||||
SearchActivityFragment activityFragment = new SearchActivityFragment();
|
SearchActivityFragment activityFragment = new SearchActivityFragment();
|
||||||
activityFragment.setArguments(bundle);
|
activityFragment.setArguments(bundle);
|
||||||
|
|
||||||
|
@ -263,22 +263,22 @@ public class NewsListActivity extends BaseActivity {
|
|||||||
.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())
|
||||||
|
@ -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() {
|
||||||
|
@ -142,28 +142,15 @@ 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) {
|
||||||
|
String url = "";
|
||||||
|
if ("6".equals(rowsBean.getNewsContentType())) {
|
||||||
ARouter.getInstance()
|
ARouter.getInstance()
|
||||||
// .build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL) //TODO 连接
|
.build(PathConfig.PATH_MODULE_MAIN_NEWS_WEB)
|
||||||
.build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL_INTERFACE)//TODO 接口方式
|
.withString("url", rowsBean.getNewsContentContent())
|
||||||
.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())
|
.withString("title", rowsBean.getNewsContentTitle())
|
||||||
.withInt("type", 2)
|
|
||||||
.navigation();
|
.navigation();
|
||||||
// String url = "";
|
} else {
|
||||||
// if ("6".equals(rowsBean.getNewsContentType())) {
|
int newsType = 0;
|
||||||
// ARouter.getInstance()
|
|
||||||
// .build(PathConfig.PATH_MODULE_MAIN_NEWS_WEB)
|
|
||||||
// .withString("title", rowsBean.getNewsContentTitle())
|
|
||||||
// .withString("url", rowsBean.getNewsContentContent())
|
|
||||||
// .navigation();
|
|
||||||
// } else {
|
|
||||||
// int newsType = 0;
|
|
||||||
// if (type == 1) {
|
// if (type == 1) {
|
||||||
// //1自定义列表
|
// //1自定义列表
|
||||||
// //3列表详情
|
// //3列表详情
|
||||||
@ -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", newsType)
|
||||||
|
.navigation();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -474,37 +474,35 @@ public class HomeFragment extends BaseFragment {
|
|||||||
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) //TODO 连接
|
.build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL_INTERFACE)
|
||||||
.build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL_INTERFACE)//TODO 接口方式
|
|
||||||
.withString("id", rowsBean.getNewsContentId())
|
.withString("id", rowsBean.getNewsContentId())
|
||||||
.withString("url", url)
|
.withString("url", url)
|
||||||
.withString("isComment", rowsBean.getNewsConfigComment())//是否可以评论
|
.withString("isComment", rowsBean.getNewsConfigComment())//是否可以评论
|
||||||
.withString("isCommentImg", rowsBean.getNewsConfigCommentImage())//评论是否可以上传图片
|
.withString("isCommentImg", rowsBean.getNewsConfigCommentImage())//评论是否可以上传图片
|
||||||
.withString("isCollect", rowsBean.getNewsContentCollectStatus())
|
.withString("isCollect", rowsBean.getNewsContentCollectStatus())
|
||||||
.withString("photo",
|
.withString("photo", BaseUrlApi.BASE_NEWS_IMG_URL + rowsBean.getNewsContentCoverList().get(0).getContentCoverId())
|
||||||
BaseUrlApi.BASE_NEWS_IMG_URL + rowsBean.getNewsContentCoverList().get(0).getContentCoverId())
|
|
||||||
.withString("title", rowsBean.getNewsContentTitle())
|
.withString("title", rowsBean.getNewsContentTitle())
|
||||||
.withInt("type", newsType)
|
.withInt("type", newsType)
|
||||||
.navigation();
|
.navigation();
|
||||||
|
@ -116,7 +116,6 @@ public class NewsFragment extends BaseFragment {
|
|||||||
private void showNewsDetail(NewsItemBean.RowsBean rowsBean, int type) {
|
private void showNewsDetail(NewsItemBean.RowsBean rowsBean, int type) {
|
||||||
String url = "";
|
String url = "";
|
||||||
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("url", rowsBean.getNewsContentContent())
|
.withString("url", rowsBean.getNewsContentContent())
|
||||||
@ -124,25 +123,24 @@ public class NewsFragment extends BaseFragment {
|
|||||||
.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)//TODO 详情模板
|
.build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL_INTERFACE)
|
||||||
.build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL_INTERFACE)//TODO 接口方式
|
|
||||||
.withString("id", rowsBean.getNewsContentId())
|
.withString("id", rowsBean.getNewsContentId())
|
||||||
.withString("url", url)
|
.withString("url", url)
|
||||||
.withString("isComment", rowsBean.getNewsConfigComment())//是否可以评论
|
.withString("isComment", rowsBean.getNewsConfigComment())//是否可以评论
|
||||||
|
@ -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())
|
||||||
|
Loading…
Reference in New Issue
Block a user