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

显示优化

Browse Source
This commit is contained in:
itgaojian 2021-01-05 16:22:31 +08:00
parent 4467e26be2
commit 27c4b092a1
43 changed files with 535 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.idea/compiler.xml Normal file
View File

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

35
.idea/jarRepositories.xml Normal file
View File

@ -0,0 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RemoteRepositoriesConfiguration">
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Maven Central repository" />
<option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="jboss.community" />
<option name="name" value="JBoss Community repository" />
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
</remote-repository>
<remote-repository>
<option name="id" value="BintrayJCenter" />
<option name="name" value="BintrayJCenter" />
<option name="url" value="https://jcenter.bintray.com/" />
</remote-repository>
<remote-repository>
<option name="id" value="maven" />
<option name="name" value="maven" />
<option name="url" value="https://jitpack.io" />
</remote-repository>
<remote-repository>
<option name="id" value="Google" />
<option name="name" value="Google" />
<option name="url" value="https://dl.google.com/dl/android/maven2/" />
</remote-repository>
<remote-repository>
<option name="id" value="MavenLocal" />
<option name="name" value="MavenLocal" />
<option name="url" value="file:$USER_HOME$/.m2/repository" />
</remote-repository>
</component>
</project>

2
.idea/misc.xml
View File

@ -12,7 +12,7 @@
<option name="OPTION_DOCUMENT_TAG_AUTHOR" value="true" />
<option name="OPTION_DOCUMENT_TAG_VERSION" value="true" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

22
.idea/modules.xml
View File

@ -2,17 +2,17 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" group="cultural/app" />
<module fileurl="file://$PROJECT_DIR$/camera/camera.iml" filepath="$PROJECT_DIR$/camera/camera.iml" group="cultural/camera" />
<module fileurl="file://$PROJECT_DIR$/cm_utils/cm_utils.iml" filepath="$PROJECT_DIR$/cm_utils/cm_utils.iml" group="cultural/cm_utils" />
<module fileurl="file://$PROJECT_DIR$/cultural.iml" filepath="$PROJECT_DIR$/cultural.iml" group="cultural" />
<module fileurl="file://$PROJECT_DIR$/moduleactivity/moduleactivity.iml" filepath="$PROJECT_DIR$/moduleactivity/moduleactivity.iml" group="cultural/moduleactivity" />
<module fileurl="file://$PROJECT_DIR$/modulecultural/modulecultural.iml" filepath="$PROJECT_DIR$/modulecultural/modulecultural.iml" group="cultural/modulecultural" />
<module fileurl="file://$PROJECT_DIR$/moduleijkplayer/moduleijkplayer.iml" filepath="$PROJECT_DIR$/moduleijkplayer/moduleijkplayer.iml" group="cultural/moduleijkplayer" />
<module fileurl="file://$PROJECT_DIR$/modulemain/modulemain.iml" filepath="$PROJECT_DIR$/modulemain/modulemain.iml" group="cultural/modulemain" />
<module fileurl="file://$PROJECT_DIR$/modulemap/modulemap.iml" filepath="$PROJECT_DIR$/modulemap/modulemap.iml" group="cultural/modulemap" />
<module fileurl="file://$PROJECT_DIR$/modulemine/modulemine.iml" filepath="$PROJECT_DIR$/modulemine/modulemine.iml" group="cultural/modulemine" />
<module fileurl="file://$PROJECT_DIR$/moduleplace/moduleplace.iml" filepath="$PROJECT_DIR$/moduleplace/moduleplace.iml" group="cultural/moduleplace" />
<module fileurl="file://$PROJECT_DIR$/cultural.iml" filepath="$PROJECT_DIR$/cultural.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/app/cultural.app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/cultural.app.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/camera/cultural.camera.iml" filepath="$PROJECT_DIR$/.idea/modules/camera/cultural.camera.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/cm_utils/cultural.cm_utils.iml" filepath="$PROJECT_DIR$/.idea/modules/cm_utils/cultural.cm_utils.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/moduleactivity/cultural.moduleactivity.iml" filepath="$PROJECT_DIR$/.idea/modules/moduleactivity/cultural.moduleactivity.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/modulecultural/cultural.modulecultural.iml" filepath="$PROJECT_DIR$/.idea/modules/modulecultural/cultural.modulecultural.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/moduleijkplayer/cultural.moduleijkplayer.iml" filepath="$PROJECT_DIR$/.idea/modules/moduleijkplayer/cultural.moduleijkplayer.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/modulemain/cultural.modulemain.iml" filepath="$PROJECT_DIR$/.idea/modules/modulemain/cultural.modulemain.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/modulemap/cultural.modulemap.iml" filepath="$PROJECT_DIR$/.idea/modules/modulemap/cultural.modulemap.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/modulemine/cultural.modulemine.iml" filepath="$PROJECT_DIR$/.idea/modules/modulemine/cultural.modulemine.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/moduleplace/cultural.moduleplace.iml" filepath="$PROJECT_DIR$/.idea/modules/moduleplace/cultural.moduleplace.iml" />
</modules>
</component>
</project>

2
app/release/output.json
View File

@ -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":{}}]
[{"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":{}}]

2
app/src/main/java/com/tengshisoft/cultural/wxapi/WXEntryActivity.java
View File

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

BIN
app/src/main/res/drawable-xhdpi/app_logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 69 KiB

After

Width:  |  Height:  |  Size: 116 KiB

4
build.gradle
View File

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

2
cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/RegexConstants.java
View File

@ -14,7 +14,7 @@ public final class RegexConstants {
* <p>global star: 1349</p>
* <p>virtual operator: 170</p>
*/
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.

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

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

1
cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/conver/BaseUrlInterceptor.java
View File

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

14
cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/views/TypeFaceTextView.java
View File

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

BIN
cm_utils/src/main/res/drawable-xhdpi/app_logo_smal.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

3
cm_utils/src/main/res/layout/dialog_bottom_share.xml
View File

@ -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">
<ImageView
android:layout_width="40dp"

4
cm_utils/src/main/res/layout/layout_bottom_comment.xml
View File

@ -34,7 +34,7 @@
android:layout_height="26dp"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:scaleType="center"
android:scaleType="fitXY"
android:src="@drawable/ic_collect" />
@ -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" />
</LinearLayout>

1
modulecultural/src/main/AndroidManifest.xml
View File

@ -2,6 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.tengshisoft.modulecultural">
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<application
android:maxAspectRatio="2.4"
android:resizeableActivity="true">

28
modulecultural/src/main/java/com/tengshisoft/modulecultural/activitys/CulturalLiveDetailActivity.java
View File

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

35
modulecultural/src/main/java/com/tengshisoft/modulecultural/activitys/LookBackListActivity.java
View File

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

20
modulecultural/src/main/java/com/tengshisoft/modulecultural/adapter/ShareLiveAdapter.java
View File

@ -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<CulturalLiveBean.RowsBean, ShareLiveHolder> {
public ShareLiveAdapter(Context ctx, List<CulturalLiveBean.RowsBean> 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<CulturalLiveBean.RowsB
Glide.with(mContext)
.asBitmap()
.load(BaseUrlApi.BASE_LIVE_IMG_IP + mData.get(i).getLivePlanPhoto())
.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(holder.mIvCover);
}
}

1
modulecultural/src/main/res/layout/item_live_layout.xml
View File

@ -22,7 +22,6 @@
android:id="@+id/iv_cover"
android:layout_width="match_parent"
android:layout_height="203dp"
android:adjustViewBounds="true"
android:scaleType="fitXY"
tools:src="@drawable/ic_img_default" />

16
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsDetailActivity.java
View File

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

111
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsListActivity.java
View File

@ -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<List<NewsCommentCount>>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
}
@Override
public void onNext(@NonNull List<NewsCommentCount> 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);

8
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/LiveAdapter.java
View File

@ -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<LiveBean, LiveHolder> {
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())) {

10
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/NewsAdapter.java
View File

@ -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<NewsItemBean.RowsBean, Recy
public NewsAdapter(Context ctx, List<NewsItemBean.RowsBean> 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

28
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/NewsCommentCount.java Normal file
View File

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

62
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/HomeFragment.java
View File

@ -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<List<NewsCommentCount>>() {
@Override
public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
}
@Override
public void onNext(@io.reactivex.annotations.NonNull List<NewsCommentCount> 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() {
}
});
}
}
/**
* 构建首页按钮
*/

107
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/NewsFragment.java
View File

@ -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<List<NewsCommentCount>>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
}
@Override
public void onNext(@NonNull List<NewsCommentCount> 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) {

8
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/net/HomeApi.java
View File

@ -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<NewsItemBean> 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<List<NewsCommentCount>> getNewsCommentNum(@Path("newsIds") String newsIds);
/**
* 获取新闻列表-不需要token
*/

BIN
modulemain/src/main/res/drawable-xhdpi/ic_play_item.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 731 B

After

Width:  |  Height:  |  Size: 500 B

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

@ -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" />
<ImageView
@ -138,8 +138,8 @@
android:padding="8dp"
android:text="文化动态"
android:textColor="@color/app_title_9f_no"
android:textSize="16sp"
app:text_type_cus="1" />
android:textSize="18sp"
app:text_type_cus="2" />
<ImageView
android:layout_width="wrap_content"
@ -200,8 +200,8 @@
android:padding="8dp"
android:text="直播专区"
android:textColor="@color/app_title_9f_no"
android:textSize="16sp"
app:text_type_cus="1" />
android:textSize="18sp"
app:text_type_cus="2" />
<ImageView
android:layout_width="wrap_content"

2
modulemain/src/main/res/layout/item_main_commend.xml
View File

@ -40,7 +40,7 @@
android:maxLines="1"
android:singleLine="true"
android:textColor="@color/white"
android:textSize="10sp"
android:textSize="12sp"
tools:text="测试测试测试测试测试测试测试测试测试测试测试测试测试测试" />
</RelativeLayout>

7
modulemain/src/main/res/layout/item_news_multi_pic.xml
View File

@ -52,6 +52,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:orientation="horizontal"
android:padding="5dp">
@ -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="新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源" />
<TextView
@ -71,7 +72,7 @@
android:layout_marginLeft="10dp"
android:layout_toRightOf="@id/tv_multi_source"
android:textColor="@color/gray_text"
android:textSize="10sp"
android:textSize="12sp"
tools:text="评论" />
<TextView
@ -81,7 +82,7 @@
android:layout_marginLeft="10dp"
android:layout_toRightOf="@id/tv_multi_comment_num"
android:textColor="@color/gray_text"
android:textSize="10sp"
android:textSize="12sp"
tools:text="发布时间" />
<ImageView

7
modulemain/src/main/res/layout/item_news_no_pic.xml
View File

@ -22,6 +22,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:orientation="horizontal"
android:padding="5dp">
@ -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="新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源" />
<TextView
@ -41,7 +42,7 @@
android:layout_marginLeft="10dp"
android:layout_toRightOf="@id/tv_source"
android:textColor="@color/gray_text"
android:textSize="10sp"
android:textSize="12sp"
tools:text="评论数量" />
<TextView
@ -51,7 +52,7 @@
android:layout_marginLeft="10dp"
android:layout_toRightOf="@id/tv_comment_num"
android:textColor="@color/gray_text"
android:textSize="10sp"
android:textSize="12sp"
tools:text="发布时间" />
<ImageView

11
modulemain/src/main/res/layout/item_news_single_pic_bottom.xml
View File

@ -33,8 +33,8 @@
<ImageView
android:id="@+id/iv_movie_play_icon"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_centerInParent="true"
android:scaleType="fitXY"
android:src="@drawable/ic_play_item" />
@ -43,6 +43,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:orientation="horizontal"
android:padding="5dp">
@ -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="新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源" />
<TextView
@ -62,7 +63,7 @@
android:layout_marginLeft="10dp"
android:layout_toRightOf="@id/tv_movie_source"
android:textColor="@color/gray_text"
android:textSize="10sp"
android:textSize="12sp"
tools:text="评论" />
<TextView
@ -72,7 +73,7 @@
android:layout_marginLeft="10dp"
android:layout_toRightOf="@id/tv_movie_comment_num"
android:textColor="@color/gray_text"
android:textSize="10sp"
android:textSize="12sp"
tools:text="发布时间" />
<ImageView

13
modulemain/src/main/res/layout/item_news_single_pic_left.xml
View File

@ -10,8 +10,9 @@
<ImageView
android:id="@+id/iv_single_pic_one"
android:layout_width="100dp"
android:layout_height="60dp"
android:layout_height="65dp"
android:layout_margin="2dp"
android:scaleType="fitXY"
tools:background="@drawable/ic_img_default" />
<RelativeLayout
@ -38,9 +39,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginTop="5dp"
android:gravity="right"
android:orientation="horizontal"
android:padding="5dp">
android:orientation="horizontal">
<TextView
android:id="@+id/tv_single_source"
@ -48,7 +49,7 @@
android:layout_height="wrap_content"
android:maxLength="10"
android:textColor="@color/gray_text"
android:textSize="10sp"
android:textSize="12sp"
tools:text="新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源" />
<TextView
@ -58,7 +59,7 @@
android:layout_marginLeft="10dp"
android:layout_toRightOf="@id/tv_single_source"
android:textColor="@color/gray_text"
android:textSize="10sp"
android:textSize="12sp"
tools:text="评论" />
<TextView
@ -68,7 +69,7 @@
android:layout_marginLeft="10dp"
android:layout_toRightOf="@id/tv_single_comment_num"
android:textColor="@color/gray_text"
android:textSize="10sp"
android:textSize="12sp"
tools:text="发布时间" />
<ImageView

11
modulemain/src/main/res/layout/item_news_single_pic_right.xml
View File

@ -30,8 +30,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginTop="5dp"
android:orientation="horizontal"
android:padding="5dp">
>
<TextView
android:id="@+id/tv_single_source"
@ -39,7 +40,7 @@
android:layout_height="wrap_content"
android:maxLength="10"
android:textColor="@color/gray_text"
android:textSize="10sp"
android:textSize="12sp"
tools:text="新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源" />
<TextView
@ -49,7 +50,7 @@
android:layout_marginLeft="10dp"
android:layout_toRightOf="@id/tv_single_source"
android:textColor="@color/gray_text"
android:textSize="10sp"
android:textSize="12sp"
tools:text="评论" />
<TextView
@ -59,7 +60,7 @@
android:layout_marginLeft="10dp"
android:layout_toRightOf="@id/tv_single_comment_num"
android:textColor="@color/gray_text"
android:textSize="10sp"
android:textSize="12sp"
tools:text="发布时间" />
<ImageView
@ -76,7 +77,7 @@
<ImageView
android:id="@+id/iv_single_pic_one"
android:layout_width="100dp"
android:layout_height="60dp"
android:layout_height="65dp"
android:layout_margin="2dp"
tools:background="@drawable/ic_img_default" />
</LinearLayout>

8
modulemain/src/main/res/layout/item_news_voice.xml
View File

@ -21,7 +21,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:layout_marginTop="2dp"
android:orientation="horizontal"
android:padding="5dp">
@ -32,7 +32,7 @@
android:layout_centerVertical="true"
android:maxLength="10"
android:textColor="@color/gray_text"
android:textSize="10sp"
android:textSize="12sp"
tools:text="新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源新闻来源" />
<TextView
@ -43,7 +43,7 @@
android:layout_marginLeft="10dp"
android:layout_toRightOf="@id/tv_source"
android:textColor="@color/gray_text"
android:textSize="10sp"
android:textSize="12sp"
tools:text="评论数量" />
<TextView
@ -54,7 +54,7 @@
android:layout_marginLeft="10dp"
android:layout_toRightOf="@id/tv_comment_num"
android:textColor="@color/gray_text"
android:textSize="10sp"
android:textSize="12sp"
tools:text="发布时间" />
<LinearLayout

2
modulemain/src/main/res/values/dimens.xml
View File

@ -2,5 +2,5 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<dimen name="design_bottom_navigation_active_text_size" tools:override="true">12sp</dimen>
<dimen name="design_bottom_navigation_text_size" tools:override="true">12sp</dimen>
<dimen name="news_title_text_size" tools:override="true">14sp</dimen>
<dimen name="news_title_text_size" tools:override="true">15sp</dimen>
</resources>

12
modulemine/src/main/res/layout/fragment_mine_main.xml
View File

@ -92,7 +92,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rlv_funcs"
@ -101,6 +102,15 @@
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:layout_marginRight="10dp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:paddingLeft="30dp"
android:text="服务专线:0892-8830972"
android:textColor="@color/titleBar"
android:textSize="15sp" />
</LinearLayout>
</LinearLayout>
</RelativeLayout>

2
moduleplace/src/main/res/layout/activity_place_list.xml
View File

@ -9,7 +9,7 @@
<com.scwang.smartrefresh.layout.SmartRefreshLayout
android:id="@+id/srl_place_list_content"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rlv_place_list_list"

9
moduleplace/src/main/res/layout/fragment_place_main.xml
View File

@ -26,6 +26,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:padding="5dp"
android:orientation="horizontal">
<RadioButton
@ -40,7 +41,7 @@
android:padding="5dp"
android:text="默认排序"
android:textColor="@color/col_btn_blue_white"
android:textSize="12sp" />
android:textSize="16sp" />
<RadioButton
@ -54,7 +55,7 @@
android:padding="5dp"
android:text="人气最高"
android:textColor="@color/col_btn_blue_white"
android:textSize="12sp" />
android:textSize="16sp" />
<RadioButton
android:id="@+id/rb_dis"
@ -67,7 +68,7 @@
android:padding="5dp"
android:text="离我最近"
android:textColor="@color/col_btn_blue_white"
android:textSize="12sp" />
android:textSize="16sp" />
<RadioButton
android:id="@+id/rb_news"
@ -80,7 +81,7 @@
android:padding="5dp"
android:text="最新发布"
android:textColor="@color/col_btn_blue_white"
android:textSize="12sp" />
android:textSize="16sp" />
</RadioGroup>
<com.scwang.smartrefresh.layout.SmartRefreshLayout

2
moduleplace/src/main/res/layout/item_place_func.xml
View File

@ -5,7 +5,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_marginTop="10dp"
android:layout_marginTop="5dp"
android:gravity="center"
android:orientation="vertical"
android:padding="5dp">

10
readme.md
View File

@ -2,3 +2,13 @@
> 1修复微信分享,添加微信朋友圈分享
>
>2 修改新闻布局(条目标题行宽)
>3 修改App-logo 我的中添加服务专线
## 2020-12-23 修改内容
> 1修改域名
> 2电话号码校验正则添加191号段
>
## 2021-1-5 修改内容
> 1 新闻条目字体大小
> 2 新闻列表评论数量与条目信息拆分