diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..61a9130
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..6c0b1fe
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c9e9684..7bfd76b 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -12,7 +12,7 @@
-
+
diff --git a/.idea/modules.xml b/.idea/modules.xml
index bc0f90d..0bb9b4b 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,17 +2,17 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/release/output.json b/app/release/output.json
index eac1060..df4d976 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":7,"versionName":"1.0.7","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release","dirName":""},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":10,"versionName":"1.1.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release","dirName":""},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/com/tengshisoft/cultural/wxapi/WXEntryActivity.java b/app/src/main/java/com/tengshisoft/cultural/wxapi/WXEntryActivity.java
index 52e8197..6143978 100644
--- a/app/src/main/java/com/tengshisoft/cultural/wxapi/WXEntryActivity.java
+++ b/app/src/main/java/com/tengshisoft/cultural/wxapi/WXEntryActivity.java
@@ -12,6 +12,6 @@ public class WXEntryActivity extends Activity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_w_x_entry);
-
+ finish();
}
}
diff --git a/app/src/main/res/drawable-xhdpi/app_logo.png b/app/src/main/res/drawable-xhdpi/app_logo.png
index 94f1cb7..c97ea2e 100644
Binary files a/app/src/main/res/drawable-xhdpi/app_logo.png and b/app/src/main/res/drawable-xhdpi/app_logo.png differ
diff --git a/build.gradle b/build.gradle
index fb6f66d..a360099 100644
--- a/build.gradle
+++ b/build.gradle
@@ -54,8 +54,8 @@ ext {
gCompileSdkVersion = 29
gMinSdkVersion = 16
gTargetSdkVersion = 29
- gVersionCode = 7
- gVersionName = '1.0.7'
+ gVersionCode = 10
+ gVersionName = '1.1.0'
gBuildToolsVersion = "29.0.2"
// gVersionCode=26
// gVersionName='1.3.0'
diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/RegexConstants.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/RegexConstants.java
index 783afed..0239ab5 100755
--- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/RegexConstants.java
+++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/RegexConstants.java
@@ -14,7 +14,7 @@ public final class RegexConstants {
* global star: 1349
* virtual operator: 170
*/
- public static final String REGEX_MOBILE_EXACT = "^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(16[6])|(17[0,1,3,5-8])|(18[0-9])|(19[8,9]))\\d{8}$";
+ public static final String REGEX_MOBILE_EXACT = "^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(16[6])|(17[0,1,3,5-8])|(18[0-9])|(19[0-9]))\\d{8}$";
public static final String REGEX_CAR_NUMBER = "^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[警京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼]{0,1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1}$";
/**
* Regex of telephone number.
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 f7dc58a..629ed09 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,8 +12,10 @@ 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 BASE_SYSTEM_IP = "https://www.wgink.ink/";
+// public static final String IP = "https://www.wgink.ink/usercenter/";/* 正式IP */
+ public static final String IP = "https://www.xzszwhy.cn/usercenter/";/* 正式IP */
+// public static final String BASE_SYSTEM_IP = "http://192.168.0.115:8082/";
+ public static final String BASE_SYSTEM_IP = "https://www.xzszwhy.cn/";
// 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;
@@ -30,11 +32,12 @@ public class BaseUrlApi {
public static final String TYPE_NAVIGATION = "456";//显示导航
public static final String TYPE_DEFAULT = "333";//默认
public static final String BASE_ACTIVIY_IP = BASE_SYSTEM_IP + "culturalactivity/";/* 活动URL */
- public static final String TEMP_IP = "http://192.168.0.111:8888/";
+ public static final String TEMP_IP = "http://192.168.0.109:8082/";
public static final String BASE_VOLUNTEER_IP = BASE_SYSTEM_IP + "volunteer/";/* 志愿者 */
public static final String BASE_LIVE_IP = BASE_SYSTEM_IP + "live/";
public static final String BASE_LIVE_URL = BASE_SYSTEM_IP;//直播回放视频url
public static final String BASE_PLACE_IP = BASE_SYSTEM_IP + "venuebooking/";/* 场馆 */
+// public static final String BASE_PLACE_IP = TEMP_IP + "venuebooking/";/* 场馆 */
public static final String BASE_PLACE_IMG_IP = BASE_PLACE_IP + "route/file/downloadfile/true/";/* 场馆 */
public static final String BASE_CULTURAL_IP = BASE_SYSTEM_IP + "culturalactivity/";/* 文化URL */
public static final String BASE_MINE = "http://192.168.0.108:8080/culturalactivity/";/* 我的URL */
diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/conver/BaseUrlInterceptor.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/conver/BaseUrlInterceptor.java
index 603eec9..a26a531 100755
--- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/conver/BaseUrlInterceptor.java
+++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/conver/BaseUrlInterceptor.java
@@ -1,7 +1,6 @@
package com.sucstepsoft.cm_utils.core.retrofit_net.conver;
-import com.sucstepsoft.cm_utils.constant.PathConfig;
import com.sucstepsoft.cm_utils.core.retrofit_net.BaseUrlApi;
import java.io.IOException;
diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/views/TypeFaceTextView.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/views/TypeFaceTextView.java
index 03bf1e2..11cc128 100644
--- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/views/TypeFaceTextView.java
+++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/views/TypeFaceTextView.java
@@ -36,8 +36,11 @@ public class TypeFaceTextView extends androidx.appcompat.widget.AppCompatTextVie
int type = a.getInteger(R.styleable.TypeFaceTextView_text_type_cus, 0);
if (type == 1) {
mTypeface = Typeface.createFromAsset(getContext().getAssets(), "fonts/zhangti.TTF");
- setTextSize(15);
- } else {
+ setTextSize(16);
+ } else if(type==2) {
+ mTypeface = Typeface.createFromAsset(getContext().getAssets(), "fonts/zhangti.TTF");
+ setTextSize(18);
+ }else{
mTypeface = Typeface.DEFAULT;
}
setTypeface(mTypeface);
@@ -46,8 +49,11 @@ public class TypeFaceTextView extends androidx.appcompat.widget.AppCompatTextVie
public void setTypeFaceType(int type) {
if (type == 1) {
mTypeface = Typeface.createFromAsset(getContext().getAssets(), "fonts/zhangti.TTF");
- setTextSize(15);
- } else {
+ setTextSize(16);
+ } else if(type==2) {
+ mTypeface = Typeface.createFromAsset(getContext().getAssets(), "fonts/zhangti.TTF");
+ setTextSize(18);
+ }else{
mTypeface = Typeface.DEFAULT;
}
setTypeface(mTypeface);
diff --git a/cm_utils/src/main/res/drawable-xhdpi/app_logo_smal.png b/cm_utils/src/main/res/drawable-xhdpi/app_logo_smal.png
index c47db45..7f95b8b 100644
Binary files a/cm_utils/src/main/res/drawable-xhdpi/app_logo_smal.png and b/cm_utils/src/main/res/drawable-xhdpi/app_logo_smal.png differ
diff --git a/cm_utils/src/main/res/layout/dialog_bottom_share.xml b/cm_utils/src/main/res/layout/dialog_bottom_share.xml
index e8055a0..500e7f8 100755
--- a/cm_utils/src/main/res/layout/dialog_bottom_share.xml
+++ b/cm_utils/src/main/res/layout/dialog_bottom_share.xml
@@ -72,7 +72,8 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
- android:orientation="vertical">
+ android:orientation="vertical"
+ android:visibility="gone">
@@ -44,6 +44,6 @@
android:layout_height="26dp"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
- android:scaleType="center"
+ android:scaleType="fitXY"
android:src="@drawable/ic_share" />
\ No newline at end of file
diff --git a/modulecultural/src/main/AndroidManifest.xml b/modulecultural/src/main/AndroidManifest.xml
index 822bf86..2a65f9c 100644
--- a/modulecultural/src/main/AndroidManifest.xml
+++ b/modulecultural/src/main/AndroidManifest.xml
@@ -2,6 +2,7 @@
+
diff --git a/modulecultural/src/main/java/com/tengshisoft/modulecultural/activitys/CulturalLiveDetailActivity.java b/modulecultural/src/main/java/com/tengshisoft/modulecultural/activitys/CulturalLiveDetailActivity.java
index be11e89..f7588b0 100644
--- a/modulecultural/src/main/java/com/tengshisoft/modulecultural/activitys/CulturalLiveDetailActivity.java
+++ b/modulecultural/src/main/java/com/tengshisoft/modulecultural/activitys/CulturalLiveDetailActivity.java
@@ -10,6 +10,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
import io.reactivex.schedulers.Schedulers;
+import android.app.AlertDialog;
import android.graphics.Color;
import android.os.Bundle;
import android.view.Gravity;
@@ -27,9 +28,12 @@ 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.BaseActivity;
import com.sucstepsoft.cm_utils.utils.ExceptionHandler;
+import com.sucstepsoft.cm_utils.utils.LogUtils;
+import com.sucstepsoft.cm_utils.utils.NetworkUtils;
import com.tengshisoft.modulecultural.R;
import com.tengshisoft.modulecultural.R2;
import com.tengshisoft.modulecultural.bean.CulturalLiveDetailBean;
+import com.tengshisoft.modulecultural.bean.LiveFilesBean;
import com.tengshisoft.modulecultural.net.CulturalApi;
import com.tengshisoft.moduleijkplayer.controller.CompleteView;
import com.tengshisoft.moduleijkplayer.controller.ErrorView;
@@ -159,7 +163,7 @@ public class CulturalLiveDetailActivity extends BaseActivity {
mVvPlayer.setUrl(bean.getLiveDeviceRtmpUrl());
mVvPlayer.addOnStateChangeListener(mOnStateChangeListener);
if ("2".equals(mType)) {
- mVvPlayer.start();
+ checkNetEn();
}
} else {
//未开始
@@ -173,6 +177,28 @@ public class CulturalLiveDetailActivity extends BaseActivity {
mTvTimeEnd.setText("预计结束:" + bean.getLivePlanEnd());
}
+ private void checkNetEn() {
+ NetworkUtils.NetworkType networkType = NetworkUtils.getNetworkType();
+ if (networkType != NetworkUtils.NetworkType.NETWORK_WIFI) {
+ showNetHint();
+ } else {
+ mVvPlayer.start();
+ }
+ }
+
+ private void showNetHint() {
+ AlertDialog.Builder builder = new AlertDialog.Builder(mActivity);
+ builder.setTitle("提示")
+ .setMessage("当前网络环境非Wifi,播放视频需要消耗流量,是否要继续播放")
+ .setNegativeButton("取消", (dialog, which) -> dialog.dismiss())
+ .setPositiveButton("确定", (dialog, which) -> {
+ dialog.dismiss();
+ mVvPlayer.start();
+ })
+ .create()
+ .show();
+ }
+
private VideoView.OnStateChangeListener mOnStateChangeListener = new VideoView.SimpleOnStateChangeListener() {
@Override
public void onPlayerStateChanged(int playerState) {
diff --git a/modulecultural/src/main/java/com/tengshisoft/modulecultural/activitys/LookBackListActivity.java b/modulecultural/src/main/java/com/tengshisoft/modulecultural/activitys/LookBackListActivity.java
index 4b25b14..c1bd23b 100644
--- a/modulecultural/src/main/java/com/tengshisoft/modulecultural/activitys/LookBackListActivity.java
+++ b/modulecultural/src/main/java/com/tengshisoft/modulecultural/activitys/LookBackListActivity.java
@@ -1,5 +1,7 @@
package com.tengshisoft.modulecultural.activitys;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
import android.content.pm.ActivityInfo;
import android.graphics.Color;
import android.nfc.Tag;
@@ -17,6 +19,7 @@ import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity;
import com.sucstepsoft.cm_utils.core.widget.views.ItemSplitDivider;
import com.sucstepsoft.cm_utils.utils.ExceptionHandler;
import com.sucstepsoft.cm_utils.utils.LogUtils;
+import com.sucstepsoft.cm_utils.utils.NetworkUtils;
import com.sucstepsoft.cm_utils.utils.Utils;
import com.tengshisoft.modulecultural.R;
import com.tengshisoft.modulecultural.R2;
@@ -67,6 +70,7 @@ public class LookBackListActivity extends BaseActivity {
protected ErrorView mErrorView;
protected CompleteView mCompleteView;
protected TitleView mTitleView;
+ private boolean isPlay = false;
/**
* 当前播放的位置
@@ -88,7 +92,7 @@ public class LookBackListActivity extends BaseActivity {
mAdapter = new VideoRecyclerViewAdapter(mActivity, mVideoDatas);
mLinearLayoutManager = new LinearLayoutManager(mActivity, LinearLayoutManager.VERTICAL, false);
mRlvLiveFiles.setLayoutManager(mLinearLayoutManager);
- mAdapter.addItemPlayListener(this::showLiveDetail);
+ mAdapter.addItemPlayListener(this::checkNetEn);
mSrlLiveFiles.setOnRefreshListener(refreshLayout -> refreshData());
mSrlLiveFiles.setOnLoadMoreListener(refreshLayout -> loadMoreData());
mRlvLiveFiles.setAdapter(mAdapter);
@@ -110,6 +114,35 @@ public class LookBackListActivity extends BaseActivity {
getLiveFileList(mCurrentPage);
}
+ private void checkNetEn(LiveFilesBean.RowsBean rowsBean, int position) {
+ NetworkUtils.NetworkType networkType = NetworkUtils.getNetworkType();
+ LogUtils.e(networkType.name());
+ if (networkType != NetworkUtils.NetworkType.NETWORK_WIFI) {
+ if (isPlay) {
+ showLiveDetail(rowsBean, position);
+ } else {
+ showNetHint(rowsBean, position);
+ }
+ } else {
+ showLiveDetail(rowsBean, position);
+
+ }
+ }
+
+ private void showNetHint(LiveFilesBean.RowsBean rowsBean, int position) {
+ AlertDialog.Builder builder = new AlertDialog.Builder(mActivity);
+ builder.setTitle("提示")
+ .setMessage("当前网络环境非Wifi,播放视频需要消耗流量,是否要继续播放")
+ .setNegativeButton("取消", (dialog, which) -> dialog.dismiss())
+ .setPositiveButton("确定", (dialog, which) -> {
+ isPlay = true;
+ dialog.dismiss();
+ showLiveDetail(rowsBean, position);
+ })
+ .create()
+ .show();
+ }
+
private void showLiveDetail(LiveFilesBean.RowsBean rowsBean, int position) {
startPlay(position);
}
diff --git a/modulecultural/src/main/java/com/tengshisoft/modulecultural/adapter/ShareLiveAdapter.java b/modulecultural/src/main/java/com/tengshisoft/modulecultural/adapter/ShareLiveAdapter.java
index 70de4ef..26a54b7 100644
--- a/modulecultural/src/main/java/com/tengshisoft/modulecultural/adapter/ShareLiveAdapter.java
+++ b/modulecultural/src/main/java/com/tengshisoft/modulecultural/adapter/ShareLiveAdapter.java
@@ -9,8 +9,13 @@ import android.view.ViewGroup;
import com.baidu.mapapi.map.TextureMapView;
import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.bumptech.glide.request.RequestOptions;
import com.sucstepsoft.cm_utils.core.retrofit_net.BaseUrlApi;
import com.sucstepsoft.cm_utils.core.widget.base.BaseRecyclerAdapter;
+import com.sucstepsoft.cm_utils.core.widget.base.GlideRoundTransform;
+import com.sucstepsoft.cm_utils.core.widget.base.RoundedCornersTransform;
+import com.sucstepsoft.cm_utils.utils.ConvertUtils;
import com.tengshisoft.modulecultural.R;
import com.tengshisoft.modulecultural.bean.CulturalLiveBean;
import com.tengshisoft.modulecultural.holder.ShareLiveHolder;
@@ -26,6 +31,14 @@ import java.util.List;
public class ShareLiveAdapter extends BaseRecyclerAdapter {
public ShareLiveAdapter(Context ctx, List list) {
super(ctx, list);
+ RoundedCornersTransform roundedCornersTransform = new RoundedCornersTransform(mContext, ConvertUtils.dp2px(5));
+ roundedCornersTransform.setNeedCorner(true, true, true, true);
+ options = new RequestOptions()
+ .override(500, 500)
+ .error(com.sucstepsoft.cm_utils.R.drawable.ic_img_default)
+ .placeholder(com.sucstepsoft.cm_utils.R.drawable.ic_img_default)
+ .transform(roundedCornersTransform)
+ .diskCacheStrategy(DiskCacheStrategy.NONE);
}
@Override
@@ -51,7 +64,12 @@ public class ShareLiveAdapter extends BaseRecyclerAdapter
diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsDetailActivity.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsDetailActivity.java
index 6bf610d..f142990 100644
--- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsDetailActivity.java
+++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsDetailActivity.java
@@ -1,37 +1,28 @@
package com.tengshisoft.mudulemain.cultural.activitys.news;
-import android.annotation.SuppressLint;
import android.app.AlertDialog;
import android.app.ProgressDialog;
-import android.content.DialogInterface;
import android.content.Intent;
import android.database.Cursor;
import android.graphics.Color;
-import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.net.http.SslError;
-import android.net.nsd.NsdManager;
import android.os.Build;
import android.os.Environment;
import android.provider.MediaStore;
import android.text.TextUtils;
import android.view.Gravity;
-import android.view.MotionEvent;
import android.view.View;
-import android.view.ViewGroup;
import android.webkit.HttpAuthHandler;
import android.webkit.JsResult;
import android.webkit.SslErrorHandler;
import android.webkit.WebChromeClient;
-import android.webkit.WebResourceError;
-import android.webkit.WebResourceRequest;
import android.webkit.WebSettings;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
-import android.widget.ShareActionProvider;
import android.widget.TextView;
import com.alibaba.android.arouter.facade.annotation.Route;
@@ -74,13 +65,11 @@ import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
-import java.util.concurrent.ExecutionException;
import androidx.core.content.FileProvider;
import androidx.core.widget.NestedScrollView;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
-import butterknife.BindInt;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;
@@ -89,17 +78,14 @@ import cn.jiguang.share.android.api.PlatActionListener;
import cn.jiguang.share.android.api.Platform;
import cn.jiguang.share.android.api.ShareParams;
import cn.jiguang.share.qqmodel.QQ;
-import cn.jiguang.share.wechat.WeChatHandleActivity;
import cn.jiguang.share.wechat.Wechat;
import cn.jiguang.share.wechat.WechatMoments;
import cn.jiguang.share.weibo.SinaWeibo;
import io.reactivex.Observable;
-import io.reactivex.ObservableEmitter;
import io.reactivex.ObservableOnSubscribe;
import io.reactivex.Observer;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers;
import okhttp3.MediaType;
import okhttp3.MultipartBody;
@@ -252,7 +238,7 @@ public class NewsDetailActivity extends BaseActivity {
@Override
public boolean shouldOverrideUrlLoading(WebView view, String url) {
- if (url.contains("https://www.wgink.ink/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)
diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsListActivity.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsListActivity.java
index 6f03558..6814f5b 100644
--- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsListActivity.java
+++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsListActivity.java
@@ -23,6 +23,7 @@ import com.tengshisoft.mudulemain.R;
import com.tengshisoft.mudulemain.R2;
import com.tengshisoft.mudulemain.cultural.adapter.NewsAdapter;
import com.tengshisoft.mudulemain.cultural.adapter.NewsMenuAdapter;
+import com.tengshisoft.mudulemain.cultural.beans.NewsCommentCount;
import com.tengshisoft.mudulemain.cultural.beans.NewsItemBean;
import com.tengshisoft.mudulemain.cultural.beans.NewsTabBean;
import com.tengshisoft.mudulemain.cultural.fragment.HomeFragment;
@@ -32,7 +33,6 @@ import com.tengshisoft.mudulemain.cultural.net.HomeApi;
import java.util.ArrayList;
import java.util.List;
-import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.recyclerview.widget.GridLayoutManager;
@@ -46,6 +46,7 @@ import butterknife.ButterKnife;
import butterknife.Unbinder;
import io.reactivex.Observer;
import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.annotations.NonNull;
import io.reactivex.disposables.Disposable;
import io.reactivex.schedulers.Schedulers;
@@ -126,17 +127,22 @@ public class NewsListActivity extends BaseActivity {
if (page == 1) {
if (newsItemBean != null && newsItemBean.getRows().size() > 0) {
mTotalPage = newsItemBean.getTotal();
- mNewsDatas = newsItemBean.getRows();
- mAdapter.setData(mNewsDatas);
- refreshView(STATE_LOAD_SUCCESS);
+
+ //TODO 获取评论数量
+// mNewsDatas = newsItemBean.getRows();
+// mAdapter.setData(mNewsDatas);
+// refreshView(STATE_LOAD_SUCCESS);
+ getCommentCount(1, newsItemBean);
} else {
refreshView(STATE_LOAD_EMPTY);
}
mSrlContent.finishRefresh();
} else {
if (newsItemBean != null) {
- mNewsDatas.addAll(newsItemBean.getRows());
- mAdapter.setData(mNewsDatas);
+ //TODO 获取评论数
+// mNewsDatas.addAll(newsItemBean.getRows());
+// mAdapter.setData(mNewsDatas);
+ getCommentCount(2, newsItemBean);
mSrlContent.finishLoadMore();
} else {
mSrlContent.setNoMoreData(true);
@@ -162,6 +168,87 @@ public class NewsListActivity extends BaseActivity {
});
}
+ /**
+ * 获取评论数
+ * i :1 首次加载 2加载更多
+ */
+ private void getCommentCount(int type, NewsItemBean newsItemBean) {
+ if (newsItemBean.getRows() != null && newsItemBean.getRows().size() > 0) {
+ String ids = "";
+ for (int i = 0; i < newsItemBean.getRows().size(); i++) {
+ if (i == newsItemBean.getRows().size() - 1) {
+ ids += newsItemBean.getRows().get(i).getNewsContentId();
+ } else {
+ ids += newsItemBean.getRows().get(i).getNewsContentId() + "_";
+ }
+ }
+ RetrofitManager.getInstance()
+ .create(HomeApi.class)
+ .getNewsCommentNum(ids)
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(new Observer>() {
+ @Override
+ public void onSubscribe(@NonNull Disposable d) {
+
+ }
+
+ @Override
+ public void onNext(@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());
+ }
+ }
+ }
+ if (type == 1) {
+ //首次加载
+ mNewsDatas = newsItemBean.getRows();
+ mAdapter.setData(mNewsDatas);
+ refreshView(STATE_LOAD_SUCCESS);
+ } else if (type == 2) {
+ //加载更多
+ mNewsDatas.addAll(newsItemBean.getRows());
+ mAdapter.setData(mNewsDatas);
+ }
+ } else {
+ if (type == 1) {
+ //首次加载
+ mNewsDatas = newsItemBean.getRows();
+ mAdapter.setData(mNewsDatas);
+ refreshView(STATE_LOAD_SUCCESS);
+ } else if (type == 2) {
+ //加载更多
+ mNewsDatas.addAll(newsItemBean.getRows());
+ mAdapter.setData(mNewsDatas);
+ }
+ }
+ }
+
+ @Override
+ public void onError(@NonNull Throwable e) {
+ if (type == 1) {
+ //首次加载
+ mNewsDatas = newsItemBean.getRows();
+ mAdapter.setData(mNewsDatas);
+ refreshView(STATE_LOAD_SUCCESS);
+ } else if (type == 2) {
+ //加载更多
+ mNewsDatas.addAll(newsItemBean.getRows());
+ mAdapter.setData(mNewsDatas);
+ }
+ }
+
+ @Override
+ public void onComplete() {
+
+ }
+ });
+ }
+ }
+
private void showNewsDetail(NewsItemBean.RowsBean rowsBean, int type) {
String url = "";
@@ -212,17 +299,19 @@ public class NewsListActivity extends BaseActivity {
if (page == 1) {
if (newsItemBean != null && newsItemBean.getRows().size() > 0) {
mTotalPage = newsItemBean.getTotal();
- mNewsDatas = newsItemBean.getRows();
- mAdapter.setData(mNewsDatas);
- refreshView(STATE_LOAD_SUCCESS);
+// mNewsDatas = newsItemBean.getRows();
+// mAdapter.setData(mNewsDatas);
+// refreshView(STATE_LOAD_SUCCESS);
+ getCommentCount(1, newsItemBean);
} else {
refreshView(STATE_LOAD_EMPTY);
}
mSrlContent.finishRefresh();
} else {
if (newsItemBean != null) {
- mNewsDatas.addAll(newsItemBean.getRows());
- mAdapter.setData(mNewsDatas);
+// mNewsDatas.addAll(newsItemBean.getRows());
+// mAdapter.setData(mNewsDatas);
+ getCommentCount(2, newsItemBean);
mSrlContent.finishLoadMore();
} else {
mSrlContent.setNoMoreData(true);
diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/LiveAdapter.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/LiveAdapter.java
index 8274136..1deba37 100644
--- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/LiveAdapter.java
+++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/LiveAdapter.java
@@ -10,6 +10,7 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.request.RequestOptions;
import com.sucstepsoft.cm_utils.core.retrofit_net.BaseUrlApi;
import com.sucstepsoft.cm_utils.core.widget.base.BaseRecyclerAdapter;
+import com.sucstepsoft.cm_utils.core.widget.base.GlideRoundTransform;
import com.sucstepsoft.cm_utils.core.widget.base.RoundedCornersTransform;
import com.sucstepsoft.cm_utils.utils.ConvertUtils;
import com.tengshisoft.mudulemain.R;
@@ -48,7 +49,12 @@ public class LiveAdapter extends BaseRecyclerAdapter {
Glide.with(mContext)
.asBitmap()
.load(BaseUrlApi.BASE_LIVE_IMG_IP + mData.get(i).getUrl())
- .apply(options)
+ .apply(new RequestOptions()
+ .error(com.sucstepsoft.cm_utils.R.drawable.ic_img_default_banner)
+ .placeholder(com.sucstepsoft.cm_utils.R.drawable.ic_img_default_banner)
+ .transform(new GlideRoundTransform(mContext, 5))
+ .fitCenter()
+ .diskCacheStrategy(DiskCacheStrategy.NONE))
.into(liveHolder.mIvImg);
liveHolder.mTvTitle.setText(mData.get(i).getTitle());
if ("1".equals(mData.get(i).getType())) {
diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/NewsAdapter.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/NewsAdapter.java
index e46c157..6ac9dbd 100644
--- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/NewsAdapter.java
+++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/NewsAdapter.java
@@ -16,11 +16,15 @@ import android.webkit.WebView;
import android.webkit.WebViewClient;
import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.MultiTransformation;
+import com.bumptech.glide.load.resource.bitmap.FitCenter;
import com.bumptech.glide.request.RequestOptions;
import com.sucstepsoft.cm_utils.constant.PathConfig;
import com.sucstepsoft.cm_utils.core.retrofit_net.BaseUrlApi;
import com.sucstepsoft.cm_utils.core.widget.base.BaseRecyclerAdapter;
import com.sucstepsoft.cm_utils.core.widget.base.GlideRoundTransform;
+import com.sucstepsoft.cm_utils.core.widget.base.RoundedCornersTransform;
+import com.sucstepsoft.cm_utils.utils.ConvertUtils;
import com.sucstepsoft.cm_utils.utils.LogUtils;
import com.tengshisoft.mudulemain.R;
import com.tengshisoft.mudulemain.cultural.beans.NewsItemBean;
@@ -46,10 +50,14 @@ public class NewsAdapter extends BaseRecyclerAdapter list) {
super(ctx, list);
+ RoundedCornersTransform roundedCornersTransform = new RoundedCornersTransform(mContext, ConvertUtils.dp2px(2));
+ roundedCornersTransform.setNeedCorner(true, true, true, true);
mPicOptions = new RequestOptions()
- .transform(new GlideRoundTransform(mContext, 2))
+ .transform(roundedCornersTransform)
.error(R.drawable.ic_img_default)
.placeholder(R.drawable.ic_img_default);
+
+
}
@Override
diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/NewsCommentCount.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/NewsCommentCount.java
new file mode 100644
index 0000000..3380d49
--- /dev/null
+++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/NewsCommentCount.java
@@ -0,0 +1,28 @@
+package com.tengshisoft.mudulemain.cultural.beans;
+
+/**
+ * 作者: adam
+ * 日期: 1/4/21 - 5:29 PM
+ * 邮箱: itgaojian@163.com
+ * 描述:
+ */
+public class NewsCommentCount {
+ private String newsContentId;
+ private int count;
+
+ public String getNewsContentId() {
+ return newsContentId;
+ }
+
+ public void setNewsContentId(String newsContentId) {
+ this.newsContentId = newsContentId;
+ }
+
+ public int getCommentCount() {
+ return count;
+ }
+
+ public void setCommentCount(int commentCount) {
+ this.count = commentCount;
+ }
+}
diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/HomeFragment.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/HomeFragment.java
index 2ed516e..b8f736e 100644
--- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/HomeFragment.java
+++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/HomeFragment.java
@@ -36,6 +36,7 @@ import com.tengshisoft.mudulemain.cultural.adapter.NewsAdapter;
import com.tengshisoft.mudulemain.cultural.beans.LiveBean;
import com.tengshisoft.mudulemain.cultural.beans.MainCommendBean;
import com.tengshisoft.mudulemain.cultural.beans.MainFuncBean;
+import com.tengshisoft.mudulemain.cultural.beans.NewsCommentCount;
import com.tengshisoft.mudulemain.cultural.beans.NewsItemBean;
import com.tengshisoft.mudulemain.cultural.beans.NewsTabBean;
import com.tengshisoft.mudulemain.cultural.net.HomeApi;
@@ -534,7 +535,8 @@ public class HomeFragment extends BaseFragment {
} else {
mIvNewsEmpty.setVisibility(View.VISIBLE);
}
- mMAdapter.setData(mNewsBeans);
+ getCommentCount(1, newsItemBean);
+// TODO mMAdapter.setData(mNewsBeans);
} else {
mIvNewsEmpty.setVisibility(View.VISIBLE);
}
@@ -588,7 +590,8 @@ public class HomeFragment extends BaseFragment {
} else {
mIvNewsEmpty.setVisibility(View.VISIBLE);
}
- mMAdapter.setData(mNewsBeans);
+ getCommentCount(1, newsItemBean);
+// TODO mMAdapter.setData(mNewsBeans);
} else {
mIvNewsEmpty.setVisibility(View.VISIBLE);
}
@@ -612,6 +615,61 @@ public class HomeFragment extends BaseFragment {
});
}
+ /**
+ * 获取评论数
+ * i :1 首次加载 2加载更多
+ */
+ private void getCommentCount(int type, NewsItemBean newsItemBean) {
+ if (newsItemBean.getRows() != null && newsItemBean.getRows().size() > 0) {
+ String ids = "";
+ for (int i = 0; i < newsItemBean.getRows().size(); i++) {
+ if (i == newsItemBean.getRows().size() - 1) {
+ ids += newsItemBean.getRows().get(i).getNewsContentId();
+ } else {
+ ids += newsItemBean.getRows().get(i).getNewsContentId() + "_";
+ }
+ }
+ 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) {
+
+ }
+
+ @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);
+ }
+
+ @Override
+ public void onError(@io.reactivex.annotations.NonNull Throwable e) {
+ mNewsBeans = newsItemBean.getRows();
+ mMAdapter.setData(mNewsBeans);
+ }
+
+ @Override
+ public void onComplete() {
+
+ }
+ });
+
+ }
+ }
+
/**
* 构建首页按钮
*/
diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/NewsFragment.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/NewsFragment.java
index c678080..52a677a 100644
--- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/NewsFragment.java
+++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/NewsFragment.java
@@ -20,6 +20,7 @@ import com.tengshisoft.mudulemain.R;
import com.tengshisoft.mudulemain.R2;
import com.tengshisoft.mudulemain.cultural.adapter.NewsAdapter;
import com.tengshisoft.mudulemain.cultural.adapter.NewsMenuAdapter;
+import com.tengshisoft.mudulemain.cultural.beans.NewsCommentCount;
import com.tengshisoft.mudulemain.cultural.beans.NewsItemBean;
import com.tengshisoft.mudulemain.cultural.beans.NewsTabBean;
import com.tengshisoft.mudulemain.cultural.net.HomeApi;
@@ -36,6 +37,7 @@ import butterknife.ButterKnife;
import butterknife.Unbinder;
import io.reactivex.Observer;
import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.annotations.NonNull;
import io.reactivex.disposables.Disposable;
import io.reactivex.schedulers.Schedulers;
@@ -156,17 +158,19 @@ public class NewsFragment extends BaseFragment {
if (page == 1) {
if (newsItemBean != null && newsItemBean.getRows().size() > 0) {
mTotalPage = newsItemBean.getTotal();
- mNewsDatas = newsItemBean.getRows();
- mAdapter.setData(mNewsDatas);
- setStateView(STATE_SUCCESS);
+ getCommentCount(1, newsItemBean);
+// mNewsDatas = newsItemBean.getRows();
+// mAdapter.setData(mNewsDatas);
+// setStateView(STATE_SUCCESS);
} else {
setStateView(STATE_EMPTY);
}
mSrlView.finishRefresh();
} else {
if (newsItemBean != null) {
- mNewsDatas.addAll(newsItemBean.getRows());
- mAdapter.setData(mNewsDatas);
+// mNewsDatas.addAll(newsItemBean.getRows());
+// mAdapter.setData(mNewsDatas);
+ getCommentCount(2, newsItemBean);
mSrlView.finishLoadMore();
} else {
mSrlView.setNoMoreData(true);
@@ -262,17 +266,19 @@ public class NewsFragment extends BaseFragment {
if (page == 1) {
if (newsItemBean != null && newsItemBean.getRows().size() > 0) {
mTotalPage = newsItemBean.getTotal();
- mNewsDatas = newsItemBean.getRows();
- mAdapter.setData(mNewsDatas);
- setStateView(STATE_SUCCESS);
+ getCommentCount(1, newsItemBean);
+// mNewsDatas = newsItemBean.getRows();
+// mAdapter.setData(mNewsDatas);
+// setStateView(STATE_SUCCESS);
} else {
setStateView(STATE_EMPTY);
}
mSrlView.finishRefresh();
} else {
if (newsItemBean != null) {
- mNewsDatas.addAll(newsItemBean.getRows());
- mAdapter.setData(mNewsDatas);
+ getCommentCount(2, newsItemBean);
+// mNewsDatas.addAll(newsItemBean.getRows());
+// mAdapter.setData(mNewsDatas);
mSrlView.finishLoadMore();
} else {
mSrlView.setNoMoreData(true);
@@ -326,6 +332,87 @@ public class NewsFragment extends BaseFragment {
super.onDestroyView();
}
+ /**
+ * 获取评论数
+ * i :1 首次加载 2加载更多
+ */
+ private void getCommentCount(int type, NewsItemBean newsItemBean) {
+ if (newsItemBean.getRows() != null && newsItemBean.getRows().size() > 0) {
+ String ids = "";
+ for (int i = 0; i < newsItemBean.getRows().size(); i++) {
+ if (i == newsItemBean.getRows().size() - 1) {
+ ids += newsItemBean.getRows().get(i).getNewsContentId();
+ } else {
+ ids += newsItemBean.getRows().get(i).getNewsContentId() + "_";
+ }
+ }
+ RetrofitManager.getInstance()
+ .create(HomeApi.class)
+ .getNewsCommentNum(ids)
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(new Observer>() {
+ @Override
+ public void onSubscribe(@NonNull Disposable d) {
+
+ }
+
+ @Override
+ public void onNext(@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());
+ }
+ }
+ }
+ if (type == 1) {
+ //首次加载
+ mNewsDatas = newsItemBean.getRows();
+ mAdapter.setData(mNewsDatas);
+ setStateView(STATE_SUCCESS);
+ } else if (type == 2) {
+ //加载更多
+ mNewsDatas.addAll(newsItemBean.getRows());
+ mAdapter.setData(mNewsDatas);
+ }
+ } else {
+ if (type == 1) {
+ //首次加载
+ mNewsDatas = newsItemBean.getRows();
+ mAdapter.setData(mNewsDatas);
+ setStateView(STATE_SUCCESS);
+ } else if (type == 2) {
+ //加载更多
+ mNewsDatas.addAll(newsItemBean.getRows());
+ mAdapter.setData(mNewsDatas);
+ }
+ }
+ }
+
+ @Override
+ public void onError(@NonNull Throwable e) {
+ if (type == 1) {
+ //首次加载
+ mNewsDatas = newsItemBean.getRows();
+ mAdapter.setData(mNewsDatas);
+ setStateView(STATE_SUCCESS);
+ } else if (type == 2) {
+ //加载更多
+ mNewsDatas.addAll(newsItemBean.getRows());
+ mAdapter.setData(mNewsDatas);
+ }
+ }
+
+ @Override
+ public void onComplete() {
+
+ }
+ });
+ }
+ }
+
@Override
protected void loadMoreData() {
if (mNewsDatas.size() < mTotalPage) {
diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/net/HomeApi.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/net/HomeApi.java
index 5c89356..c4a7323 100644
--- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/net/HomeApi.java
+++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/net/HomeApi.java
@@ -8,6 +8,7 @@ import com.tengshisoft.moduleplace.beans.PlaceListBean;
import com.tengshisoft.mudulemain.cultural.beans.AreaListBean;
import com.tengshisoft.mudulemain.cultural.beans.BaseUserBean;
import com.tengshisoft.mudulemain.cultural.beans.CommentListBean;
+import com.tengshisoft.mudulemain.cultural.beans.NewsCommentCount;
import com.tengshisoft.mudulemain.cultural.beans.NewsItemBean;
import com.tengshisoft.mudulemain.cultural.beans.NewsTabBean;
import com.tengshisoft.mudulemain.cultural.beans.SearchBean;
@@ -127,6 +128,13 @@ public interface HomeApi {
@GET("app/newscontent/listpagenewscontentrelease")
Observable getNewsList(@Query("newsDirectoriesId") String newsDirectoriesId, @Query("page") String page);
+ /**
+ * 获取新闻评论数量,多个新闻ID用下划线隔开(id_id_id)
+ */
+ @Headers({"base_url_name:news", "Content-Type:application/json", "Accept:application/json"})
+ @GET("app/newscomment/getcountbynewscontentidsrelease/{newsIds}")
+ Observable> getNewsCommentNum(@Path("newsIds") String newsIds);
+
/**
* 获取新闻列表-不需要token
*/
diff --git a/modulemain/src/main/res/drawable-xhdpi/ic_play_item.png b/modulemain/src/main/res/drawable-xhdpi/ic_play_item.png
index 879d080..2bf5e82 100644
Binary files a/modulemain/src/main/res/drawable-xhdpi/ic_play_item.png and b/modulemain/src/main/res/drawable-xhdpi/ic_play_item.png differ
diff --git a/modulemain/src/main/res/layout/fragment_home.xml b/modulemain/src/main/res/layout/fragment_home.xml
index 9d795e1..01d42ef 100644
--- a/modulemain/src/main/res/layout/fragment_home.xml
+++ b/modulemain/src/main/res/layout/fragment_home.xml
@@ -76,7 +76,7 @@
android:padding="8dp"
android:text="精彩推荐"
android:textColor="@color/app_title_9f_no"
- android:textSize="16sp"
+ android:textSize="18sp"
app:text_type_cus="1" />
+ android:textSize="18sp"
+ app:text_type_cus="2" />
+ android:textSize="18sp"
+ app:text_type_cus="2" />
\ No newline at end of file
diff --git a/modulemain/src/main/res/layout/item_news_multi_pic.xml b/modulemain/src/main/res/layout/item_news_multi_pic.xml
index 13efa0d..30f47c1 100644
--- a/modulemain/src/main/res/layout/item_news_multi_pic.xml
+++ b/modulemain/src/main/res/layout/item_news_multi_pic.xml
@@ -52,6 +52,7 @@
@@ -61,7 +62,7 @@
android:layout_height="wrap_content"
android:maxLength="10"
android:textColor="@color/gray_text"
- android:textSize="10sp"
+ android:textSize="12sp"
tools:text="新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源" />
@@ -31,7 +32,7 @@
android:layout_height="wrap_content"
android:maxLength="10"
android:textColor="@color/gray_text"
- android:textSize="10sp"
+ android:textSize="12sp"
tools:text="新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源" />
@@ -43,6 +43,7 @@
@@ -52,7 +53,7 @@
android:layout_height="wrap_content"
android:maxLength="10"
android:textColor="@color/gray_text"
- android:textSize="10sp"
+ android:textSize="12sp"
tools:text="新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源" />
+ android:orientation="horizontal">
+ >
\ No newline at end of file
diff --git a/modulemain/src/main/res/layout/item_news_voice.xml b/modulemain/src/main/res/layout/item_news_voice.xml
index 55fdf44..12bb840 100644
--- a/modulemain/src/main/res/layout/item_news_voice.xml
+++ b/modulemain/src/main/res/layout/item_news_voice.xml
@@ -21,7 +21,7 @@
@@ -32,7 +32,7 @@
android:layout_centerVertical="true"
android:maxLength="10"
android:textColor="@color/gray_text"
- android:textSize="10sp"
+ android:textSize="12sp"
tools:text="新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源" />
12sp
12sp
- 14sp
+ 15sp
\ No newline at end of file
diff --git a/modulemine/src/main/res/layout/fragment_mine_main.xml b/modulemine/src/main/res/layout/fragment_mine_main.xml
index e69f6d1..b31d358 100644
--- a/modulemine/src/main/res/layout/fragment_mine_main.xml
+++ b/modulemine/src/main/res/layout/fragment_mine_main.xml
@@ -92,7 +92,8 @@
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+
diff --git a/moduleplace/src/main/res/layout/activity_place_list.xml b/moduleplace/src/main/res/layout/activity_place_list.xml
index 89fef4c..18e7a00 100644
--- a/moduleplace/src/main/res/layout/activity_place_list.xml
+++ b/moduleplace/src/main/res/layout/activity_place_list.xml
@@ -9,7 +9,7 @@
+ android:layout_height="match_parent">
+ android:textSize="16sp" />
+ android:textSize="16sp" />
+ android:textSize="16sp" />
+ android:textSize="16sp" />
diff --git a/readme.md b/readme.md
index eb02c13..a6e311a 100644
--- a/readme.md
+++ b/readme.md
@@ -2,3 +2,13 @@
> 1修复微信分享,添加微信朋友圈分享
>
>2 修改新闻布局(条目标题行宽)
+
+>3 修改App-logo 我的中添加服务专线
+
+## 2020-12-23 修改内容
+> 1修改域名
+> 2电话号码校验正则添加191号段
+>
+## 2021-1-5 修改内容
+> 1 新闻条目字体大小
+> 2 新闻列表评论数量与条目信息拆分