首页数据与展示修改

.idea/compiler.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="1.8" />
   </component>
 </project>

.idea/misc.xml

@@ -5,6 +5,21 @@
       <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
     </configurations>
   </component>
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="../../../../../layout/custom_preview.xml" value="0.1789568345323741" />
+        <entry key="modulemain/src/main/res/layout/activity_main.xml" value="0.3591485507246377" />
+        <entry key="modulemain/src/main/res/layout/activity_news_detail.xml" value="0.3591485507246377" />
+        <entry key="modulemain/src/main/res/layout/fragment_home.xml" value="0.3591485507246377" />
+        <entry key="modulemain/src/main/res/layout/item_main_func_net.xml" value="0.3591485507246377" />
+        <entry key="modulemain/src/main/res/layout/item_news_main.xml" value="0.2504528985507246" />
+        <entry key="modulemain/src/main/res/layout/item_news_no_pic.xml" value="0.3591485507246377" />
+        <entry key="modulemain/src/main/res/menu/bottom.xml" value="0.3651041666666667" />
+      </map>
+    </option>
+  </component>
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="JavadocGenerationManager">
     <option name="OUTPUT_DIRECTORY" value="$USER_HOME$/Downloads" />
     <option name="OPTION_SCOPE" value="private" />
@@ -12,7 +27,7 @@
     <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="true" />
     <option name="OPTION_DOCUMENT_TAG_VERSION" value="true" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

.idea/modules.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/cultural.iml" filepath="$PROJECT_DIR$/cultural.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/cultural.app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/cultural.app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/camera/cultural.camera.iml" filepath="$PROJECT_DIR$/.idea/modules/camera/cultural.camera.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/cm_utils/cultural.cm_utils.iml" filepath="$PROJECT_DIR$/.idea/modules/cm_utils/cultural.cm_utils.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/moduleactivity/cultural.moduleactivity.iml" filepath="$PROJECT_DIR$/.idea/modules/moduleactivity/cultural.moduleactivity.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/modulecultural/cultural.modulecultural.iml" filepath="$PROJECT_DIR$/.idea/modules/modulecultural/cultural.modulecultural.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/moduleijkplayer/cultural.moduleijkplayer.iml" filepath="$PROJECT_DIR$/.idea/modules/moduleijkplayer/cultural.moduleijkplayer.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/modulemain/cultural.modulemain.iml" filepath="$PROJECT_DIR$/.idea/modules/modulemain/cultural.modulemain.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/modulemap/cultural.modulemap.iml" filepath="$PROJECT_DIR$/.idea/modules/modulemap/cultural.modulemap.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/modulemine/cultural.modulemine.iml" filepath="$PROJECT_DIR$/.idea/modules/modulemine/cultural.modulemine.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/moduleplace/cultural.moduleplace.iml" filepath="$PROJECT_DIR$/.idea/modules/moduleplace/cultural.moduleplace.iml" />
-    </modules>
-  </component>
-</project>

.idea/runConfigurations.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>

app/src/main/AndroidManifest.xml

@@ -20,7 +20,7 @@
             android:exported="true" />
         <meta-data
             android:name="com.baidu.lbsapi.API_KEY"
-            android:value="sdX2qpmzj85dEUGLS74982Gt1fFBjvS7" />
+            android:value="TAnC0Gk7buNVIGlVVmSGMKFrpOcSGTYS" />
         <meta-data
             android:name="android.max_aspect"
             android:value="2.4" />

cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java

@@ -43,8 +43,9 @@ public class PathConfig {
     public static final String USER_TYPE_N = "bc405346-8714-4ded-89ac-9cc4d755f66a";
     public static final String USER_TYPE_X = "25affe67-134c-4a32-ba41-64b0cfedc782";
     public static final String APP_VERSION_ID = "f5935aa1-4405-4cbe-85bc-d7c1a8ddc9c4";
+    public static final String NEWS_MAIN_TAB = "213f660a-1660-48da-b244-56de7cf5c27e";
 
-    public static final String NEWS_ID = "f497904b-7727-4832-891c-604c36ae4167";//文化动态ID
+    public static final String NEWS_ID = "da07e351-d6b7-4fe8-a7ae-1f0f464af650";//文化动态ID
     public static final String NEWS_SHOW_ID = "f1d5d313-f728-4dda-9843-1116d97e17b0";//展览展示ID
     public static final String NEWS_BANNER_ID = "eab0ca3c-d35d-4c02-9397-ace2bdd10fc1";//轮播图
     public static final String NEWS_CULTIVATE_ID = "d9d8c7ea-32e0-43ed-ad17-7c99a3c389b9";//在线培训
@@ -53,11 +54,11 @@ public class PathConfig {
 
 
     public static final String PLACE_TYPE_ID = "df8b758c-f6d8-465a-9aa8-c451fde47076";//场馆类型字典
-    public static final String CITY_DEFAULT_CODE = "640675";
+    public static final String CITY_DEFAULT_CODE = "110889";
-    public static final String CITY_DEFAULT_NAME = "日喀则市";
+    public static final String CITY_DEFAULT_NAME = "乌兰察布市";
-    public static final int CITY_DEFAULT_LEVEL = 3;
+    public static final int CITY_DEFAULT_LEVEL = 2;
 
-    public static final String DID_CITY_CODE = "640675";//日喀则市编码
+    public static final String DID_CITY_CODE = "110889";//日喀则市编码
     //新闻类型
     public static final int NEWS_TYPE_MULTI_PIC = 2332;//key_1  三图; key_2 一图左;key_3 一图右;key_4 一图下;key_5 纯文字;key_6 视频;key_7 音频;
     public static final int NEWS_TYPE_SINGLE_PIC_LEFT = 2333;//一图左

cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/beans/BaseImageBean.java

@@ -23,6 +23,15 @@ public class BaseImageBean {
     private String photo;
     private String title;
     private int newsType;
+    private String settingCode;
+
+    public String getSettingCode() {
+        return settingCode;
+    }
+
+    public void setSettingCode(String settingCode) {
+        this.settingCode = settingCode;
+    }
 
     private String newContentContent;
 

cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java

@@ -12,10 +12,11 @@ import retrofit2.http.GET;
 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 = "http://219.159.20.131:8081/usercenter/";/* 正式IP */
-    public static final String IP = "https://www.xzszwhy.cn/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 = "https://www.xzszwhy.cn/";
+//    public static final String BASE_SYSTEM_IP = "https://www.xzszwhy.cn/";
+    public static final String BASE_SYSTEM_IP = "http://219.159.20.131:8081/";
     //    public static final String IP = "http://192.168.0.113:7001/usercenter/";/* 测试IP */
     public static final String PROJECT_NAME = "app/";
     public static final String BASE_URL = IP;

cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/BannerImageTextAdapter.java

@@ -5,7 +5,10 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.Transformation;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.bumptech.glide.load.resource.bitmap.CenterInside;
+import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.bumptech.glide.request.RequestOptions;
 import com.sucstepsoft.cm_utils.R;
 import com.sucstepsoft.cm_utils.core.beans.BaseImageBean;
@@ -27,25 +30,39 @@ public class BannerImageTextAdapter extends BannerAdapter<BaseImageBean, BannerT
 
     }
 
-    @Override
+    public void onBindView(BannerTextHolder var1, BaseImageBean var2, int var3, int var4) {
-    public BannerTextHolder onCreateHolder(ViewGroup parent, int viewType) {
+        RequestOptions var5 = (new RequestOptions()).
-        View itemView = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_banner_text, parent, false);
+                transform(new Transformation[]{new CenterInside(), new RoundedCorners(5)})
-        return new BannerTextHolder(itemView);
+                .error(R.drawable.ic_img_load_error)
+                .placeholder(R.drawable.ic_img_loading);
+        Glide.with(var1.itemView.getContext()).load(var2.getImgUrl()).apply(var5).into(var1.mIvCover);
+        var1.mTvName.setText(var2.getName());
     }
 
-    @Override
+    public BannerTextHolder onCreateHolder(ViewGroup var1, int var2) {
-    public void onBindView(BannerTextHolder holder, BaseImageBean data, int position, int size) {
+        return new BannerTextHolder(LayoutInflater.from(var1.getContext()).inflate(R.layout.item_banner_text, var1, false));
-        RoundedCornersTransform roundedCornersTransform = new RoundedCornersTransform(holder.itemView.getContext(), ConvertUtils.dp2px(5));
-        roundedCornersTransform.setNeedCorner(true, true, true, true);
-        RequestOptions options = new RequestOptions()
-            .transform(roundedCornersTransform)
-            .error(R.drawable.ic_img_load_error)
-            .placeholder(R.drawable.ic_img_loading)
-            .diskCacheStrategy(DiskCacheStrategy.RESOURCE);
-        Glide.with(holder.itemView.getContext())
-            .load(data.getImgUrl())
-            .apply(options)
-            .into(holder.mIvCover);
-        holder.mTvName.setText(data.getName());
     }
+
+//    @Override
+//    public BannerTextHolder onCreateHolder(ViewGroup parent, int viewType) {
+//        View itemView = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_banner_text, parent, false);
+//        return new BannerTextHolder(itemView);
+//    }
+//
+//    @Override
+//    public void onBindView(BannerTextHolder holder, BaseImageBean data, int position, int size) {
+////        RequestOptions var5 = (new RequestOptions()).transform(new Transformation[]{new CenterInside(), new RoundedCorners(5)}).error(R.drawable.ic_img_load_error).placeholder(R.drawable.ic_img_loading);
+//        RoundedCornersTransform roundedCornersTransform = new RoundedCornersTransform(holder.itemView.getContext(), ConvertUtils.dp2px(5));
+//        roundedCornersTransform.setNeedCorner(true, true, true, true);
+//        RequestOptions options = new RequestOptions()
+//                .transform(var5)
+//                .error(R.drawable.ic_img_load_error)
+//                .placeholder(R.drawable.ic_img_loading)
+//                .diskCacheStrategy(DiskCacheStrategy.RESOURCE);
+//        Glide.with(holder.itemView.getContext())
+//                .load(data.getImgUrl())
+//                .apply(options)
+//                .into(holder.mIvCover);
+//        holder.mTvName.setText(data.getName());
+//    }
 }

modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/base/MainActivity.java

@@ -89,12 +89,12 @@ public class MainActivity extends BaseActivity {
         Fragment activityFragment = FragmentUtils.getActivityFragment();
         Fragment homefragment = FragmentUtils.getHomeFragment();
         Fragment placeFragment = FragmentUtils.getPlaceFragment();
-        Fragment culturalFragment = FragmentUtils.getCulturalFragment();
+//        Fragment culturalFragment = FragmentUtils.getCulturalFragment();
         Fragment mineMainFragment = FragmentUtils.getMineFragment();
         mFragments.add(homefragment);
         mFragments.add(activityFragment);
         mFragments.add(placeFragment);
-        mFragments.add(culturalFragment);
+//        mFragments.add(culturalFragment);
         mFragments.add(mineMainFragment);
         String locationCity = UserLgUtils.getCurrentCity();
         if (TextUtils.isEmpty(locationCity)) {
@@ -161,23 +161,7 @@ public class MainActivity extends BaseActivity {
                 mIvInto.setOnClickListener(v -> ARouter.getInstance()
                     .build(PathConfig.PATH_MODULE_MAP_SHOW_ICON).navigation());
                 return true;
-            } else if (itemId == R.id.tab_cultural) {
+            }else if (itemId == R.id.tab_mine) {
-                //文化
-                ImmersionBar.with(this)
-                    .titleBar(mLlTitleBar)
-                    .keyboardEnable(false)
-                    .statusBarColor(R.color.titleBar)
-                    .statusBarDarkFont(true)
-                    .init();
-                mLlTitleBar.setVisibility(View.VISIBLE);
-                mRlTitleBar.setVisibility(View.VISIBLE);
-                mRlTitleBar1.setVisibility(View.VISIBLE);
-                mIvInto.setVisibility(View.GONE);
-                mVpContent.setCurrentItem(3, false);
-                mTvBaseTitle.setText(item.getTitle());
-                mTvAppBack.setVisibility(View.GONE);
-                return true;
-            } else if (itemId == R.id.tab_mine) {
                 //我的
                 ImmersionBar.with(this)
                     .transparentStatusBar()
@@ -187,7 +171,7 @@ public class MainActivity extends BaseActivity {
                 mRlTitleBar.setVisibility(View.GONE);
                 mRlTitleBar1.setVisibility(View.GONE);
                 mIvInto.setVisibility(View.GONE);
-                mVpContent.setCurrentItem(4, false);
+                mVpContent.setCurrentItem(3, false);
                 mTvBaseTitle.setText(item.getTitle());
                 return true;
             }
@@ -459,3 +443,22 @@ public class MainActivity extends BaseActivity {
         }
     }
 }
+
+
+// else if (itemId == R.id.tab_cultural) {
+//         //文化
+//         ImmersionBar.with(this)
+//         .titleBar(mLlTitleBar)
+//         .keyboardEnable(false)
+//         .statusBarColor(R.color.titleBar)
+//         .statusBarDarkFont(true)
+//         .init();
+//         mLlTitleBar.setVisibility(View.VISIBLE);
+//         mRlTitleBar.setVisibility(View.VISIBLE);
+//         mRlTitleBar1.setVisibility(View.VISIBLE);
+//         mIvInto.setVisibility(View.GONE);
+//         mVpContent.setCurrentItem(3, false);
+//         mTvBaseTitle.setText(item.getTitle());
+//         mTvAppBack.setVisibility(View.GONE);
+//         return true;
+//         }

modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/news/NewsDetailActivity.java

@@ -70,6 +70,7 @@ import androidx.core.content.FileProvider;
 import androidx.core.widget.NestedScrollView;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.Unbinder;
@@ -140,6 +141,7 @@ public class NewsDetailActivity extends BaseActivity {
     private String mTitle;
     private String mPhoto;
     private File mDestFile;
+    private String typeSettingCode;
 
     @Override
     protected int setLayoutId() {
@@ -159,14 +161,16 @@ public class NewsDetailActivity extends BaseActivity {
         mUrl = getIntent().getStringExtra("url");
         mTitle = getIntent().getStringExtra("title");
         mPhoto = getIntent().getStringExtra("photo");
+//        .withString("typeSettingCode",rowsBean.getTypesettingCode())
+        typeSettingCode = getIntent().getStringExtra("typeSettingCode");
         Observable.create((ObservableOnSubscribe<File>) emitter -> {
-            emitter.onNext(Glide.with(mActivity)
+                    emitter.onNext(Glide.with(mActivity)
-                    .asFile()
+                            .asFile()
-                    .load(mPhoto)
+                            .load(mPhoto)
-                    .submit(300, 300)
+                            .submit(300, 300)
-                    .get());
+                            .get());
-            emitter.onComplete();
+                    emitter.onComplete();
-        }).subscribeOn(Schedulers.io())
+                }).subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(file -> {
                     File externalFilesDir = getExternalFilesDir(Environment.DIRECTORY_PICTURES);
@@ -227,6 +231,9 @@ public class NewsDetailActivity extends BaseActivity {
                 super.onPageFinished(view, url);
                 mContentSkeleton.hide();
                 view.getSettings().setBlockNetworkImage(false);//开启页面图片加载
+                if ("1".equals(typeSettingCode)) {
+                    imgReset();
+                }
                 runOnUiThread(() -> mWvContent.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT)));
             }
 
@@ -238,7 +245,7 @@ public class NewsDetailActivity extends BaseActivity {
 
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                if (url.contains(BaseUrlApi.BASE_SYSTEM_IP+"news/route/file/downloadfile/true")) {
+                if (url.contains(BaseUrlApi.BASE_SYSTEM_IP + "news/route/file/downloadfile/true")) {
                     //TODO 数图资源
                     ARouter.getInstance()
                             .build(PathConfig.PATH_MODULE_MAIN_NEWS_PDF)
@@ -354,6 +361,20 @@ public class NewsDetailActivity extends BaseActivity {
         shareView.show();
     }
 
+    /**
+     * 对图片进行重置大小，宽度就是手机屏幕宽度，高度根据宽度比便自动缩放
+     **/
+    private void imgReset() {
+        mWvContent.loadUrl("javascript:(function(){" +
+                "var objs = document.getElementsByTagName('img'); " +
+                "for(var i=0;i<objs.length;i++)  " +
+                "{"
+                + "var img = objs[i];   " +
+                "    img.style.maxWidth = '100%'; img.style.height = 'auto';  " +
+                "}" +
+                "})()");
+    }
+
     private void shareToPlatform(int type) {
         if (mType != 0) {
             ToastUtils.showShort("该资讯不支持分享");

modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/news/NewsListActivity.java

@@ -262,8 +262,9 @@ public class NewsListActivity extends BaseActivity {
             }
             ARouter.getInstance()
                     .build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL)
-                    .withString("id", rowsBean.getNewsContentId())
+                    .withString("id", rowsBean.getNewsContentType())
                     .withString("url", url)
+                    .withString("typeSettingCode",rowsBean.getTypesettingCode())
                     .withString("isComment", rowsBean.getNewsConfigComment())//是否可以评论
                     .withString("isCommentImg", rowsBean.getNewsConfigCommentImage())//评论是否可以上传图片
                     .withString("isCollect", rowsBean.getNewsContentCollectStatus())

modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/adapter/MainFuncNetAdapter.java

@@ -0,0 +1,45 @@
+package com.tengshisoft.mudulemain.jncultural.adapter;
+
+import android.content.Context;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.bumptech.glide.Glide;
+import com.sucstepsoft.cm_utils.core.widget.base.BaseRecyclerAdapter;
+import com.sucstepsoft.cm_utils.utils.LogUtils;
+import com.sucstepsoft.cm_utils.utils.ScreenUtils;
+import com.tengshisoft.mudulemain.R;
+import com.tengshisoft.mudulemain.jncultural.beans.NewsTabBean;
+import com.tengshisoft.mudulemain.jncultural.holder.MainFuncHolder;
+
+import java.util.List;
+
+public class MainFuncNetAdapter extends BaseRecyclerAdapter<NewsTabBean, MainFuncHolder> {
+
+    public MainFuncNetAdapter(Context ctx, List<NewsTabBean> list) {
+        super(ctx, list);
+    }
+
+    public void bindHolder(MainFuncHolder paramMainFuncHolder, int paramInt) {
+        StringBuilder stringBuilder = new StringBuilder();
+        stringBuilder.append("http://219.159.20.131:8081/news/route/file/downloadfile/true/");
+        stringBuilder.append(this.mData.get(paramInt).getDirectoriesPhoto());
+        String str = stringBuilder.toString();
+        LogUtils.e(str);
+        Glide.with(this.mContext).load(str).into(paramMainFuncHolder.mIvIcon);
+        paramMainFuncHolder.mTvName.setText(this.mData.get(paramInt).getDirectoriesName());
+    }
+
+    public MainFuncHolder createHolder(ViewGroup paramViewGroup, int paramInt) {
+        View view = LayoutInflater.from(this.mContext).inflate(R.layout.item_main_func_net, paramViewGroup, false);
+        RecyclerView.LayoutParams layoutParams = (RecyclerView.LayoutParams) view.getLayoutParams();
+        layoutParams.width = ScreenUtils.getScreenWidth() / 4;
+        view.setLayoutParams(layoutParams);
+        return new MainFuncHolder(view);
+    }
+}

modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/NewsTabBean.java

@@ -8,36 +8,45 @@ package com.tengshisoft.mudulemain.jncultural.beans;
  */
 public class NewsTabBean {
 
-    /**
+    private String newsDirectoriesId;
-     * directoriesCheck : string
+    private String directoriesParentId;
-     * directoriesCode : string
+    private String directoriesName;
-     * directoriesDescription : string
-     * directoriesName : string
-     * directoriesParentId : string
-     * directoriesPhoto : string
-     * directoriesSort : 0
-     * directoriesSummary : string
-     * directoriesSwitch : string
-     * newsDirectoriesId : string
-     */
-
-    private String directoriesCheck;
     private String directoriesCode;
     private String directoriesDescription;
-    private String directoriesName;
-    private String directoriesParentId;
-    private String directoriesPhoto;
-    private int directoriesSort;
-    private String directoriesSummary;
     private String directoriesSwitch;
-    private String newsDirectoriesId;
+    private String directoriesView;
+    private String directoriesCheck;
+    private double directoriesSort;
+    private String directoriesSummary;
+    private String directoriesPhoto;
+    private String directoriesParentName;
+    private String directoriesTarget1;
+    private String directoriesTarget2;
+    private String directoriesTarget3;
+    private String directoriesAuth;
 
-    public String getDirectoriesCheck() {
+    public String getNewsDirectoriesId() {
-        return directoriesCheck;
+        return newsDirectoriesId;
     }
 
-    public void setDirectoriesCheck(String directoriesCheck) {
+    public void setNewsDirectoriesId(String newsDirectoriesId) {
-        this.directoriesCheck = directoriesCheck;
+        this.newsDirectoriesId = newsDirectoriesId;
+    }
+
+    public String getDirectoriesParentId() {
+        return directoriesParentId;
+    }
+
+    public void setDirectoriesParentId(String directoriesParentId) {
+        this.directoriesParentId = directoriesParentId;
+    }
+
+    public String getDirectoriesName() {
+        return directoriesName;
+    }
+
+    public void setDirectoriesName(String directoriesName) {
+        this.directoriesName = directoriesName;
     }
 
     public String getDirectoriesCode() {
@@ -56,35 +65,35 @@ public class NewsTabBean {
         this.directoriesDescription = directoriesDescription;
     }
 
-    public String getDirectoriesName() {
+    public String getDirectoriesSwitch() {
-        return directoriesName;
+        return directoriesSwitch;
     }
 
-    public void setDirectoriesName(String directoriesName) {
+    public void setDirectoriesSwitch(String directoriesSwitch) {
-        this.directoriesName = directoriesName;
+        this.directoriesSwitch = directoriesSwitch;
     }
 
-    public String getDirectoriesParentId() {
+    public String getDirectoriesView() {
-        return directoriesParentId;
+        return directoriesView;
     }
 
-    public void setDirectoriesParentId(String directoriesParentId) {
+    public void setDirectoriesView(String directoriesView) {
-        this.directoriesParentId = directoriesParentId;
+        this.directoriesView = directoriesView;
     }
 
-    public String getDirectoriesPhoto() {
+    public String getDirectoriesCheck() {
-        return directoriesPhoto;
+        return directoriesCheck;
     }
 
-    public void setDirectoriesPhoto(String directoriesPhoto) {
+    public void setDirectoriesCheck(String directoriesCheck) {
-        this.directoriesPhoto = directoriesPhoto;
+        this.directoriesCheck = directoriesCheck;
     }
 
-    public int getDirectoriesSort() {
+    public double getDirectoriesSort() {
         return directoriesSort;
     }
 
-    public void setDirectoriesSort(int directoriesSort) {
+    public void setDirectoriesSort(double directoriesSort) {
         this.directoriesSort = directoriesSort;
     }
 
@@ -96,19 +105,51 @@ public class NewsTabBean {
         this.directoriesSummary = directoriesSummary;
     }
 
-    public String getDirectoriesSwitch() {
+    public String getDirectoriesPhoto() {
-        return directoriesSwitch;
+        return directoriesPhoto;
     }
 
-    public void setDirectoriesSwitch(String directoriesSwitch) {
+    public void setDirectoriesPhoto(String directoriesPhoto) {
-        this.directoriesSwitch = directoriesSwitch;
+        this.directoriesPhoto = directoriesPhoto;
     }
 
-    public String getNewsDirectoriesId() {
+    public String getDirectoriesParentName() {
-        return newsDirectoriesId;
+        return directoriesParentName;
     }
 
-    public void setNewsDirectoriesId(String newsDirectoriesId) {
+    public void setDirectoriesParentName(String directoriesParentName) {
-        this.newsDirectoriesId = newsDirectoriesId;
+        this.directoriesParentName = directoriesParentName;
+    }
+
+    public String getDirectoriesTarget1() {
+        return directoriesTarget1;
+    }
+
+    public void setDirectoriesTarget1(String directoriesTarget1) {
+        this.directoriesTarget1 = directoriesTarget1;
+    }
+
+    public String getDirectoriesTarget2() {
+        return directoriesTarget2;
+    }
+
+    public void setDirectoriesTarget2(String directoriesTarget2) {
+        this.directoriesTarget2 = directoriesTarget2;
+    }
+
+    public String getDirectoriesTarget3() {
+        return directoriesTarget3;
+    }
+
+    public void setDirectoriesTarget3(String directoriesTarget3) {
+        this.directoriesTarget3 = directoriesTarget3;
+    }
+
+    public String getDirectoriesAuth() {
+        return directoriesAuth;
+    }
+
+    public void setDirectoriesAuth(String directoriesAuth) {
+        this.directoriesAuth = directoriesAuth;
     }
 }

modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/fragment/NewsFragment.java

@@ -134,6 +134,7 @@ public class NewsFragment extends BaseFragment {
             ARouter.getInstance()
                     .build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL)
                     .withString("id", rowsBean.getNewsContentId())
+                    .withString("typeSettingCode",rowsBean.getNewsContentType())
                     .withString("url", url)
                     .withString("isComment", rowsBean.getNewsConfigComment())//是否可以评论
                     .withString("isCommentImg", rowsBean.getNewsConfigCommentImage())//评论是否可以上传图片

modulemain/src/main/res/layout/fragment_home.xml

@@ -18,7 +18,7 @@
         <com.youth.banner.Banner
             android:id="@+id/banner"
             android:layout_width="match_parent"
-            android:layout_height="220dp"
+            android:layout_height="150dp"
             android:layout_marginTop="15dp" />
 
         <RelativeLayout
@@ -149,6 +149,7 @@
             <View
                 android:layout_width="match_parent"
                 android:layout_height="2dp"
+                android:visibility="gone"
                 android:background="@color/gray_line" />
 
 
@@ -156,6 +157,7 @@
                 android:id="@+id/tv_live"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:visibility="gone"
                 android:gravity="center"
                 android:padding="5dp"
                 android:text="直播专区"
@@ -168,9 +170,11 @@
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
+                android:visibility="gone"
                 android:background="@color/gray_line" />
 
             <RelativeLayout
+                android:visibility="gone"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 

modulemain/src/main/res/layout/item_main_func_net.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/iv_icon"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_centerHorizontal="true"
+        android:layout_margin="10dp"
+        android:scaleType="fitXY" />
+
+    <com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
+        android:id="@+id/tv_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/iv_icon"
+        android:layout_marginTop="5dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="@color/black"
+        android:textSize="12sp" />
+</LinearLayout>

modulemain/src/main/res/menu/bottom.xml

@@ -12,10 +12,10 @@
         android:id="@+id/tab_place"
         android:icon="@drawable/sel_bottom_tab_place"
         android:title="场馆" />
-    <item
+<!--    <item-->
-        android:id="@+id/tab_cultural"
+<!--        android:id="@+id/tab_cultural"-->
-        android:icon="@drawable/sel_bottom_tab_cultural"
+<!--        android:icon="@drawable/sel_bottom_tab_cultural"-->
-        android:title="文化" />
+<!--        android:title="文化" />-->
     <item
         android:id="@+id/tab_mine"
         android:icon="@drawable/sel_bottom_tab_mine"

modulemine/src/main/java/com/tengshisoft/modulemine/activity/CollectActivity.java

@@ -93,6 +93,7 @@ public class CollectActivity extends BaseActivity {
             ARouter.getInstance()
                 .build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL)
                 .withString("id", rowsBean.getNewsContentId())
+                    .withString("typeSettingCode",rowsBean.getNewsContentType())
                 .withString("url", url)
                 .withString("isComment", rowsBean.getNewsConfigComment())//是否可以评论
                 .withString("isCommentImg", rowsBean.getNewsConfigCommentImage())//评论是否可以上传图片