diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 6c0b1fe..2524040 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -31,5 +31,10 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7bfd76b..6faa6f6 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -12,7 +12,7 @@
-
+
diff --git a/app/release/output.json b/app/release/output.json
index df4d976..872f190 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":10,"versionName":"1.1.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release","dirName":""},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":12,"versionName":"1.1.2","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release","dirName":""},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index a360099..eb93a30 100644
--- a/build.gradle
+++ b/build.gradle
@@ -54,8 +54,8 @@ ext {
gCompileSdkVersion = 29
gMinSdkVersion = 16
gTargetSdkVersion = 29
- gVersionCode = 10
- gVersionName = '1.1.0'
+ gVersionCode = 12
+ gVersionName = '1.1.2'
gBuildToolsVersion = "29.0.2"
// gVersionCode=26
// gVersionName='1.3.0'
diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java
index 51b3ee5..9d2be39 100755
--- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java
+++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java
@@ -100,6 +100,8 @@ public class PathConfig {
public static final String PATH_MODULE_MAIN_FORGAT_PWD = "/modulemain/activity/forgetpwd";
public static final String PATH_MODULE_MAIN_CHOOSE_CITY = "/modulemain/activity/choosecity";//选择城市
+
+ public static final String PATH_MODULE_MAIN_NEWS_WEB = "/modulemain/activity/newsweb";//连接新闻页
//======================Map==================================================
public static final String PATH_MODULE_MAP_NAVIGATION = "/modulemap/activity/navigation";//地图
public static final String PATH_MODULE_MAP_SHOW_ICON = "/modulemap/activity/showicon";//文化地图
diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/beans/BaseImageBean.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/beans/BaseImageBean.java
index 83c1dcb..3cef4a0 100644
--- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/beans/BaseImageBean.java
+++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/beans/BaseImageBean.java
@@ -24,6 +24,26 @@ public class BaseImageBean {
private String title;
private int newsType;
+ private String newContentContent;
+
+ private String newsContentType;
+
+ public String getNewContentContent() {
+ return newContentContent;
+ }
+
+ public void setNewContentContent(String newContentContent) {
+ this.newContentContent = newContentContent;
+ }
+
+ public String getNewsContentType() {
+ return newsContentType;
+ }
+
+ public void setNewsContentType(String newsContentType) {
+ this.newsContentType = newsContentType;
+ }
+
public int getNewsType() {
return newsType;
}
diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java
index 629ed09..21da086 100755
--- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java
+++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java
@@ -14,7 +14,7 @@ public class BaseUrlApi {
// public static final String IP = "http://192.168.0.113:7001/usercenter/";/* 测试IP */
// public static final String IP = "https://www.wgink.ink/usercenter/";/* 正式IP */
public static final String IP = "https://www.xzszwhy.cn/usercenter/";/* 正式IP */
-// public static final String BASE_SYSTEM_IP = "http://192.168.0.115:8082/";
+ // public static final String BASE_SYSTEM_IP = "http://192.168.0.115:8082/";
public static final String BASE_SYSTEM_IP = "https://www.xzszwhy.cn/";
// public static final String IP = "http://192.168.0.113:7001/usercenter/";/* 测试IP */
public static final String PROJECT_NAME = "app/";
@@ -37,12 +37,13 @@ public class BaseUrlApi {
public static final String BASE_LIVE_IP = BASE_SYSTEM_IP + "live/";
public static final String BASE_LIVE_URL = BASE_SYSTEM_IP;//直播回放视频url
public static final String BASE_PLACE_IP = BASE_SYSTEM_IP + "venuebooking/";/* 场馆 */
-// public static final String BASE_PLACE_IP = TEMP_IP + "venuebooking/";/* 场馆 */
+ // public static final String BASE_PLACE_IP = TEMP_IP + "venuebooking/";/* 场馆 */
public static final String BASE_PLACE_IMG_IP = BASE_PLACE_IP + "route/file/downloadfile/true/";/* 场馆 */
public static final String BASE_CULTURAL_IP = BASE_SYSTEM_IP + "culturalactivity/";/* 文化URL */
public static final String BASE_MINE = "http://192.168.0.108:8080/culturalactivity/";/* 我的URL */
public static final String BASE_CULTURAL_SHARE = BASE_SYSTEM_IP + "social/";/* 文化分享 */
public static final String BASE_NEWS_IP = BASE_SYSTEM_IP + "news/";//新闻
+ // public static final String BASE_NEWS_IP = "http://192.168.0.115:8084/news/";//TODO 新闻本地地址
public static final String BASE_LEGACY_IP = BASE_SYSTEM_IP + "library/";//非遗数据库
// public static final String BASE_NEWS_DETAIL = "http://192.168.0.104/";//新闻
public static final String BASE_NEWS_DETAIL = BASE_SYSTEM_IP;//新闻
diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/BannerImageTextAdapter.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/BannerImageTextAdapter.java
index 1812beb..83fbe04 100644
--- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/BannerImageTextAdapter.java
+++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/BannerImageTextAdapter.java
@@ -43,7 +43,8 @@ public class BannerImageTextAdapter extends BannerAdapter
-
-
+ android:layout_height="wrap_content">
+ android:layout_height="50dp"
+ android:background="@color/transparent">
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ tools:text="@string/app_name" />
+
+
+
+
+
+
+
+
-
-
-
-
+
- 25dp
+ 50dp
diff --git a/modulemain/src/main/AndroidManifest.xml b/modulemain/src/main/AndroidManifest.xml
index efa619b..7cf9634 100644
--- a/modulemain/src/main/AndroidManifest.xml
+++ b/modulemain/src/main/AndroidManifest.xml
@@ -29,6 +29,11 @@
+
{
int itemId = item.getItemId();
if (itemId == R.id.tab_home) {
+ ImmersionBar.with(this)
+ .titleBar(mLlTitleBar)
+ .keyboardEnable(false)
+ .statusBarColor(R.color.titleBar)
+ .statusBarDarkFont(false)
+ .init();
+ mLlTitleBar.setVisibility(View.VISIBLE);
mRlTitleBar.setVisibility(View.VISIBLE);
mRlTitleBar1.setVisibility(View.VISIBLE);
mIvInto.setVisibility(View.GONE);
@@ -123,7 +132,14 @@ public class MainActivity extends BaseActivity {
mTvAppBack.setText(city);
return true;
} else if (itemId == R.id.tab_activity) {
+ ImmersionBar.with(this)
+ .titleBar(mLlTitleBar)
+ .keyboardEnable(false)
+ .statusBarColor(R.color.titleBar)
+ .statusBarDarkFont(false)
+ .init();
//活动
+ mLlTitleBar.setVisibility(View.VISIBLE);
mRlTitleBar.setVisibility(View.VISIBLE);
mRlTitleBar1.setVisibility(View.VISIBLE);
mVpContent.setCurrentItem(1, false);
@@ -133,6 +149,13 @@ public class MainActivity extends BaseActivity {
return true;
} else if (itemId == R.id.tab_place) {
//场馆
+ ImmersionBar.with(this)
+ .titleBar(mLlTitleBar)
+ .keyboardEnable(false)
+ .statusBarColor(R.color.titleBar)
+ .statusBarDarkFont(false)
+ .init();
+ mLlTitleBar.setVisibility(View.VISIBLE);
mRlTitleBar.setVisibility(View.VISIBLE);
mRlTitleBar1.setVisibility(View.VISIBLE);
mLlImg.setVisibility(View.VISIBLE);
@@ -145,6 +168,13 @@ public class MainActivity extends BaseActivity {
return true;
} else if (itemId == R.id.tab_cultural) {
//文化
+ ImmersionBar.with(this)
+ .titleBar(mLlTitleBar)
+ .keyboardEnable(false)
+ .statusBarColor(R.color.titleBar)
+ .statusBarDarkFont(false)
+ .init();
+ mLlTitleBar.setVisibility(View.VISIBLE);
mRlTitleBar.setVisibility(View.VISIBLE);
mRlTitleBar1.setVisibility(View.VISIBLE);
mIvInto.setVisibility(View.GONE);
@@ -154,6 +184,11 @@ public class MainActivity extends BaseActivity {
return true;
} else if (itemId == R.id.tab_mine) {
//我的
+ ImmersionBar.with(this)
+ .transparentStatusBar()
+ .fullScreen(true)
+ .init();
+ mLlTitleBar.setVisibility(View.GONE);
mRlTitleBar.setVisibility(View.GONE);
mRlTitleBar1.setVisibility(View.GONE);
mIvInto.setVisibility(View.GONE);
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 6814f5b..f76fc52 100644
--- 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
@@ -252,34 +252,42 @@ public class NewsListActivity extends BaseActivity {
private void showNewsDetail(NewsItemBean.RowsBean rowsBean, int type) {
String url = "";
- int newsType = 0;
- if (type == 1) {
- //1自定义列表
- //3列表详情
- if ("1".equals(rowsBean.getNewsConfigWebSwitch())) {
- //列表
- url = rowsBean.getTemplateRecordUrl();
- newsType = 0;
- } else {
- //内容
- url = rowsBean.getNewsConfigDescriptionText();
- newsType = 1;
- }
+ if ("6".equals(rowsBean.getNewsContentType())) {
+ ARouter.getInstance()
+ .build(PathConfig.PATH_MODULE_MAIN_NEWS_WEB)
+ .withString("url", rowsBean.getNewsContentContent())
+ .withString("title", rowsBean.getNewsContentTitle())
+ .navigation();
} 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)
+ .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();
}
- ARouter.getInstance()
- .build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL)
- .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();
}
private void getNewsListByTypeToken(int page) {
diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsWebActivity.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsWebActivity.java
new file mode 100644
index 0000000..d061675
--- /dev/null
+++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsWebActivity.java
@@ -0,0 +1,159 @@
+package com.tengshisoft.mudulemain.cultural.activitys.news;
+
+import android.content.pm.ActivityInfo;
+import android.net.http.SslError;
+import android.os.Build;
+import android.view.View;
+import android.webkit.HttpAuthHandler;
+import android.webkit.JavascriptInterface;
+import android.webkit.SslErrorHandler;
+import android.webkit.WebBackForwardList;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+
+import com.alibaba.android.arouter.facade.annotation.Route;
+import com.gyf.immersionbar.ImmersionBar;
+import com.sucstepsoft.cm_utils.constant.PathConfig;
+import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity;
+import com.sucstepsoft.cm_utils.utils.LogUtils;
+import com.sucstepsoft.cm_utils.utils.StringUtils;
+import com.tengshisoft.mudulemain.R;
+import com.tengshisoft.mudulemain.R2;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.Unbinder;
+
+@Route(path = PathConfig.PATH_MODULE_MAIN_NEWS_WEB)
+public class NewsWebActivity extends BaseActivity {
+ @BindView(R2.id.rl_content)
+ LinearLayout mRlContent;
+ private Unbinder mBind;
+ private String mUrl;
+ private WebView mWebView;
+
+ @Override
+ protected int setLayoutId() {
+ return R.layout.activity_news_web;
+ }
+
+ @Override
+ public void initData() {
+ mBind = ButterKnife.bind(this);
+ ImmersionBar.with(this)
+ .init();
+ mRlTitleBar.setVisibility(View.GONE);
+ mRlTitleBar1.setVisibility(View.GONE);
+ refreshView(STATE_LOAD_LOADING);
+ initWebView();
+ }
+
+ private void initWebView() {
+ mWebView = new WebView(mActivity);
+ mWebView.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT));
+ WebSettings settings = mWebView.getSettings();
+ settings.setCacheMode(WebSettings.LOAD_DEFAULT);
+ settings.setAppCacheEnabled(true);
+ settings.setJavaScriptEnabled(true);//启用JS
+ settings.setBlockNetworkImage(true);//阻塞页面图片加载
+ settings.setDomStorageEnabled(true);
+ settings.setUseWideViewPort(true);
+ settings.setLoadWithOverviewMode(true);
+ settings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.NARROW_COLUMNS);
+ mWebView.requestFocus();
+
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+ settings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
+ }
+ mWebView.setWebViewClient(new WebViewClient() {
+
+ @Override
+ public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {
+ handler.proceed();
+ }
+
+ @Override
+ public void onPageFinished(WebView view, String url) {
+ super.onPageFinished(view, url);
+ refreshView(STATE_LOAD_SUCCESS);
+ view.getSettings().setBlockNetworkImage(false);//开启页面图片加载
+ runOnUiThread(() -> mWebView.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT)));
+ }
+
+ @Override
+ public void onReceivedHttpAuthRequest(WebView view, HttpAuthHandler handler, String host, String realm) {
+ super.onReceivedHttpAuthRequest(view, handler, host, realm);
+
+ }
+
+ @Override
+ public boolean shouldOverrideUrlLoading(WebView view, String url) {
+ if (Build.VERSION.SDK_INT < 26) {
+ view.loadUrl(url);
+ return true;
+ }
+ return false;
+ }
+ });
+ mUrl = getIntent().getStringExtra("url");
+ mWebView.loadUrl(mUrl);
+ mWebView.addJavascriptInterface(NewsWebActivity.this, "android");
+ mRlContent.addView(mWebView);
+
+ }
+
+ //PORTRAIT 竖屏
+ //LANDSCAPE 横屏
+ @JavascriptInterface
+ public void changeOrientation(String orientation) {
+ LogUtils.e(orientation);
+ if ("portrait".equals(orientation)) {
+ runOnUiThread(() -> {
+ setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+ String url = mWebView.getUrl();
+ if (url.contains(mUrl)) {
+ mRlContent.removeAllViews();
+ mWebView.clearCache(true);
+ mWebView.clearHistory();
+ mWebView.destroy();
+ mWebView = null;
+ initWebView();
+ }
+ });
+ } else {
+ runOnUiThread(() -> setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE));
+ }
+ }
+
+
+ @Override
+ protected void onDestroy() {
+ if (mBind != null) {
+ mBind.unbind();
+ }
+ super.onDestroy();
+ }
+
+ @Override
+ public void onBackPressed() {
+ if (mWebView.canGoBack()) {
+ mWebView.goBack();
+ WebBackForwardList webBackForwardList = mWebView.copyBackForwardList();
+ if (webBackForwardList != null && webBackForwardList.getSize() == 2) {
+ setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+ mRlContent.removeAllViews();
+ mWebView.clearCache(true);
+ mWebView.clearHistory();
+ mWebView.destroy();
+ mWebView = null;
+ initWebView();
+ }
+ } else {
+ super.onBackPressed();
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/NewsItemBean.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/NewsItemBean.java
index 9c1a6b1..11a7f94 100644
--- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/NewsItemBean.java
+++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/NewsItemBean.java
@@ -86,6 +86,15 @@ public class NewsItemBean {
private String newsConfigDescriptionText;
private String newsConfigWebSwitch;
private String newsContentCollectStatus;
+ private String newsContentContent;
+
+ public String getNewsContentContent() {
+ return newsContentContent;
+ }
+
+ public void setNewsContentContent(String newsContentContent) {
+ this.newsContentContent = newsContentContent;
+ }
public String getNewsContentCollectStatus() {
return newsContentCollectStatus;
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 b8f736e..986bceb 100644
--- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/HomeFragment.java
+++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/HomeFragment.java
@@ -21,6 +21,7 @@ import com.sucstepsoft.cm_utils.core.widget.base.BannerImageTextAdapter;
import com.sucstepsoft.cm_utils.core.widget.base.BaseFragment;
import com.sucstepsoft.cm_utils.core.widget.views.ItemSplitDivider;
import com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView;
+import com.sucstepsoft.cm_utils.utils.LogUtils;
import com.sucstepsoft.cm_utils.utils.ToastUtils;
import com.sucstepsoft.cm_utils.utils.UserLgUtils;
import com.tengshisoft.moduleactivity.beans.ActivityListBeans;
@@ -43,6 +44,8 @@ import com.tengshisoft.mudulemain.cultural.net.HomeApi;
import com.youth.banner.Banner;
import com.youth.banner.transformer.ScaleInTransformer;
+import org.aspectj.lang.annotation.Around;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
@@ -197,18 +200,26 @@ public class HomeFragment extends BaseFragment {
getBannerData();
mBanner.setOnBannerListener((data, position) -> {
BaseImageBean bean = (BaseImageBean) data;
- if (!TextUtils.isEmpty(bean.getId())) {
+ if ("6".equals(bean.getNewsContentType())) {
ARouter.getInstance()
- .build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL)
- .withString("id", bean.getId())
- .withString("url", bean.getUrl())
- .withString("isComment", bean.getIsComment())//是否可以评论
- .withString("isCommentImg", bean.getIsCommentImg())//评论是否可以上传图片
- .withString("isCollect", bean.getIsCollect())
- .withString("photo", bean.getPhoto())
+ .build(PathConfig.PATH_MODULE_MAIN_NEWS_WEB)
.withString("title", bean.getTitle())
- .withInt("type", bean.getNewsType())
+ .withString("url", bean.getNewContentContent())
.navigation();
+ } else {
+ if (!TextUtils.isEmpty(bean.getId())) {
+ ARouter.getInstance()
+ .build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL)
+ .withString("id", bean.getId())
+ .withString("url", bean.getUrl())
+ .withString("isComment", bean.getIsComment())//是否可以评论
+ .withString("isCommentImg", bean.getIsCommentImg())//评论是否可以上传图片
+ .withString("isCollect", bean.getIsCollect())
+ .withString("photo", bean.getPhoto())
+ .withString("title", bean.getTitle())
+ .withInt("type", bean.getNewsType())
+ .navigation();
+ }
}
});
// ARouter.getInstance().build(PathConfig.PATH_MODULE_MAIN_NEWS_MAIN).navigation()
@@ -356,34 +367,42 @@ public class HomeFragment extends BaseFragment {
*/
private void showNewsDetail(NewsItemBean.RowsBean rowsBean, int type) {
String url = "";
- int newsType = 0;
- if (type == 1) {
- //1自定义列表
- //3列表详情
- if ("1".equals(rowsBean.getNewsConfigWebSwitch())) {
- //列表
- url = rowsBean.getTemplateRecordUrl();
- newsType = 0;
- } else {
- //内容
- url = rowsBean.getNewsConfigDescriptionText();
- newsType = 1;
- }
+ if ("6".equals(rowsBean.getNewsContentType())) {
+ ARouter.getInstance()
+ .build(PathConfig.PATH_MODULE_MAIN_NEWS_WEB)
+ .withString("title", rowsBean.getNewsContentTitle())
+ .withString("url", rowsBean.getNewsContentContent())
+ .navigation();
} 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)
+ .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();
}
- ARouter.getInstance()
- .build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL)
- .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();
}
private void getBannerData() {
@@ -416,6 +435,8 @@ public class HomeFragment extends BaseFragment {
bean.setIsComment(rowsBean.getNewsConfigComment());
bean.setIsCollect(rowsBean.getNewsContentCollectStatus());
bean.setTitle(rowsBean.getNewsContentTitle());
+ bean.setNewsContentType(rowsBean.getNewsContentType());
+ bean.setNewContentContent(rowsBean.getNewsContentContent());
bean.setNewsType(0);
bean.setPhoto(BaseUrlApi.BASE_NEWS_IMG_URL + newsContentCoverId);
mBannerList.add(bean);
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 52a677a..38fc458 100644
--- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/NewsFragment.java
+++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/NewsFragment.java
@@ -95,7 +95,9 @@ public class NewsFragment extends BaseFragment {
} else {
getNewsListByType(mCurrentPage);
}
-
+ mRlvNewsContent.setFocusableInTouchMode(false);
+ mRlvNewsContent.setFocusable(false);
+ mRlvNewsContent.setHasFixedSize(true);
}
private void openNewsList(NewsTabBean newsTabBean) {
@@ -108,34 +110,42 @@ public class NewsFragment extends BaseFragment {
private void showNewsDetail(NewsItemBean.RowsBean rowsBean, int type) {
String url = "";
- int newsType = 0;
- if (type == 1) {
- //1自定义列表
- //3列表详情
- if ("1".equals(rowsBean.getNewsConfigWebSwitch())) {
- //列表
- url = rowsBean.getTemplateRecordUrl();
- newsType = 0;
- } else {
- //内容
- url = rowsBean.getNewsConfigDescriptionText();
- newsType = 1;
- }
+ if ("6".equals(rowsBean.getNewsContentType())) {
+ ARouter.getInstance()
+ .build(PathConfig.PATH_MODULE_MAIN_NEWS_WEB)
+ .withString("url", rowsBean.getNewsContentContent())
+ .withString("title", rowsBean.getNewsContentTitle())
+ .navigation();
} 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)
+ .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();
}
- ARouter.getInstance()
- .build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL)
- .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();
}
private void getNewsListByTypeToken(int page) {
diff --git a/modulemain/src/main/res/layout/activity_news_web.xml b/modulemain/src/main/res/layout/activity_news_web.xml
new file mode 100644
index 0000000..4701597
--- /dev/null
+++ b/modulemain/src/main/res/layout/activity_news_web.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/modulemain/src/main/res/values-v19/dimens.xml b/modulemain/src/main/res/values-v19/dimens.xml
new file mode 100644
index 0000000..fcf1b32
--- /dev/null
+++ b/modulemain/src/main/res/values-v19/dimens.xml
@@ -0,0 +1,4 @@
+
+
+ 50dp
+
\ No newline at end of file
diff --git a/modulemain/src/main/res/values/dimens.xml b/modulemain/src/main/res/values/dimens.xml
index 9a7637c..8f960c1 100755
--- a/modulemain/src/main/res/values/dimens.xml
+++ b/modulemain/src/main/res/values/dimens.xml
@@ -3,4 +3,5 @@
12sp
12sp
15sp
+ 0dp
\ No newline at end of file
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 da2568d..c4084cd 100644
--- a/modulemine/src/main/java/com/tengshisoft/modulemine/activity/CollectActivity.java
+++ b/modulemine/src/main/java/com/tengshisoft/modulemine/activity/CollectActivity.java
@@ -67,34 +67,42 @@ public class CollectActivity extends BaseActivity {
private void showNewsDetail(NewsItemBean.RowsBean rowsBean, int type) {
String url = "";
- int newsType = 0;
- if (type == 1) {
- //1自定义列表
- //3列表详情
- if ("1".equals(rowsBean.getNewsConfigWebSwitch())) {
- //列表
- url = rowsBean.getTemplateRecordUrl();
- newsType = 0;
- } else {
- //内容
- url = rowsBean.getNewsConfigDescriptionText();
- newsType = 1;
- }
+ if ("6".equals(rowsBean.getNewsContentType())) {
+ ARouter.getInstance()
+ .build(PathConfig.PATH_MODULE_MAIN_NEWS_WEB)
+ .withString("title", rowsBean.getNewsContentTitle())
+ .withString("url", rowsBean.getNewsContentContent())
+ .navigation();
} 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)
+ .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();
}
- ARouter.getInstance()
- .build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL)
- .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();
}
private void getCollectList(int page) {
diff --git a/modulemine/src/main/res/drawable-xhdpi/ic_mine_main_bg.jpg b/modulemine/src/main/res/drawable-xhdpi/ic_mine_main_bg.jpg
new file mode 100644
index 0000000..2871c4a
Binary files /dev/null and b/modulemine/src/main/res/drawable-xhdpi/ic_mine_main_bg.jpg differ
diff --git a/modulemine/src/main/res/layout/fragment_mine_main.xml b/modulemine/src/main/res/layout/fragment_mine_main.xml
index b31d358..d2b7cd0 100644
--- a/modulemine/src/main/res/layout/fragment_mine_main.xml
+++ b/modulemine/src/main/res/layout/fragment_mine_main.xml
@@ -20,8 +20,8 @@
+ android:layout_height="240dp"
+ android:background="@drawable/ic_mine_main_bg" />