diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index fb7f4a8..61a9130 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index beda48d..e69c5eb 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,6 +5,21 @@
+
+
+
+
@@ -12,7 +27,7 @@
-
+
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 0bb9b4b..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index e497da9..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 71bca27..b7a462c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -20,7 +20,7 @@
android:exported="true" />
+ android:value="TAnC0Gk7buNVIGlVVmSGMKFrpOcSGTYS" />
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 9d2be39..746c7e9 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
@@ -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;//一图左
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 3cef4a0..5d14982 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
@@ -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;
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 21da086..197512c 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
@@ -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;
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 d1fa60f..4758403 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
@@ -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 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) {
+ }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;
+// }
diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/news/NewsDetailActivity.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/news/NewsDetailActivity.java
index 5c6cab9..033f6f1 100644
--- a/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/news/NewsDetailActivity.java
+++ b/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) emitter -> {
- emitter.onNext(Glide.with(mActivity)
- .asFile()
- .load(mPhoto)
- .submit(300, 300)
- .get());
- emitter.onComplete();
- }).subscribeOn(Schedulers.io())
+ emitter.onNext(Glide.with(mActivity)
+ .asFile()
+ .load(mPhoto)
+ .submit(300, 300)
+ .get());
+ emitter.onComplete();
+ }).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 {
+
+ public MainFuncNetAdapter(Context ctx, List 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);
+ }
+}
diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/NewsTabBean.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/NewsTabBean.java
index 42f0dda..eee65c8 100644
--- a/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/NewsTabBean.java
+++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/NewsTabBean.java
@@ -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;
}
}
diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/fragment/HomeFragment.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/fragment/HomeFragment.java
index 253ffe0..4154271 100644
--- a/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/fragment/HomeFragment.java
+++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/fragment/HomeFragment.java
@@ -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 mFuncBeans = new ArrayList<>();
+ private List mFuncBeans = new ArrayList<>();
private List mBannerList = new ArrayList<>();
private List mNewsBeans = new ArrayList<>();
private List 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));
@@ -129,16 +141,16 @@ public class HomeFragment extends BaseFragment {
if (1 == mainCommendBean.getType()) {
//活动
ARouter.getInstance()
- .build(PathConfig.PATH_MODULEACTIVITY_ACTIVITY_DETAIL)
- .withString("id", mainCommendBean.getId())
- .navigation();
+ .build(PathConfig.PATH_MODULEACTIVITY_ACTIVITY_DETAIL)
+ .withString("id", mainCommendBean.getId())
+ .navigation();
} else {
//场馆
ARouter.getInstance()
- .build(PathConfig.PATH_MODULE_PLACE_ACTIVITY_PLACEDETAIL)
- .withString("id", mainCommendBean.getId())
- .withString("title", mainCommendBean.getName())
- .navigation();
+ .build(PathConfig.PATH_MODULE_PLACE_ACTIVITY_PLACEDETAIL)
+ .withString("id", mainCommendBean.getId())
+ .withString("title", mainCommendBean.getName())
+ .navigation();
}
});
mLiveAdapter.addOnItemClickListener(liveBean -> {
@@ -146,47 +158,47 @@ public class HomeFragment extends BaseFragment {
if ("0".equals(liveBean.getType())) {
//已经结束
ARouter.getInstance()
- .build(PathConfig.PATH_MODULE_CULTURAL_LIVE_LOCKBACK)
- .withString("id", liveBean.getId())
- .navigation();
+ .build(PathConfig.PATH_MODULE_CULTURAL_LIVE_LOCKBACK)
+ .withString("id", liveBean.getId())
+ .navigation();
} else if ("1".equals(liveBean.getType())) {
//未开始
ARouter.getInstance()
- .build(PathConfig.PATH_MODULE_CULTURAL_LIVE_DETAIL)
- .withString("id", liveBean.getId())
- .withString("type", "1")
- .navigation();
+ .build(PathConfig.PATH_MODULE_CULTURAL_LIVE_DETAIL)
+ .withString("id", liveBean.getId())
+ .withString("type", "1")
+ .navigation();
} else if ("2".equals(liveBean.getType())) {
//直播中
ARouter.getInstance()
- .build(PathConfig.PATH_MODULE_CULTURAL_LIVE_DETAIL)
- .withString("id", liveBean.getId())
- .withString("type", "2")
- .navigation();
+ .build(PathConfig.PATH_MODULE_CULTURAL_LIVE_DETAIL)
+ .withString("id", liveBean.getId())
+ .withString("type", "2")
+ .navigation();
} else {
ToastUtils.showShort("数据错误");
}
});
mMainCommendBeans.clear();
mNewsSkeleton = Skeleton.bind(mRlvMainNews)
- .adapter(mMAdapter)
- .count(5)
- .load(R.layout.item_skeleton_news)
- .show();
+ .adapter(mMAdapter)
+ .count(5)
+ .load(R.layout.item_skeleton_news)
+ .show();
mCommendSkeleton = Skeleton.bind(mRlvCommend)
- .adapter(mCommendAdapter)
- .load(R.layout.item_skeleton_image)
- .show();
+ .adapter(mCommendAdapter)
+ .load(R.layout.item_skeleton_image)
+ .show();
mBannerSkeleton = Skeleton.bind(mBanner)
- .load(R.layout.item_skeleton_banner)
- .show();
+ .load(R.layout.item_skeleton_banner)
+ .show();
mLiveSkeleton = Skeleton.bind(mRlvLives)
- .adapter(mLiveAdapter)
- .count(5)
- .load(R.layout.item_skeleton_live_grid)
- .show();
- buildMainFuncMenu();
+ .adapter(mLiveAdapter)
+ .count(5)
+ .load(R.layout.item_skeleton_live_grid)
+ .show();
+ getMainFuncList();
buildBannerData();
getNewsList(null);
getLiveList();
@@ -196,44 +208,82 @@ public class HomeFragment extends BaseFragment {
BaseImageBean bean = (BaseImageBean) data;
if ("6".equals(bean.getNewsContentType())) {
ARouter.getInstance()
- .build(PathConfig.PATH_MODULE_MAIN_NEWS_WEB)
- .withString("title", bean.getTitle())
- .withString("url", bean.getNewContentContent())
- .navigation();
+ .build(PathConfig.PATH_MODULE_MAIN_NEWS_WEB)
+ .withString("title", bean.getTitle())
+ .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();
+ .build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL)
+ .withString("typeSettingCode",bean.getNewsContentType())
+ .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();
}
}
});
+ 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>() {
+ @Override
+ public void onSubscribe(Disposable d) {
+
+ }
+
+ @Override
+ public void onNext(List 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];
Observable hot = RetrofitManager.getInstance()
- .create(HomeApi.class)
- .getPlaceByOrder(UserLgUtils.getLocationLat(), UserLgUtils.getLocationLng(), "hot", "1", "3")
- .subscribeOn(Schedulers.io())
- .observeOn(AndroidSchedulers.mainThread());
+ .create(HomeApi.class)
+ .getPlaceByOrder(UserLgUtils.getLocationLat(), UserLgUtils.getLocationLng(), "hot", "1", "3")
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread());
Observable mainActivityList = RetrofitManager.getInstance()
- .create(HomeApi.class)
- .getMainActivityList("1", "3")
- .subscribeOn(Schedulers.io())
- .observeOn(AndroidSchedulers.mainThread());
+ .create(HomeApi.class)
+ .getMainActivityList("1", "3")
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread());
mObservales[0] = hot;
mObservales[1] = mainActivityList;
Observable observable = Observable.mergeArrayDelayError(mObservales);
@@ -309,51 +359,51 @@ public class HomeFragment extends BaseFragment {
private void getLiveList() {
mLiveBeans.clear();
RetrofitManager.getInstance()
- .create(HomeApi.class)
- .getLiveRecord("1", "4")
- .subscribeOn(Schedulers.io())
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe(new Observer() {
- @Override
- public void onSubscribe(Disposable d) {
- }
+ .create(HomeApi.class)
+ .getLiveRecord("1", "4")
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(new Observer() {
+ @Override
+ public void onSubscribe(Disposable d) {
+ }
- @Override
- public void onNext(CulturalLiveBean culturalLiveBean) {
- if (culturalLiveBean != null && culturalLiveBean.getRows() != null && culturalLiveBean.getRows().size() > 0) {
- mIvLiveEmpty.setVisibility(View.GONE);
- for (int i = 0; i < culturalLiveBean.getRows().size(); i++) {
- List rows = culturalLiveBean.getRows();
- LiveBean bean = new LiveBean();
- bean.setUrl(rows.get(i).getLivePlanPhoto());
- bean.setTime(rows.get(i).getLivePlanStart());
- bean.setTitle(rows.get(i).getLivePlanName());
- bean.setType(rows.get(i).getLiveStatus());
- bean.setId(rows.get(i).getLivePlanId());
- mLiveBeans.add(bean);
+ @Override
+ public void onNext(CulturalLiveBean culturalLiveBean) {
+ if (culturalLiveBean != null && culturalLiveBean.getRows() != null && culturalLiveBean.getRows().size() > 0) {
+ mIvLiveEmpty.setVisibility(View.GONE);
+ for (int i = 0; i < culturalLiveBean.getRows().size(); i++) {
+ List rows = culturalLiveBean.getRows();
+ LiveBean bean = new LiveBean();
+ bean.setUrl(rows.get(i).getLivePlanPhoto());
+ bean.setTime(rows.get(i).getLivePlanStart());
+ bean.setTitle(rows.get(i).getLivePlanName());
+ bean.setType(rows.get(i).getLiveStatus());
+ bean.setId(rows.get(i).getLivePlanId());
+ mLiveBeans.add(bean);
+ }
+ mLiveAdapter.setData(mLiveBeans);
+ } else {
+ mIvLiveEmpty.setVisibility(View.VISIBLE);
}
- mLiveAdapter.setData(mLiveBeans);
- } else {
+ if (mLiveSkeleton != null) {
+ mLiveSkeleton.hide();
+ }
+ }
+
+ @Override
+ public void onError(Throwable e) {
mIvLiveEmpty.setVisibility(View.VISIBLE);
+ if (mLiveSkeleton != null) {
+ mLiveSkeleton.hide();
+ }
}
- if (mLiveSkeleton != null) {
- mLiveSkeleton.hide();
+
+ @Override
+ public void onComplete() {
+
}
- }
-
- @Override
- public void onError(Throwable e) {
- mIvLiveEmpty.setVisibility(View.VISIBLE);
- if (mLiveSkeleton != null) {
- mLiveSkeleton.hide();
- }
- }
-
- @Override
- public void onComplete() {
-
- }
- });
+ });
}
@@ -367,10 +417,10 @@ public class HomeFragment extends BaseFragment {
String url = "";
if ("6".equals(rowsBean.getNewsContentType())) {
ARouter.getInstance()
- .build(PathConfig.PATH_MODULE_MAIN_NEWS_WEB)
- .withString("title", rowsBean.getNewsContentTitle())
- .withString("url", rowsBean.getNewsContentContent())
- .navigation();
+ .build(PathConfig.PATH_MODULE_MAIN_NEWS_WEB)
+ .withString("title", rowsBean.getNewsContentTitle())
+ .withString("url", rowsBean.getNewsContentContent())
+ .navigation();
} else {
int newsType = 0;
if (type == 1) {
@@ -390,73 +440,77 @@ public class HomeFragment extends BaseFragment {
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();
+ .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())//评论是否可以上传图片
+ .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() {
RetrofitManager.getInstance()
- .create(HomeApi.class)
- .getMainNewsList(PathConfig.NEWS_BANNER_ID, "5", "1")
- .subscribeOn(Schedulers.io())
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe(new Observer() {
- @Override
- public void onSubscribe(Disposable d) {
-
- }
-
- @Override
- public void onNext(NewsItemBean newsItemBean) {
- if (newsItemBean != null && newsItemBean.getRows().size() > 0) {
- List rows = newsItemBean.getRows();
- if (rows.size() > 0) {
- mBannerList.clear();
- for (int i = 0; i < rows.size(); i++) {
- NewsItemBean.RowsBean rowsBean = rows.get(i);
- BaseImageBean bean = new BaseImageBean();
- bean.setName(rows.get(i).getNewsContentTitle());
- bean.setId(rows.get(i).getNewsContentId());
- List newsContentCoverList = rows.get(i).getNewsContentCoverList();
- String newsContentCoverId = newsContentCoverList.get(0).getContentCoverId();
- bean.setImgUrl(BaseUrlApi.BASE_NEWS_IMG_URL + newsContentCoverId);
- bean.setUrl(rowsBean.getTemplateRecordUrl());
- 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);
- }
- mBannerImageAdapter.setDatas(mBannerList);
- mBannerImageAdapter.notifyDataSetChanged();
- mBanner.start();
- }
- } else {
+ .create(HomeApi.class)
+ .getMainNewsList(PathConfig.NEWS_BANNER_ID, "5", "1")
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(new Observer() {
+ @Override
+ public void onSubscribe(Disposable d) {
}
- }
- @Override
- public void onError(Throwable e) {
- }
+ @Override
+ public void onNext(NewsItemBean newsItemBean) {
+ mSrlView.finishRefresh();
+ if (newsItemBean != null && newsItemBean.getRows().size() > 0) {
+ List rows = newsItemBean.getRows();
+ if (rows.size() > 0) {
+ mBannerList.clear();
+ for (int i = 0; i < rows.size(); i++) {
+ NewsItemBean.RowsBean rowsBean = rows.get(i);
+ BaseImageBean bean = new BaseImageBean();
+ bean.setName(rows.get(i).getNewsContentTitle());
+ bean.setId(rows.get(i).getNewsContentId());
+ List newsContentCoverList = rows.get(i).getNewsContentCoverList();
+ String newsContentCoverId = newsContentCoverList.get(0).getContentCoverId();
+ bean.setImgUrl(BaseUrlApi.BASE_NEWS_IMG_URL + newsContentCoverId);
+ bean.setUrl(rowsBean.getTemplateRecordUrl());
+ bean.setIsComment(rowsBean.getNewsConfigComment());
+ bean.setIsCollect(rowsBean.getNewsContentCollectStatus());
+ bean.setTitle(rowsBean.getNewsContentTitle());
+ 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);
+ }
+ mBannerImageAdapter.setDatas(mBannerList);
+ mBannerImageAdapter.notifyDataSetChanged();
+ mBanner.start();
+ }
+ } else {
- @Override
- public void onComplete() {
+ }
+ }
- }
- });
+ @Override
+ public void onError(Throwable e) {
+ mSrlView.finishRefresh();
+ }
+
+ @Override
+ public void onComplete() {
+
+ }
+ });
}
private void buildBannerData() {
@@ -484,157 +538,157 @@ public class HomeFragment extends BaseFragment {
*/
private void getNewsTabs() {
RetrofitManager.getInstance()
- .create(HomeApi.class)
- .getNewsTabListByPid(PathConfig.NEWS_ID)
- .subscribeOn(Schedulers.io())
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe(new Observer>() {
- @Override
- public void onSubscribe(Disposable d) {
- }
+ .create(HomeApi.class)
+ .getNewsTabListByPid(PathConfig.NEWS_ID)
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(new Observer>() {
+ @Override
+ public void onSubscribe(Disposable d) {
+ }
- @Override
- public void onNext(List newsTabBeans) {
- if (newsTabBeans != null && newsTabBeans.size() > 0) {
- mIvNewsEmpty.setVisibility(View.GONE);
- Random random = new Random();
- int i = random.nextInt(newsTabBeans.size());
- if (TextUtils.isEmpty(UserLgUtils.getToken())) {
+ @Override
+ public void onNext(List newsTabBeans) {
+ if (newsTabBeans != null && newsTabBeans.size() > 0) {
+ mIvNewsEmpty.setVisibility(View.GONE);
+ Random random = new Random();
+ int i = random.nextInt(newsTabBeans.size());
+ if (TextUtils.isEmpty(UserLgUtils.getToken())) {
+
+ } else {
+ getNewsListByToken(newsTabBeans.get(i));
+ }
} else {
- getNewsListByToken(newsTabBeans.get(i));
+ if (mNewsSkeleton != null) {
+ mNewsSkeleton.hide();
+ }
+ mIvNewsEmpty.setVisibility(View.VISIBLE);
}
+ }
- } else {
+ @Override
+ public void onError(Throwable e) {
if (mNewsSkeleton != null) {
mNewsSkeleton.hide();
}
mIvNewsEmpty.setVisibility(View.VISIBLE);
}
- }
- @Override
- public void onError(Throwable e) {
- if (mNewsSkeleton != null) {
- mNewsSkeleton.hide();
+ @Override
+ public void onComplete() {
+
}
- mIvNewsEmpty.setVisibility(View.VISIBLE);
- }
-
- @Override
- public void onComplete() {
-
- }
- });
+ });
}
private void getNewsListByToken(NewsTabBean newsTabBean) {
RetrofitManager.getInstance()
- .create(HomeApi.class)
- .getNewsMainListByToken(newsTabBean.getNewsDirectoriesId(), "5", "1", UserLgUtils.getToken())
- .subscribeOn(Schedulers.io())
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe(new Observer() {
- @Override
- public void onSubscribe(Disposable d) {
+ .create(HomeApi.class)
+ .getNewsMainListByToken(newsTabBean.getNewsDirectoriesId(), "5", "1", UserLgUtils.getToken())
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(new Observer() {
+ @Override
+ public void onSubscribe(Disposable d) {
- }
+ }
- @Override
- public void onNext(NewsItemBean newsItemBean) {
- if (newsItemBean != null) {
- if (newsItemBean.getRows() != null) {
- if (newsItemBean.getRows().size() > 5) {
- mNewsBeans = newsItemBean.getRows().subList(0, 5);
- } else {
- mNewsBeans = newsItemBean.getRows();
- }
- if (newsItemBean.getRows().size() > 0) {
- mIvNewsEmpty.setVisibility(View.GONE);
+ @Override
+ public void onNext(NewsItemBean newsItemBean) {
+ if (newsItemBean != null) {
+ if (newsItemBean.getRows() != null) {
+ if (newsItemBean.getRows().size() > 5) {
+ mNewsBeans = newsItemBean.getRows().subList(0, 5);
+ } else {
+ mNewsBeans = newsItemBean.getRows();
+ }
+ if (newsItemBean.getRows().size() > 0) {
+ mIvNewsEmpty.setVisibility(View.GONE);
+ } else {
+ mIvNewsEmpty.setVisibility(View.VISIBLE);
+ }
} else {
mIvNewsEmpty.setVisibility(View.VISIBLE);
}
+ getCommentCount(1, newsItemBean);
+// TODO mMAdapter.setData(mNewsBeans);
} else {
mIvNewsEmpty.setVisibility(View.VISIBLE);
}
- getCommentCount(1, newsItemBean);
-// TODO mMAdapter.setData(mNewsBeans);
- } else {
+ if (mNewsSkeleton != null) {
+ mNewsSkeleton.hide();
+ }
+ }
+
+ @Override
+ public void onError(Throwable e) {
+ if (mNewsSkeleton != null) {
+ mNewsSkeleton.hide();
+ }
mIvNewsEmpty.setVisibility(View.VISIBLE);
}
- if (mNewsSkeleton != null) {
- mNewsSkeleton.hide();
+
+ @Override
+ public void onComplete() {
+
}
- }
-
- @Override
- public void onError(Throwable e) {
- if (mNewsSkeleton != null) {
- mNewsSkeleton.hide();
- }
- mIvNewsEmpty.setVisibility(View.VISIBLE);
- }
-
- @Override
- public void onComplete() {
-
- }
- });
+ });
}
private void getNewsList(NewsTabBean newsTabBean) {
//获取新闻
RetrofitManager.getInstance()
- .create(HomeApi.class)
- .getNewsTabListByPid(PathConfig.NEWS_ID, "5", "1")
- .subscribeOn(Schedulers.io())
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe(new Observer() {
- @Override
- public void onSubscribe(Disposable d) {
+ .create(HomeApi.class)
+ .getNewsTabListByPid(PathConfig.NEWS_ID, "5", "1")
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(new Observer() {
+ @Override
+ public void onSubscribe(Disposable d) {
- }
+ }
- @Override
- public void onNext(NewsItemBean newsItemBean) {
- if (newsItemBean != null) {
- if (newsItemBean.getRows() != null) {
- if (newsItemBean.getRows().size() > 5) {
- mNewsBeans = newsItemBean.getRows().subList(0, 5);
- } else {
- mNewsBeans = newsItemBean.getRows();
- }
- if (newsItemBean.getRows().size() > 0) {
- mIvNewsEmpty.setVisibility(View.GONE);
+ @Override
+ public void onNext(NewsItemBean newsItemBean) {
+ if (newsItemBean != null) {
+ if (newsItemBean.getRows() != null) {
+ if (newsItemBean.getRows().size() > 5) {
+ mNewsBeans = newsItemBean.getRows().subList(0, 5);
+ } else {
+ mNewsBeans = newsItemBean.getRows();
+ }
+ if (newsItemBean.getRows().size() > 0) {
+ mIvNewsEmpty.setVisibility(View.GONE);
+ } else {
+ mIvNewsEmpty.setVisibility(View.VISIBLE);
+ }
} else {
mIvNewsEmpty.setVisibility(View.VISIBLE);
}
+ getCommentCount(1, newsItemBean);
+// TODO mMAdapter.setData(mNewsBeans);
} else {
mIvNewsEmpty.setVisibility(View.VISIBLE);
}
- getCommentCount(1, newsItemBean);
-// TODO mMAdapter.setData(mNewsBeans);
- } else {
+ if (mNewsSkeleton != null) {
+ mNewsSkeleton.hide();
+ }
+ }
+
+ @Override
+ public void onError(Throwable e) {
+ if (mNewsSkeleton != null) {
+ mNewsSkeleton.hide();
+ }
mIvNewsEmpty.setVisibility(View.VISIBLE);
}
- if (mNewsSkeleton != null) {
- mNewsSkeleton.hide();
+
+ @Override
+ public void onComplete() {
+
}
- }
-
- @Override
- public void onError(Throwable e) {
- if (mNewsSkeleton != null) {
- mNewsSkeleton.hide();
- }
- mIvNewsEmpty.setVisibility(View.VISIBLE);
- }
-
- @Override
- public void onComplete() {
-
- }
- });
+ });
}
/**
@@ -652,42 +706,42 @@ public class HomeFragment extends BaseFragment {
}
}
RetrofitManager.getInstance()
- .create(HomeApi.class)
- .getNewsCommentNum(ids)
- .subscribeOn(Schedulers.io())
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe(new Observer>() {
- @Override
- public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
+ .create(HomeApi.class)
+ .getNewsCommentNum(ids)
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(new Observer>() {
+ @Override
+ public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
- }
+ }
- @Override
- public void onNext(@io.reactivex.annotations.NonNull List newsCommentCounts) {
- if (newsCommentCounts != null && newsCommentCounts.size() > 0) {
- for (int i = 0; i < newsCommentCounts.size(); i++) {
- for (int j = 0; j < newsItemBean.getRows().size(); j++) {
- if (newsItemBean.getRows().get(j).getNewsContentId().equals(newsCommentCounts.get(i).getNewsContentId())) {
- newsItemBean.getRows().get(j).setNewsContentCommentNumber(newsCommentCounts.get(i).getCommentCount());
+ @Override
+ public void onNext(@io.reactivex.annotations.NonNull List newsCommentCounts) {
+ if (newsCommentCounts != null && newsCommentCounts.size() > 0) {
+ for (int i = 0; i < newsCommentCounts.size(); i++) {
+ for (int j = 0; j < newsItemBean.getRows().size(); j++) {
+ if (newsItemBean.getRows().get(j).getNewsContentId().equals(newsCommentCounts.get(i).getNewsContentId())) {
+ newsItemBean.getRows().get(j).setNewsContentCommentNumber(newsCommentCounts.get(i).getCommentCount());
+ }
}
}
}
+ mNewsBeans = newsItemBean.getRows();
+ mMAdapter.setData(mNewsBeans);
}
- mNewsBeans = newsItemBean.getRows();
- mMAdapter.setData(mNewsBeans);
- }
- @Override
- public void onError(@io.reactivex.annotations.NonNull Throwable e) {
- mNewsBeans = newsItemBean.getRows();
- mMAdapter.setData(mNewsBeans);
- }
+ @Override
+ public void onError(@io.reactivex.annotations.NonNull Throwable e) {
+ mNewsBeans = newsItemBean.getRows();
+ mMAdapter.setData(mNewsBeans);
+ }
- @Override
- public void onComplete() {
+ @Override
+ public void onComplete() {
- }
- });
+ }
+ });
}
}
@@ -695,66 +749,68 @@ public class HomeFragment extends BaseFragment {
/**
* 构建首页按钮
*/
- private void buildMainFuncMenu() {
+ private void buildMainFuncMenu(List 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", "文化旅游")
- .navigation();
+ .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
diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/fragment/NewsFragment.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/fragment/NewsFragment.java
index a09a674..5ce2a23 100644
--- a/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/fragment/NewsFragment.java
+++ b/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())//评论是否可以上传图片
diff --git a/modulemain/src/main/res/layout/fragment_home.xml b/modulemain/src/main/res/layout/fragment_home.xml
index 6a72828..4f95548 100644
--- a/modulemain/src/main/res/layout/fragment_home.xml
+++ b/modulemain/src/main/res/layout/fragment_home.xml
@@ -18,7 +18,7 @@
@@ -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 @@
diff --git a/modulemain/src/main/res/layout/item_main_func_net.xml b/modulemain/src/main/res/layout/item_main_func_net.xml
new file mode 100644
index 0000000..574f99a
--- /dev/null
+++ b/modulemain/src/main/res/layout/item_main_func_net.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
diff --git a/modulemain/src/main/res/menu/bottom.xml b/modulemain/src/main/res/menu/bottom.xml
index c2cf039..2305643 100644
--- a/modulemain/src/main/res/menu/bottom.xml
+++ b/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="场馆" />
-
+
+
+
+