gaojian/jncultural
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

首页数据与展示修改

Browse Source
This commit is contained in:
itgaojian163 2022-10-03 19:07:42 +08:00
parent 9cddb048fb
commit 9675d06474
20 changed files with 748 additions and 527 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/compiler.xml
View File

@ -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>

17
.idea/misc.xml
View File

@ -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">

18
.idea/modules.xml
View File

@ -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>

13
.idea/runConfigurations.xml
View File

@ -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>

2
app/src/main/AndroidManifest.xml
View File

@ -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" />

11
cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java
View File

@ -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_NAME = "日喀则市";
public static final int CITY_DEFAULT_LEVEL = 3;
public static final String CITY_DEFAULT_CODE = "110889";
public static final String CITY_DEFAULT_NAME = "乌兰察布市";
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;//一图左

9
cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/beans/BaseImageBean.java
View File

@ -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;

7
cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java
View File

@ -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 = "https://www.xzszwhy.cn/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 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;

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

@ -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 BannerTextHolder onCreateHolder(ViewGroup parent, int viewType) {
View itemView = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_banner_text, parent, false);
return new BannerTextHolder(itemView);
public void onBindView(BannerTextHolder var1, BaseImageBean var2, int var3, int var4) {
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);
Glide.with(var1.itemView.getContext()).load(var2.getImgUrl()).apply(var5).into(var1.mIvCover);
var1.mTvName.setText(var2.getName());
}
@Override
public void onBindView(BannerTextHolder holder, BaseImageBean data, int position, int size) {
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());
public BannerTextHolder onCreateHolder(ViewGroup var1, int var2) {
return new BannerTextHolder(LayoutInflater.from(var1.getContext()).inflate(R.layout.item_banner_text, var1, false));
}
// @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());
// }
}

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

@ -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,22 +161,6 @@ 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) {
//文化
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)
@ -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;
// }

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

@ -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,6 +161,8 @@ 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)
.asFile()
@ -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)));
}
@ -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("该资讯不支持分享");

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

@ -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())

45
modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/adapter/MainFuncNetAdapter.java Normal file
View File

@ -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);
}
}

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

@ -8,36 +8,45 @@ package com.tengshisoft.mudulemain.jncultural.beans;
*/
public class NewsTabBean {
/**
* directoriesCheck : string
* directoriesCode : string
* directoriesDescription : string
* directoriesName : string
* directoriesParentId : string
* directoriesPhoto : string
* directoriesSort : 0
* directoriesSummary : string
* directoriesSwitch : string
* newsDirectoriesId : string
*/
private String directoriesCheck;
private String newsDirectoriesId;
private String directoriesParentId;
private String directoriesName;
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() {
return directoriesCheck;
public String getNewsDirectoriesId() {
return newsDirectoriesId;
}
public void setDirectoriesCheck(String directoriesCheck) {
this.directoriesCheck = directoriesCheck;
public void setNewsDirectoriesId(String newsDirectoriesId) {
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() {
return directoriesName;
public String getDirectoriesSwitch() {
return directoriesSwitch;
}
public void setDirectoriesName(String directoriesName) {
this.directoriesName = directoriesName;
public void setDirectoriesSwitch(String directoriesSwitch) {
this.directoriesSwitch = directoriesSwitch;
}
public String getDirectoriesParentId() {
return directoriesParentId;
public String getDirectoriesView() {
return directoriesView;
}
public void setDirectoriesParentId(String directoriesParentId) {
this.directoriesParentId = directoriesParentId;
public void setDirectoriesView(String directoriesView) {
this.directoriesView = directoriesView;
}
public String getDirectoriesPhoto() {
return directoriesPhoto;
public String getDirectoriesCheck() {
return directoriesCheck;
}
public void setDirectoriesPhoto(String directoriesPhoto) {
this.directoriesPhoto = directoriesPhoto;
public void setDirectoriesCheck(String directoriesCheck) {
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() {
return directoriesSwitch;
public String getDirectoriesPhoto() {
return directoriesPhoto;
}
public void setDirectoriesSwitch(String directoriesSwitch) {
this.directoriesSwitch = directoriesSwitch;
public void setDirectoriesPhoto(String directoriesPhoto) {
this.directoriesPhoto = directoriesPhoto;
}
public String getNewsDirectoriesId() {
return newsDirectoriesId;
public String getDirectoriesParentName() {
return directoriesParentName;
}
public void setNewsDirectoriesId(String newsDirectoriesId) {
this.newsDirectoriesId = newsDirectoriesId;
public void setDirectoriesParentName(String directoriesParentName) {
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;
}
}

260
modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/fragment/HomeFragment.java
View File

@ -1,5 +1,7 @@
package com.tengshisoft.mudulemain.jncultural.fragment;
import static android.widget.LinearLayout.HORIZONTAL;
import android.content.Context;
import android.graphics.Color;
import android.text.TextUtils;
@ -12,13 +14,19 @@ import com.alibaba.android.arouter.launcher.ARouter;
import com.ethanhua.skeleton.RecyclerViewSkeletonScreen;
import com.ethanhua.skeleton.Skeleton;
import com.ethanhua.skeleton.ViewSkeletonScreen;
import com.scwang.smart.refresh.layout.api.RefreshLayout;
import com.scwang.smart.refresh.layout.listener.OnMultiListener;
import com.scwang.smart.refresh.layout.listener.OnRefreshListener;
import com.sucstepsoft.cm_utils.constant.PathConfig;
import com.sucstepsoft.cm_utils.core.beans.BaseImageBean;
import com.sucstepsoft.cm_utils.core.retrofit_net.BaseUrlApi;
import com.sucstepsoft.cm_utils.core.retrofit_net.RetrofitManager;
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.base.BaseRecyclerAdapter;
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;
@ -30,6 +38,8 @@ import com.tengshisoft.mudulemain.jncultural.activitys.base.MainActivity;
import com.tengshisoft.mudulemain.jncultural.adapter.LiveAdapter;
import com.tengshisoft.mudulemain.jncultural.adapter.MainCommendAdapter;
import com.tengshisoft.mudulemain.jncultural.adapter.MainFuncAdapter;
import com.tengshisoft.mudulemain.jncultural.adapter.MainFuncNetAdapter;
import com.tengshisoft.mudulemain.jncultural.adapter.NewsAdapter;
import com.tengshisoft.mudulemain.jncultural.adapter.NewsMainAdapter;
import com.tengshisoft.mudulemain.jncultural.beans.LiveBean;
import com.tengshisoft.mudulemain.jncultural.beans.MainCommendBean;
@ -50,6 +60,7 @@ import androidx.annotation.NonNull;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;
@ -93,11 +104,11 @@ public class HomeFragment extends BaseFragment {
private Unbinder mBind;
private List<MainFuncBean> mFuncBeans = new ArrayList<>();
private List<NewsTabBean> mFuncBeans = new ArrayList<>();
private List<BaseImageBean> mBannerList = new ArrayList<>();
private List<NewsItemBean.RowsBean> mNewsBeans = new ArrayList<>();
private List<LiveBean> mLiveBeans = new ArrayList<>();
private NewsMainAdapter mMAdapter;
private NewsAdapter mMAdapter;
private RecyclerViewSkeletonScreen mNewsSkeleton;
private MainCommendAdapter mCommendAdapter;
private RecyclerViewSkeletonScreen mCommendSkeleton;
@ -111,16 +122,17 @@ public class HomeFragment extends BaseFragment {
mBind = ButterKnife.bind(this, dataView);
setStateView(STATE_SUCCESS);
mSrlView.setEnableLoadMore(false);
mSrlView.setEnableRefresh(false);
mSrlView.setEnableRefresh(true);
// mLlMainNews.setOnClickListener(v -> ARouter.getInstance().build(PathConfig.PATH_MODULE_MAIN_NEWS_MAIN).navigation());
mRlvMainNews.setLayoutManager(new LinearLayoutManager(mActivity, LinearLayoutManager.VERTICAL, false));
// mRlvMainNews.addItemDecoration(new ItemSplitDivider(mActivity, LinearLayoutManager.VERTICAL, 1, Color.parseColor("#F2F2F2")));
mRlvMainNews.addItemDecoration(new ItemSplitDivider(mActivity, LinearLayoutManager.VERTICAL, 1, Color.parseColor("#F2F2F2")));
// this.mRlvMainNews.addItemDecoration((RecyclerView.ItemDecoration)new ItemSplitDivider((Context)this.mActivity, 1, 1, Color.parseColor("#F2F2F2")));
mRlvMainNews.setAdapter(mMAdapter);
mRlvLives.setLayoutManager(new GridLayoutManager(mActivity, 2));
// mRlvLives.addItemDecoration(new ItemSplitDivider(mActivity, LinearLayoutManager.VERTICAL, 1, Color.parseColor("#F2F2F2")));
mLiveAdapter = new LiveAdapter(mActivity, mLiveBeans);
mRlvLives.setAdapter(mLiveAdapter);
mMAdapter = new NewsMainAdapter(mActivity, mNewsBeans);
mMAdapter = new NewsAdapter(mActivity, mNewsBeans);
mMAdapter.addOnItemClickByType(this::showNewsDetail);
mCommendAdapter = new MainCommendAdapter(mActivity, mMainCommendBeans);
mRlvCommend.setLayoutManager(new LinearLayoutManager(mActivity, LinearLayoutManager.HORIZONTAL, false));
@ -186,7 +198,7 @@ public class HomeFragment extends BaseFragment {
.count(5)
.load(R.layout.item_skeleton_live_grid)
.show();
buildMainFuncMenu();
getMainFuncList();
buildBannerData();
getNewsList(null);
getLiveList();
@ -204,6 +216,7 @@ public class HomeFragment extends BaseFragment {
if (!TextUtils.isEmpty(bean.getId())) {
ARouter.getInstance()
.build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL)
.withString("typeSettingCode",bean.getNewsContentType())
.withString("id", bean.getId())
.withString("url", bean.getUrl())
.withString("isComment", bean.getIsComment())//是否可以评论
@ -216,11 +229,48 @@ public class HomeFragment extends BaseFragment {
}
}
});
mSrlView.setOnRefreshListener(refreshLayout -> notifyData());
// ARouter.getInstance().build(PathConfig.PATH_MODULE_MAIN_NEWS_MAIN).navigation()
// ARouter.getInstance().build(PathConfig.PATH_MODULE_CULTURAL_LIVE).navigation()
// mLlLive.setOnClickListener(v -> ARouter.getInstance().build(PathConfig.PATH_MODULE_CULTURAL_LIVE).navigation());
}
private void getMainFuncList() {
LogUtils.e("加载数据中");
RetrofitManager.getInstance()
.create(HomeApi.class)
.getNewsTabListByPid(PathConfig.NEWS_MAIN_TAB)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<List<NewsTabBean>>() {
@Override
public void onSubscribe(Disposable d) {
}
@Override
public void onNext(List<NewsTabBean> newsTabBeans) {
LogUtils.e("首页按钮列表" + newsTabBeans.size());
if (newsTabBeans.size() > 0) {
buildMainFuncMenu(newsTabBeans);
} else {
mRlvMainFunc.setVisibility(View.GONE);
}
}
@Override
public void onError(Throwable e) {
LogUtils.e("报错误了");
e.printStackTrace();
mRlvMainFunc.setVisibility(View.GONE);
}
@Override
public void onComplete() {
}
});
}
private void getMainCommendList() {
Observable[] mObservales = new Observable[2];
@ -392,6 +442,7 @@ public class HomeFragment 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())//评论是否可以上传图片
@ -417,6 +468,7 @@ public class HomeFragment extends BaseFragment {
@Override
public void onNext(NewsItemBean newsItemBean) {
mSrlView.finishRefresh();
if (newsItemBean != null && newsItemBean.getRows().size() > 0) {
List<NewsItemBean.RowsBean> rows = newsItemBean.getRows();
if (rows.size() > 0) {
@ -436,6 +488,7 @@ public class HomeFragment extends BaseFragment {
bean.setNewsContentType(rowsBean.getNewsContentType());
bean.setNewContentContent(rowsBean.getNewsContentContent());
bean.setNewsType(0);
bean.setSettingCode(rowsBean.getTypesettingCode());
bean.setPhoto(BaseUrlApi.BASE_NEWS_IMG_URL + newsContentCoverId);
mBannerList.add(bean);
}
@ -450,6 +503,7 @@ public class HomeFragment extends BaseFragment {
@Override
public void onError(Throwable e) {
mSrlView.finishRefresh();
}
@Override
@ -695,66 +749,68 @@ public class HomeFragment extends BaseFragment {
/**
* 构建首页按钮
*/
private void buildMainFuncMenu() {
private void buildMainFuncMenu(List<NewsTabBean> paramList) {
LogUtils.e("获取到了数据");
// mFuncBeans.clear();
// MainFuncBean activityBean = new MainFuncBean();
// activityBean.setIconRes(R.drawable.ic_activity_icon);
// activityBean.setTitle("精彩活动");
// MainFuncBean placeBean = new MainFuncBean();
// placeBean.setIconRes(R.drawable.ic_place_icon);
// placeBean.setTitle("场馆导航");
// MainFuncBean culturalBean = new MainFuncBean();
// culturalBean.setIconRes(R.drawable.ic_legacy_icon);
// culturalBean.setTitle("非遗文化");
// MainFuncBean movieBean = new MainFuncBean();
// movieBean.setIconRes(R.drawable.ic_live_icon);
// movieBean.setTitle("直播点播");
// MainFuncBean volunBean = new MainFuncBean();
// volunBean.setIconRes(R.drawable.ic_volunteer_icon);
// volunBean.setTitle("志愿者服务");
// MainFuncBean showBean = new MainFuncBean();
// showBean.setIconRes(R.drawable.ic_show_icon);
// showBean.setTitle("展览展示");
// MainFuncBean culBean = new MainFuncBean();
// culBean.setIconRes(R.drawable.ic_cultural_trends_icon);
// culBean.setTitle("文化动态");
// MainFuncBean bookBean = new MainFuncBean();
// bookBean.setIconRes(R.drawable.ic_legacy_icon);
// bookBean.setTitle("数图资源");
// MainFuncBean cultivlateBean = new MainFuncBean();
// cultivlateBean.setIconRes(R.drawable.ic_live_icon);
// cultivlateBean.setTitle("在线培训");
// MainFuncBean tourBean = new MainFuncBean();
// tourBean.setIconRes(R.drawable.ic_travel_icon);
// tourBean.setTitle("文化旅游");
//
// mFuncBeans.add(showBean);
// mFuncBeans.add(culBean);
// mFuncBeans.add(cultivlateBean);
// mFuncBeans.add(tourBean);
// mFuncBeans.add(bookBean);
// mFuncBeans.add(volunBean);
// mFuncBeans.add(activityBean);
// mFuncBeans.add(placeBean);
// mFuncBeans.add(culturalBean);
// mFuncBeans.add(movieBean);
mRlvMainFunc.setVisibility(View.VISIBLE);
mFuncBeans.clear();
MainFuncBean activityBean = new MainFuncBean();
activityBean.setIconRes(R.drawable.ic_activity_icon);
activityBean.setTitle("精彩活动");
MainFuncBean placeBean = new MainFuncBean();
placeBean.setIconRes(R.drawable.ic_place_icon);
placeBean.setTitle("场馆导航");
MainFuncBean culturalBean = new MainFuncBean();
culturalBean.setIconRes(R.drawable.ic_legacy_icon);
culturalBean.setTitle("非遗文化");
MainFuncBean movieBean = new MainFuncBean();
movieBean.setIconRes(R.drawable.ic_live_icon);
movieBean.setTitle("直播点播");
MainFuncBean volunBean = new MainFuncBean();
volunBean.setIconRes(R.drawable.ic_volunteer_icon);
volunBean.setTitle("志愿者服务");
MainFuncBean showBean = new MainFuncBean();
showBean.setIconRes(R.drawable.ic_show_icon);
showBean.setTitle("展览展示");
MainFuncBean culBean = new MainFuncBean();
culBean.setIconRes(R.drawable.ic_cultural_trends_icon);
culBean.setTitle("文化动态");
MainFuncBean bookBean = new MainFuncBean();
bookBean.setIconRes(R.drawable.ic_legacy_icon);
bookBean.setTitle("数图资源");
MainFuncBean cultivlateBean = new MainFuncBean();
cultivlateBean.setIconRes(R.drawable.ic_live_icon);
cultivlateBean.setTitle("在线培训");
MainFuncBean tourBean = new MainFuncBean();
tourBean.setIconRes(R.drawable.ic_travel_icon);
tourBean.setTitle("文化旅游");
mFuncBeans.add(showBean);
mFuncBeans.add(culBean);
mFuncBeans.add(cultivlateBean);
mFuncBeans.add(tourBean);
mFuncBeans.add(bookBean);
mFuncBeans.add(volunBean);
mFuncBeans.add(activityBean);
mFuncBeans.add(placeBean);
mFuncBeans.add(culturalBean);
mFuncBeans.add(movieBean);
MainFuncAdapter funcAdapter = new MainFuncAdapter(getActivity(), mFuncBeans);
LinearLayoutManager manager = new LinearLayoutManager(mActivity, LinearLayoutManager.HORIZONTAL, false);
mFuncBeans.addAll(paramList);
LogUtils.e(mFuncBeans.size());
MainFuncNetAdapter mainFuncNetAdapter = new MainFuncNetAdapter(getActivity(), mFuncBeans);
LinearLayoutManager manager = new LinearLayoutManager(getActivity(), RecyclerView.HORIZONTAL, false);
mRlvMainFunc.setLayoutManager(manager);
mRlvMainFunc.setAdapter(funcAdapter);
funcAdapter.addOnItemClickListener(this::chooseFuncPage);
mRlvMainFunc.setAdapter(mainFuncNetAdapter);
mainFuncNetAdapter.addOnItemClickListener(this::chooseFuncPage);
mRlvMainFunc.addOnScrollListener(new RecyclerView.OnScrollListener() {
@Override
public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
super.onScrolled(recyclerView, dx, dy);
int lastVisibleItemPosition = manager.findLastVisibleItemPosition();
if (lastVisibleItemPosition == mFuncBeans.size() - 1) {
mIvArrowHint.setVisibility(View.GONE);
} else {
mIvArrowHint.setVisibility(View.VISIBLE);
}
public void onScrolled(RecyclerView param1RecyclerView, int param1Int1, int param1Int2) {
super.onScrolled(param1RecyclerView, param1Int1, param1Int2);
// TODO if (manager.findLastVisibleItemPosition() == HomeFragment.this.mFuncBeans.size() - 1) {
// HomeFragment.this.mLlArrowHint.setVisibility(8);
// } else {
// HomeFragment.this.mLlArrowHint.setVisibility(0);
// }
}
});
}
@ -778,43 +834,53 @@ public class HomeFragment extends BaseFragment {
*
* @param mainFuncBean
*/
private void chooseFuncPage(MainFuncBean mainFuncBean) {
if ("精彩活动".equals(mainFuncBean.getTitle())) {
mMainActivity.setCurrentPage(1, "活动");
} else if ("场馆导航".equals(mainFuncBean.getTitle())) {
mMainActivity.setCurrentPage(2, "场馆");
} else if ("非遗文化".equals(mainFuncBean.getTitle())) {
ARouter.getInstance().build(PathConfig.PATH_MODULE_CULTURAL_ACTIVITY_LEGACY).navigation();
} else if ("直播点播".equals(mainFuncBean.getTitle())) {
ARouter.getInstance().build(PathConfig.PATH_MODULE_CULTURAL_LIVE).navigation();
} else if ("志愿者服务".equals(mainFuncBean.getTitle())) {
ARouter.getInstance().build(PathConfig.PATH_MODULE_CULTURAL_VOUNTEER_MAIN).navigation();
} else if ("文化动态".equals(mainFuncBean.getTitle())) {
private void chooseFuncPage(NewsTabBean mainFuncBean) {
if ("1ab9fcab-4d7e-4305-9d57-abe71cfd539a".equals(mainFuncBean.getNewsDirectoriesId())) {
this.mMainActivity.setCurrentPage(1, "活动");
} else if ("c131dd1d-83c6-46c0-b535-76dc089f2637".equals(mainFuncBean.getNewsDirectoriesId())) {
ARouter.getInstance().build("/modulecultural/activity/legacy").navigation();
} else {
ARouter.getInstance().build(PathConfig.PATH_MODULE_MAIN_NEWS_MAIN)
.withString("title", "文化动态")
.withString("id", PathConfig.NEWS_ID)
.navigation();
} else if ("展览展示".equals(mainFuncBean.getTitle())) {
ARouter.getInstance().build(PathConfig.PATH_MODULE_MAIN_NEWS_MAIN)
.withString("title", "展览展示")
.withString("id", PathConfig.NEWS_SHOW_ID)
.navigation();
} else if ("数图资源".equals(mainFuncBean.getTitle())) {
ARouter.getInstance().build(PathConfig.PATH_MODULE_MAIN_NEWS_MAIN)
.withString("title", "数图资源")
.withString("id", PathConfig.NEWS_BOOKS_ID)
.navigation();
} else if ("在线培训".equals(mainFuncBean.getTitle())) {
ARouter.getInstance().build(PathConfig.PATH_MODULE_MAIN_NEWS_MAIN)
.withString("title", "在线培训")
.withString("id", PathConfig.NEWS_CULTIVATE_ID)
.navigation();
} else if ("文化旅游".equals(mainFuncBean.getTitle())) {
ARouter.getInstance().build(PathConfig.PATH_MODULE_MAIN_NEWS_LIST)
.withString("id", PathConfig.NEWS_TOUR_ID)
.withString("title", "文化旅游")
.withString("id", mainFuncBean.getNewsDirectoriesId())
.withString("title", mainFuncBean.getDirectoriesName())
.navigation();
}
// if ("精彩活动".equals(mainFuncBean.getTitle())) {
// mMainActivity.setCurrentPage(1, "活动");
// } else if ("场馆导航".equals(mainFuncBean.getTitle())) {
// mMainActivity.setCurrentPage(2, "场馆");
// } else if ("非遗文化".equals(mainFuncBean.getTitle())) {
// ARouter.getInstance().build(PathConfig.PATH_MODULE_CULTURAL_ACTIVITY_LEGACY).navigation();
// } else if ("直播点播".equals(mainFuncBean.getTitle())) {
// ARouter.getInstance().build(PathConfig.PATH_MODULE_CULTURAL_LIVE).navigation();
// } else if ("志愿者服务".equals(mainFuncBean.getTitle())) {
// ARouter.getInstance().build(PathConfig.PATH_MODULE_CULTURAL_VOUNTEER_MAIN).navigation();
// } else if ("文化动态".equals(mainFuncBean.getTitle())) {
// ARouter.getInstance().build(PathConfig.PATH_MODULE_MAIN_NEWS_MAIN)
// .withString("title", "文化动态")
// .withString("id", PathConfig.NEWS_ID)
// .navigation();
// } else if ("展览展示".equals(mainFuncBean.getTitle())) {
// ARouter.getInstance().build(PathConfig.PATH_MODULE_MAIN_NEWS_MAIN)
// .withString("title", "展览展示")
// .withString("id", PathConfig.NEWS_SHOW_ID)
// .navigation();
// } else if ("数图资源".equals(mainFuncBean.getTitle())) {
// ARouter.getInstance().build(PathConfig.PATH_MODULE_MAIN_NEWS_MAIN)
// .withString("title", "数图资源")
// .withString("id", PathConfig.NEWS_BOOKS_ID)
// .navigation();
// } else if ("在线培训".equals(mainFuncBean.getTitle())) {
// ARouter.getInstance().build(PathConfig.PATH_MODULE_MAIN_NEWS_MAIN)
// .withString("title", "在线培训")
// .withString("id", PathConfig.NEWS_CULTIVATE_ID)
// .navigation();
// } else if ("文化旅游".equals(mainFuncBean.getTitle())) {
// ARouter.getInstance().build(PathConfig.PATH_MODULE_MAIN_NEWS_LIST)
// .withString("id", PathConfig.NEWS_TOUR_ID)
// .withString("title", "文化旅游")
// .navigation();
// }
}
@Override

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

@ -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())//评论是否可以上传图片

6
modulemain/src/main/res/layout/fragment_home.xml
View File

@ -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">

26
modulemain/src/main/res/layout/item_main_func_net.xml Normal file
View File

@ -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>

8
modulemain/src/main/res/menu/bottom.xml
View File

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

1
modulemine/src/main/java/com/tengshisoft/modulemine/activity/CollectActivity.java
View File

@ -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())//评论是否可以上传图片