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

修改首页页面

Browse Source
This commit is contained in:
高健 2022-02-09 11:29:14 +08:00
parent c67c6d24fc
commit 061e86256f
136 changed files with 1280 additions and 1022 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/.name Normal file
View File

@ -0,0 +1 @@
cultural

4
app/build.gradle
View File

@ -17,7 +17,7 @@ android {
}
compileSdkVersion rootProject.ext.gCompileSdkVersion
defaultConfig {
applicationId "com.tengshisoft.cultural"
applicationId "com.tengshisoft.jncultural"
minSdkVersion rootProject.ext.gMinSdkVersion
targetSdkVersion rootProject.ext.gCompileSdkVersion
versionCode rootProject.ext.gVersionCode
@ -29,7 +29,7 @@ android {
}
manifestPlaceholders = [
JSHARE_PKGNAME : "com.tengshisoft.cultural",
JSHARE_PKGNAME : "com.tengshisoft.jncultural",
JPUSH_APPKEY : "9575fdffe323b4febdd385dd", //极光控制台创建应用得到的AppKey.
JPUSH_CHANNEL : "developer-default", //暂时填写默认值即可.
TENCENT_APPID: "101880285",//腾讯开放平台注册应用得到的appId

6
app/src/androidTest/java/com/tengshisoft/cultural/ExampleInstrumentedTest.java → app/src/androidTest/java/com/tengshisoft/jncultural/ExampleInstrumentedTest.java
View File

@ -1,14 +1,10 @@
package com.tengshisoft.cultural;
package com.tengshisoft.jncultural;
import android.content.Context;
import com.sucstepsoft.cm_utils.utils.LogUtils;
import org.junit.Test;
import org.junit.runner.RunWith;
import java.util.Random;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.platform.app.InstrumentationRegistry;

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

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.tengshisoft.cultural">
package="com.tengshisoft.jncultural">
<application
android:name="com.tengshisoft.BaseMyApplication"
android:name=".BaseMyApplication"
android:allowBackup="true"
android:icon="@drawable/app_logo"
android:label="@string/app_name"
@ -16,7 +16,7 @@
android:theme="@style/AppTheme"
android:usesCleartextTraffic="true">
<activity
android:name=".wxapi.WXEntryActivity"
android:name="com.tengshisoft.jncultural.wxapi.WXEntryActivity"
android:exported="true" />
<meta-data
android:name="com.baidu.lbsapi.API_KEY"

2
app/src/main/java/com/tengshisoft/BaseMyApplication.java → app/src/main/java/com/tengshisoft/jncultural/BaseMyApplication.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft;
package com.tengshisoft.jncultural;
import android.app.Application;

4
app/src/main/java/com/tengshisoft/cultural/wxapi/WXEntryActivity.java → app/src/main/java/com/tengshisoft/jncultural/wxapi/WXEntryActivity.java
View File

@ -1,9 +1,9 @@
package com.tengshisoft.cultural.wxapi;
package com.tengshisoft.jncultural.wxapi;
import android.app.Activity;
import android.os.Bundle;
import com.tengshisoft.cultural.R;
import com.tengshisoft.jncultural.R;
public class WXEntryActivity extends Activity {

2
app/src/main/res/values/strings.xml
View File

@ -1,3 +1,3 @@
<resources>
<string name="app_name">日喀则市数字文化云</string>
<string name="app_name">乌兰察布数字文化云</string>
</resources>

2
app/src/test/java/com/tengshisoft/cultural/ExampleUnitTest.java → app/src/test/java/com/tengshisoft/jncultural/ExampleUnitTest.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft.cultural;
package com.tengshisoft.jncultural;
import org.junit.Test;

2
build.gradle
View File

@ -52,7 +52,7 @@ task clean(type: Delete) {
}
ext {
gCompileSdkVersion = 29
gMinSdkVersion = 16
gMinSdkVersion = 21
gTargetSdkVersion = 29
gVersionCode = 12
gVersionName = '1.1.2'

5
cm_utils/build.gradle
View File

@ -62,7 +62,7 @@ dependencies {
annotationProcessor "com.github.bumptech.glide:compiler:${rootProject.ext.supportGlide}"
//butterknife
api "com.jakewharton:butterknife:$rootProject.ext.gButterKnifeVersion"
////选择器
////选择器
implementation "com.contrarywind:Android-PickerView:${rootProject.ext.pickerViewVersion}"
implementation "com.contrarywind:wheelview:${rootProject.ext.wheelVersion}"
//recyclerview
@ -73,5 +73,8 @@ dependencies {
implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
// fragment快速实现（可选）
implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
api 'jp.wasabeef:glide-transformations:4.3.0'
// If you want to use the GPU Filters
// implementation 'jp.co.cyberagent.android:gpuimage:2.1.0'
}

2
cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/network/update/utils/NotificationHelper.java
View File

@ -77,7 +77,7 @@ public class NotificationHelper {
private NotificationCompat.Builder getNofity(String text) {
return new NotificationCompat.Builder(mContext.getApplicationContext(), CHANNEL_ID)
.setTicker(mContext.getString(R.string.android_auto_update_notify_ticker))
.setContentTitle("日喀则市数字文化云")
.setContentTitle("乌兰察布市数字文化云")
.setContentText(text)
.setSmallIcon(R.drawable.app_logo_smal)
.setAutoCancel(true)

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

@ -3,10 +3,8 @@ package com.sucstepsoft.cm_utils.core.widget.base;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.request.RequestOptions;
import com.sucstepsoft.cm_utils.R;
import com.sucstepsoft.cm_utils.core.beans.BaseImageBean;
@ -36,20 +34,16 @@ public class BannerImageTextAdapter extends BannerAdapter<BaseImageBean, BannerT
@Override
public void onBindView(BannerTextHolder holder, BaseImageBean data, int position, int size) {
RoundedCornersTransform roundedCornersTransform = new RoundedCornersTransform(holder.itemView.getContext(), ConvertUtils.dp2px(2));
roundedCornersTransform.setNeedCorner(false, false, false, false);
RoundedCornersTransform roundedCornersTransform = new RoundedCornersTransform(holder.itemView.getContext(), ConvertUtils.dp2px(5));
roundedCornersTransform.setNeedCorner(true, true, true, true);
RequestOptions options = new RequestOptions()
.error(R.drawable.ic_img_default_banner)
.placeholder(R.drawable.ic_img_default_banner)
.transform(roundedCornersTransform)
.skipMemoryCache(false)
.diskCacheStrategy(DiskCacheStrategy.RESOURCE)
.fitCenter();
.transform(roundedCornersTransform)
.error(R.drawable.ic_img_default_banner)
.placeholder(R.drawable.ic_img_default_banner);
Glide.with(holder.itemView.getContext())
.asBitmap()
.load(data.getImgUrl())
.apply(options)
.into(holder.mIvCover);
.load(data.getImgUrl())
.apply(options)
.into(holder.mIvCover);
holder.mTvName.setText(data.getName());
}
}

BIN
cm_utils/src/main/res/drawable-xhdpi/ic_location_hollow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 989 B

11
cm_utils/src/main/res/drawable/sp_main_live_bg.xml Normal file
View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="5dp" />
<gradient
android:angle="180"
android:endColor="#417FED"
android:startColor="#0956E0"
android:type="linear" />
</shape>

2
cm_utils/src/main/res/layout/base_activity.xml
View File

@ -85,7 +85,7 @@
android:ellipsize="end"
android:maxEms="10"
android:maxLines="1"
android:textColor="@color/white"
android:textColor="@color/black"
android:textSize="18sp"
tools:text="内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙" />
</LinearLayout>

1
cm_utils/src/main/res/layout/item_banner_text.xml
View File

@ -24,5 +24,6 @@
android:padding="8dp"
android:singleLine="true"
android:textColor="@color/white"
android:visibility="gone"
tools:text="新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题" />
</RelativeLayout>

9
cm_utils/src/main/res/values/colors.xml
View File

@ -14,7 +14,7 @@
<color name="partTranslucent">#39000000</color>
<color name="app_title">#D70715</color>
<color name="app_title_9f_no">#9F1512</color>
<color name="app_title_9f_no">#122939</color>
<color name="app_title_tr">#77D70715</color>
<color name="app_title_9f">#889F1512</color>
<color name="app_title_9f_66">#339F1512</color>
@ -93,10 +93,10 @@
<color name="file_len_text_color">#686767</color>
<color name="diyishuji_text_color">#535353</color>
<color name="transparent">#00000000</color>
<color name="titleBar">#9F1512</color>
<color name="titleBarDeep">#9F1512</color>
<color name="titleBar">#FFFFFF</color>
<color name="titleBarDeep">#FFFFFF</color>
<!--我的页面灰色背景-->
<color name="bg_gray">#FCF9F2</color>
<color name="bg_gray">#FAFAFA</color>
<color name="gray_bg">#F1F1F6</color>
<color name="gray">#F2F2F2</color>
<color name="gray_BA">#BABABA</color>
@ -161,6 +161,7 @@
<color name="text_write_FD">#525252</color>
<color name="text_black_52">#525252</color>
<color name="text_black_EB1">#525252</color>
<color name="text_black_122">#122939</color>
<color name="text_black_8F">#8F8F8F</color>
<color name="text_black_53">#535353</color>
<color name="text_gray_66">#666666</color>

34
moduleactivity/src/main/java/com/tengshisoft/moduleactivity/beans/ActivityListBeans.java
View File

@ -103,6 +103,40 @@ public class ActivityListBeans {
private String activityViewNum;
private String activityUserApplyId;
@Override
public String toString() {
return "RowsBean{" +
"activityAddress='" + activityAddress + '\'' +
", activityAddressX='" + activityAddressX + '\'' +
", activityAddressY='" + activityAddressY + '\'' +
", activityApplyDetails='" + activityApplyDetails + '\'' +
", activityApplyEndTime='" + activityApplyEndTime + '\'' +
", activityApplyStartTime='" + activityApplyStartTime + '\'' +
", activityCoOrganizer='" + activityCoOrganizer + '\'' +
", activityDetails='" + activityDetails + '\'' +
", activityEndTime='" + activityEndTime + '\'' +
", activityFormType='" + activityFormType + '\'' +
", activityFormTypeDictionaryName='" + activityFormTypeDictionaryName + '\'' +
", activityImage='" + activityImage + '\'' +
", activityLibraryId='" + activityLibraryId + '\'' +
", activityObjectOriented='" + activityObjectOriented + '\'' +
", activityObjectOrientedDictionaryName='" + activityObjectOrientedDictionaryName + '\'' +
", activityOrganizer='" + activityOrganizer + '\'' +
", activitySponsor='" + activitySponsor + '\'' +
", activityStartTime='" + activityStartTime + '\'' +
", activityState='" + activityState + '\'' +
", activityTitle='" + activityTitle + '\'' +
", activityType='" + activityType + '\'' +
", activityTypeDictionaryName='" + activityTypeDictionaryName + '\'' +
", activityUserNum=" + activityUserNum +
", activityVenues='" + activityVenues + '\'' +
", activityVenuesDictionaryName='" + activityVenuesDictionaryName + '\'' +
", activityVideo='" + activityVideo + '\'' +
", activityViewNum='" + activityViewNum + '\'' +
", activityUserApplyId='" + activityUserApplyId + '\'' +
'}';
}
public String getActivityUserApplyId() {
return activityUserApplyId;
}

24
modulemain/src/main/AndroidManifest.xml
View File

@ -30,24 +30,24 @@
android:maxAspectRatio="2.4"
android:resizeableActivity="true">
<activity
android:name=".cultural.activitys.news.NewsWebActivity"
android:name=".jncultural.activitys.news.NewsWebActivity"
android:configChanges="keyboardHidden|orientation|screenSize|screenLayout"
android:launchMode="singleTop"
android:screenOrientation="portrait" />
<activity
android:name=".cultural.activitys.news.NewsPdfActivity"
android:name=".jncultural.activitys.news.NewsPdfActivity"
android:launchMode="singleTop"
android:screenOrientation="portrait" />
<activity
android:name=".cultural.activitys.base.ChooseCityActivity"
android:name=".jncultural.activitys.base.ChooseCityActivity"
android:launchMode="singleTop"
android:screenOrientation="portrait" />
<activity
android:name=".cultural.activitys.base.ForgatPwdActivity"
android:name=".jncultural.activitys.base.ForgatPwdActivity"
android:launchMode="singleTop"
android:screenOrientation="portrait" />
<activity
android:name=".cultural.activitys.base.RegisterActivity"
android:name=".jncultural.activitys.base.RegisterActivity"
android:launchMode="singleTop"
android:screenOrientation="portrait" />
@ -62,31 +62,31 @@
android:value="portrait|landscape" />
<activity
android:name=".cultural.activitys.news.NewsMainActivity"
android:name=".jncultural.activitys.news.NewsMainActivity"
android:launchMode="singleTop"
android:screenOrientation="portrait" />
<activity
android:name=".cultural.activitys.base.DemoActivity"
android:name=".jncultural.activitys.base.DemoActivity"
android:launchMode="singleTop"
android:screenOrientation="portrait" />
<activity
android:name=".cultural.activitys.news.NewsDetailActivity"
android:name=".jncultural.activitys.news.NewsDetailActivity"
android:launchMode="singleTop"
android:screenOrientation="portrait" />
<activity
android:name=".cultural.activitys.base.LoginActivity"
android:name=".jncultural.activitys.base.LoginActivity"
android:launchMode="singleTop"
android:screenOrientation="portrait" />
<activity
android:name=".cultural.activitys.base.MainActivity"
android:name=".jncultural.activitys.base.MainActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait" />
<activity
android:name=".cultural.activitys.news.NewsListActivity"
android:name=".jncultural.activitys.news.NewsListActivity"
android:launchMode="singleTop"
android:screenOrientation="portrait" />
<activity
android:name=".cultural.activitys.base.SplashActivity"
android:name=".jncultural.activitys.base.SplashActivity"
android:screenOrientation="portrait"
android:theme="@style/LaunchTheme">
<intent-filter>

91
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/SplashActivity.java
View File

@ -1,91 +0,0 @@
package com.tengshisoft.mudulemain.cultural.activitys.base;
import android.view.View;
import com.alibaba.android.arouter.launcher.ARouter;
import com.gyf.immersionbar.ImmersionBar;
import com.sucstepsoft.cm_utils.constant.PathConfig;
import com.sucstepsoft.cm_utils.constant.PermissionConstants;
import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity;
import com.sucstepsoft.cm_utils.utils.PermissionUtils;
import com.sucstepsoft.cm_utils.utils.ToastUtils;
import com.tengshisoft.mudulemain.R;
import java.util.concurrent.TimeUnit;
import butterknife.ButterKnife;
import butterknife.Unbinder;
import io.reactivex.Observable;
import io.reactivex.Observer;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
import io.reactivex.schedulers.Schedulers;
public class SplashActivity extends BaseActivity {
private Unbinder mBind;
@Override
protected int setLayoutId() {
return R.layout.activity_splash;
}
@Override
public void initData() {
mBind = ButterKnife.bind(this);
refreshView(STATE_LOAD_SUCCESS);
ImmersionBar.with(this).init();
mRlTitleBar1.setVisibility(View.GONE);
PermissionUtils.permission(PermissionConstants.STORAGE, PermissionConstants.LOCATION, PermissionConstants.PHONE)
.callback(new PermissionUtils.SimpleCallback() {
@Override
public void onGranted() {
Observable.timer(1, TimeUnit.SECONDS)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<Long>() {
@Override
public void onSubscribe(Disposable d) {
}
@Override
public void onNext(Long aLong) {
ARouter.getInstance()
.build(PathConfig.PATH_MODULE_MAIN_HOME)
.navigation();
finish();
}
@Override
public void onError(Throwable e) {
}
@Override
public void onComplete() {
}
});
}
@Override
public void onDenied() {
ToastUtils.showShort("App需要读取SD的权限,和定位的权限,请前往设置里授权.");
ARouter.getInstance()
.build(PathConfig.PATH_MODULE_MAIN_HOME)
.navigation();
finish();
}
}).request();
}
@Override
protected void onDestroy() {
super.onDestroy();
if (mBind != null) {
mBind.unbind();
}
}
}

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

@ -1,71 +0,0 @@
package com.tengshisoft.mudulemain.cultural.adapter;
import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
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.mudulemain.R;
import com.tengshisoft.mudulemain.cultural.beans.LiveBean;
import com.tengshisoft.mudulemain.cultural.holder.LiveHolder;
import java.util.List;
/**
* 作者: adam
* 日期: 2020/5/28 - 2:21 PM
* 邮箱: itgaojian@163.com
* 描述:
*/
public class LiveAdapter extends BaseRecyclerAdapter<LiveBean, LiveHolder> {
public LiveAdapter(Context ctx, List<LiveBean> 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
public LiveHolder createHolder(ViewGroup parent, int viewType) {
View itemView = LayoutInflater.from(mContext).inflate(R.layout.item_live, parent, false);
return new LiveHolder(itemView);
}
@Override
public void bindHolder(LiveHolder liveHolder, int i) {
Glide.with(mContext)
.asBitmap()
.load(BaseUrlApi.BASE_LIVE_IMG_IP + mData.get(i).getUrl())
.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())) {
liveHolder.mTvType.setText("未开始");
} else if ("0".equals(mData.get(i).getType())) {
liveHolder.mTvType.setText("直播回放");
} else if ("2".equals(mData.get(i).getType())) {
liveHolder.mTvType.setText("直播中");
} else {
liveHolder.mTvType.setText("未开始");
}
liveHolder.mTvTime.setText(mData.get(i).getTime());
}
}

14
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/ChooseCityActivity.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/base/ChooseCityActivity.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft.mudulemain.cultural.activitys.base;
package com.tengshisoft.mudulemain.jncultural.activitys.base;
import android.app.ProgressDialog;
import android.content.Intent;
@ -7,7 +7,6 @@ import android.text.TextUtils;
import android.text.TextWatcher;
import android.view.View;
import android.widget.CheckBox;
import android.widget.CompoundButton;
import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.TextView;
@ -18,19 +17,16 @@ import com.sucstepsoft.cm_utils.constant.PathConfig;
import com.sucstepsoft.cm_utils.core.retrofit_net.RetrofitManager;
import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity;
import com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView;
import com.sucstepsoft.cm_utils.utils.LogUtils;
import com.sucstepsoft.cm_utils.utils.SPUtils;
import com.sucstepsoft.cm_utils.utils.ToastUtils;
import com.sucstepsoft.cm_utils.utils.UIUtil;
import com.sucstepsoft.cm_utils.utils.UserLgUtils;
import com.tengshisoft.mudulemain.R;
import com.tengshisoft.mudulemain.R2;
import com.tengshisoft.mudulemain.cultural.adapter.AreaListAdapter;
import com.tengshisoft.mudulemain.cultural.beans.AreaListBean;
import com.tengshisoft.mudulemain.cultural.beans.SearchBean;
import com.tengshisoft.mudulemain.cultural.net.HomeApi;
import com.tengshisoft.mudulemain.jncultural.adapter.AreaListAdapter;
import com.tengshisoft.mudulemain.jncultural.beans.AreaListBean;
import com.tengshisoft.mudulemain.jncultural.beans.SearchBean;
import com.tengshisoft.mudulemain.jncultural.net.HomeApi;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;

19
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/DemoActivity.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/base/DemoActivity.java
View File

@ -1,29 +1,12 @@
package com.tengshisoft.mudulemain.cultural.activitys.base;
package com.tengshisoft.mudulemain.jncultural.activitys.base;
import android.app.PendingIntent;
import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.webkit.WebChromeClient;
import android.webkit.WebSettings;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.widget.ImageView;
import android.widget.LinearLayout;
import com.bumptech.glide.Glide;
import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity;
import com.sucstepsoft.cm_utils.utils.LogUtils;
import com.tengshisoft.mudulemain.R;
import com.tengshisoft.mudulemain.R2;
import java.util.ArrayList;
import java.util.List;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;

6
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/ForgatPwdActivity.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/base/ForgatPwdActivity.java
View File

@ -1,6 +1,5 @@
package com.tengshisoft.mudulemain.cultural.activitys.base;
package com.tengshisoft.mudulemain.jncultural.activitys.base;
import androidx.appcompat.app.AppCompatActivity;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;
@ -13,7 +12,6 @@ import okhttp3.RequestBody;
import android.annotation.SuppressLint;
import android.app.ProgressDialog;
import android.os.Bundle;
import android.text.Editable;
import android.text.Selection;
import android.text.TextUtils;
@ -40,7 +38,7 @@ import com.sucstepsoft.cm_utils.utils.ToastUtils;
import com.sucstepsoft.cm_utils.utils.UIUtil;
import com.tengshisoft.mudulemain.R;
import com.tengshisoft.mudulemain.R2;
import com.tengshisoft.mudulemain.cultural.net.HomeApi;
import com.tengshisoft.mudulemain.jncultural.net.HomeApi;
import java.util.concurrent.TimeUnit;

29
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/LoginActivity.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/base/LoginActivity.java
View File

@ -1,40 +1,29 @@
package com.tengshisoft.mudulemain.cultural.activitys.base;
package com.tengshisoft.mudulemain.jncultural.activitys.base;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;
import io.reactivex.Observable;
import io.reactivex.Observer;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
import io.reactivex.schedulers.Schedulers;
import okhttp3.RequestBody;
import android.annotation.SuppressLint;
import android.app.ProgressDialog;
import android.content.Intent;
import android.text.Editable;
import android.text.Selection;
import android.text.TextUtils;
import android.text.method.HideReturnsTransformationMethod;
import android.text.method.PasswordTransformationMethod;
import android.util.Base64;
import android.util.MonthDisplayHelper;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.android.arouter.launcher.ARouter;
import com.google.gson.Gson;
import com.gyf.immersionbar.ImmersionBar;
import com.sucstepsoft.cm_utils.constant.PathConfig;
import com.sucstepsoft.cm_utils.constant.TimeConstants;
import com.sucstepsoft.cm_utils.core.beans.BaseSuccessBean;
import com.sucstepsoft.cm_utils.core.beans.UserRegisterPostBean;
import com.sucstepsoft.cm_utils.core.retrofit_net.RetrofitManager;
import com.sucstepsoft.cm_utils.core.retrofit_net.api.BaseApiService;
import com.sucstepsoft.cm_utils.core.retrofit_net.bean.BaseUserInfo;
@ -45,22 +34,14 @@ import com.sucstepsoft.cm_utils.utils.EncryptUtils;
import com.sucstepsoft.cm_utils.utils.ExceptionHandler;
import com.sucstepsoft.cm_utils.utils.LogUtils;
import com.sucstepsoft.cm_utils.utils.RegexUtils;
import com.sucstepsoft.cm_utils.utils.TimeUtils;
import com.sucstepsoft.cm_utils.utils.ToastUtils;
import com.sucstepsoft.cm_utils.utils.UIUtil;
import com.sucstepsoft.cm_utils.utils.UserLgUtils;
import com.tengshisoft.mudulemain.R;
import com.tengshisoft.mudulemain.R2;
import com.tengshisoft.mudulemain.cultural.beans.AppTokenUser;
import com.tengshisoft.mudulemain.cultural.beans.BaseUserBean;
import com.tengshisoft.mudulemain.cultural.beans.LoginUser;
import com.tengshisoft.mudulemain.cultural.net.HomeApi;
import com.tengshisoft.mudulemain.cultural.utils.AesUtil;
import org.aspectj.lang.annotation.Around;
import java.text.SimpleDateFormat;
import java.util.concurrent.TimeUnit;
import com.tengshisoft.mudulemain.jncultural.beans.BaseUserBean;
import com.tengshisoft.mudulemain.jncultural.beans.LoginUser;
import com.tengshisoft.mudulemain.jncultural.net.HomeApi;
/**
* 登录页面
@ -94,7 +75,7 @@ public class LoginActivity extends BaseActivity {
public void initData() {
mBind = ButterKnife.bind(this);
mRlTitleBar1.setVisibility(View.GONE);
ImmersionBar.with(this).init();
ImmersionBar.with(this).statusBarDarkFont(true).init();
refreshView(STATE_LOAD_SUCCESS);
mTvRegister.setOnClickListener(v -> ARouter.getInstance()
.build(PathConfig.PATH_MODULE_MAIN_REGISTER)

32
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/MainActivity.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/base/MainActivity.java
View File

@ -1,9 +1,7 @@
package com.tengshisoft.mudulemain.cultural.activitys.base;
package com.tengshisoft.mudulemain.jncultural.activitys.base;
import android.app.DownloadManager;
import android.content.Intent;
import android.graphics.Typeface;
import android.net.Uri;
import android.os.Environment;
import android.text.TextUtils;
import android.view.View;
@ -14,7 +12,6 @@ import com.baidu.location.BDAbstractLocationListener;
import com.baidu.location.BDLocation;
import com.baidu.location.LocationClient;
import com.baidu.location.LocationClientOption;
import com.gyf.immersionbar.BarHide;
import com.gyf.immersionbar.ImmersionBar;
import com.ittianyu.bottomnavigationviewex.BottomNavigationViewEx;
import com.sucstepsoft.cm_utils.constant.PathConfig;
@ -22,7 +19,6 @@ import com.sucstepsoft.cm_utils.constant.PermissionConstants;
import com.sucstepsoft.cm_utils.core.network.update.CheckUpdateUtils;
import com.sucstepsoft.cm_utils.core.network.update.service.DownloadService;
import com.sucstepsoft.cm_utils.core.network.update.utils.Constants;
import com.sucstepsoft.cm_utils.core.network.update.utils.NotificationHelper;
import com.sucstepsoft.cm_utils.core.retrofit_net.BaseUrlApi;
import com.sucstepsoft.cm_utils.core.retrofit_net.RetrofitManager;
import com.sucstepsoft.cm_utils.core.retrofit_net.api.BaseApiService;
@ -30,23 +26,17 @@ import com.sucstepsoft.cm_utils.core.retrofit_net.bean.BaseUserInfo;
import com.sucstepsoft.cm_utils.core.retrofit_net.bean.VersionBean;
import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity;
import com.sucstepsoft.cm_utils.core.widget.base.FragmentUtils;
import com.sucstepsoft.cm_utils.core.widget.base.NotificationUtils;
import com.sucstepsoft.cm_utils.core.widget.views.CenterDialogUpdateView;
import com.sucstepsoft.cm_utils.utils.FileUtils;
import com.sucstepsoft.cm_utils.utils.LogUtils;
import com.sucstepsoft.cm_utils.utils.PermissionUtils;
import com.sucstepsoft.cm_utils.utils.SPUtils;
import com.sucstepsoft.cm_utils.utils.ToastUtils;
import com.sucstepsoft.cm_utils.utils.UserLgUtils;
import com.tengshisoft.mudulemain.R;
import com.tengshisoft.mudulemain.R2;
import com.tengshisoft.mudulemain.cultural.fragment.HomeFragment;
import com.tengshisoft.mudulemain.cultural.net.HomeApi;
import org.aspectj.lang.annotation.Around;
import com.tengshisoft.mudulemain.jncultural.fragment.HomeFragment;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
@ -86,7 +76,13 @@ public class MainActivity extends BaseActivity {
@Override
public void initData() {
mBind = ButterKnife.bind(this);
mTvBaseTitle.setText("日喀则市数字文化云");
ImmersionBar.with(this)
.titleBar(mLlTitleBar)
.keyboardEnable(false)
.statusBarColor(R.color.titleBar)
.statusBarDarkFont(true)
.init();
mTvBaseTitle.setText("乌兰察布市数字文化云");
refreshView(STATE_LOAD_SUCCESS);
mIbBack.setVisibility(View.GONE);
mRlTitleBar1.setVisibility(View.VISIBLE);
@ -119,14 +115,14 @@ public class MainActivity extends BaseActivity {
.titleBar(mLlTitleBar)
.keyboardEnable(false)
.statusBarColor(R.color.titleBar)
.statusBarDarkFont(false)
.statusBarDarkFont(true)
.init();
mLlTitleBar.setVisibility(View.VISIBLE);
mRlTitleBar.setVisibility(View.VISIBLE);
mRlTitleBar1.setVisibility(View.VISIBLE);
mIvInto.setVisibility(View.GONE);
mVpContent.setCurrentItem(0, false);
mTvBaseTitle.setText("日喀则市数字文化云");
mTvBaseTitle.setText("乌兰察布市数字文化云");
mTvAppBack.setVisibility(View.VISIBLE);
String city = TextUtils.isEmpty(UserLgUtils.getCurrentCity()) ? "地区选择" : UserLgUtils.getCurrentCity();
mTvAppBack.setText(city);
@ -136,7 +132,7 @@ public class MainActivity extends BaseActivity {
.titleBar(mLlTitleBar)
.keyboardEnable(false)
.statusBarColor(R.color.titleBar)
.statusBarDarkFont(false)
.statusBarDarkFont(true)
.init();
//活动
mLlTitleBar.setVisibility(View.VISIBLE);
@ -153,7 +149,7 @@ public class MainActivity extends BaseActivity {
.titleBar(mLlTitleBar)
.keyboardEnable(false)
.statusBarColor(R.color.titleBar)
.statusBarDarkFont(false)
.statusBarDarkFont(true)
.init();
mLlTitleBar.setVisibility(View.VISIBLE);
mRlTitleBar.setVisibility(View.VISIBLE);
@ -172,7 +168,7 @@ public class MainActivity extends BaseActivity {
.titleBar(mLlTitleBar)
.keyboardEnable(false)
.statusBarColor(R.color.titleBar)
.statusBarDarkFont(false)
.statusBarDarkFont(true)
.init();
mLlTitleBar.setVisibility(View.VISIBLE);
mRlTitleBar.setVisibility(View.VISIBLE);

3
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/RegisterActivity.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/base/RegisterActivity.java
View File

@ -1,8 +1,7 @@
package com.tengshisoft.mudulemain.cultural.activitys.base;
package com.tengshisoft.mudulemain.jncultural.activitys.base;
import android.annotation.SuppressLint;
import android.app.ProgressDialog;
import android.os.Bundle;
import android.text.Editable;
import android.text.Selection;
import android.text.TextUtils;

91
modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/base/SplashActivity.java Normal file
View File

@ -0,0 +1,91 @@
package com.tengshisoft.mudulemain.jncultural.activitys.base;
import android.view.View;
import com.alibaba.android.arouter.launcher.ARouter;
import com.gyf.immersionbar.ImmersionBar;
import com.sucstepsoft.cm_utils.constant.PathConfig;
import com.sucstepsoft.cm_utils.constant.PermissionConstants;
import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity;
import com.sucstepsoft.cm_utils.utils.PermissionUtils;
import com.sucstepsoft.cm_utils.utils.ToastUtils;
import com.tengshisoft.mudulemain.R;
import java.util.concurrent.TimeUnit;
import butterknife.ButterKnife;
import butterknife.Unbinder;
import io.reactivex.Observable;
import io.reactivex.Observer;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
import io.reactivex.schedulers.Schedulers;
public class SplashActivity extends BaseActivity {
private Unbinder mBind;
@Override
protected int setLayoutId() {
return R.layout.activity_splash;
}
@Override
public void initData() {
mBind = ButterKnife.bind(this);
refreshView(STATE_LOAD_SUCCESS);
ImmersionBar.with(this).statusBarDarkFont(true).init();
mRlTitleBar1.setVisibility(View.GONE);
PermissionUtils.permission(PermissionConstants.STORAGE, PermissionConstants.LOCATION, PermissionConstants.PHONE)
.callback(new PermissionUtils.SimpleCallback() {
@Override
public void onGranted() {
Observable.timer(1, TimeUnit.SECONDS)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<Long>() {
@Override
public void onSubscribe(Disposable d) {
}
@Override
public void onNext(Long aLong) {
ARouter.getInstance()
.build(PathConfig.PATH_MODULE_MAIN_HOME)
.navigation();
finish();
}
@Override
public void onError(Throwable e) {
}
@Override
public void onComplete() {
}
});
}
@Override
public void onDenied() {
ToastUtils.showShort("App需要读取SD的权限,和定位的权限,请前往设置里授权.");
ARouter.getInstance()
.build(PathConfig.PATH_MODULE_MAIN_HOME)
.navigation();
finish();
}
}).request();
}
@Override
protected void onDestroy() {
super.onDestroy();
if (mBind != null) {
mBind.unbind();
}
}
}

22
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsDetailActivity.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/news/NewsDetailActivity.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft.mudulemain.cultural.activitys.news;
package com.tengshisoft.mudulemain.jncultural.activitys.news;
import android.app.AlertDialog;
import android.app.ProgressDialog;
@ -52,14 +52,14 @@ import com.sucstepsoft.cm_utils.utils.UIUtil;
import com.sucstepsoft.cm_utils.utils.UserLgUtils;
import com.tengshisoft.mudulemain.R;
import com.tengshisoft.mudulemain.R2;
import com.tengshisoft.mudulemain.cultural.adapter.CommentAdapter;
import com.tengshisoft.mudulemain.cultural.beans.BaseUserBean;
import com.tengshisoft.mudulemain.cultural.beans.CollectBean;
import com.tengshisoft.mudulemain.cultural.beans.CommentListBean;
import com.tengshisoft.mudulemain.cultural.beans.CommentPublishBean;
import com.tengshisoft.mudulemain.cultural.beans.LikeBean;
import com.tengshisoft.mudulemain.cultural.net.HomeApi;
import com.tengshisoft.mudulemain.cultural.widget.ButtomCommentListDialogView;
import com.tengshisoft.mudulemain.jncultural.adapter.CommentAdapter;
import com.tengshisoft.mudulemain.jncultural.beans.BaseUserBean;
import com.tengshisoft.mudulemain.jncultural.beans.CollectBean;
import com.tengshisoft.mudulemain.jncultural.beans.CommentListBean;
import com.tengshisoft.mudulemain.jncultural.beans.CommentPublishBean;
import com.tengshisoft.mudulemain.jncultural.beans.LikeBean;
import com.tengshisoft.mudulemain.jncultural.net.HomeApi;
import com.tengshisoft.mudulemain.jncultural.widget.ButtomCommentListDialogView;
import java.io.File;
import java.util.ArrayList;
@ -361,9 +361,9 @@ public class NewsDetailActivity extends BaseActivity {
ShareParams params = new ShareParams();
if (type == 4) {
params.setTitle(mTitle);
params.setText("日喀则市数字文化云");
params.setText("乌兰察布市数字文化云");
} else {
params.setTitle("日喀则市数字文化云");
params.setTitle("乌兰察布市数字文化云");
params.setText(mTitle);
}
params.setShareType(Platform.SHARE_WEBPAGE);

26
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsListActivity.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/news/NewsListActivity.java
View File

@ -1,17 +1,11 @@
package com.tengshisoft.mudulemain.cultural.activitys.news;
package com.tengshisoft.mudulemain.jncultural.activitys.news;
import android.graphics.Color;
import android.os.Bundle;
import android.text.TextUtils;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.android.arouter.launcher.ARouter;
import com.google.android.material.tabs.TabLayout;
import com.google.android.material.tabs.TabLayoutMediator;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.scwang.smartrefresh.layout.api.RefreshLayout;
import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener;
import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
import com.sucstepsoft.cm_utils.constant.PathConfig;
import com.sucstepsoft.cm_utils.core.retrofit_net.BaseUrlApi;
import com.sucstepsoft.cm_utils.core.retrofit_net.RetrofitManager;
@ -21,26 +15,16 @@ import com.sucstepsoft.cm_utils.utils.ExceptionHandler;
import com.sucstepsoft.cm_utils.utils.UserLgUtils;
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;
import com.tengshisoft.mudulemain.cultural.fragment.NewsFragment;
import com.tengshisoft.mudulemain.cultural.net.HomeApi;
import com.tengshisoft.mudulemain.jncultural.adapter.NewsAdapter;
import com.tengshisoft.mudulemain.jncultural.beans.NewsCommentCount;
import com.tengshisoft.mudulemain.jncultural.beans.NewsItemBean;
import com.tengshisoft.mudulemain.jncultural.net.HomeApi;
import java.util.ArrayList;
import java.util.List;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.viewpager2.adapter.FragmentStateAdapter;
import androidx.viewpager2.widget.ViewPager2;
import butterknife.BindInt;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;

11
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsMainActivity.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/news/NewsMainActivity.java
View File

@ -1,7 +1,6 @@
package com.tengshisoft.mudulemain.cultural.activitys.news;
package com.tengshisoft.mudulemain.jncultural.activitys.news;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.viewpager2.adapter.FragmentStateAdapter;
@ -21,17 +20,15 @@ import android.widget.TextView;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.google.android.material.tabs.TabLayout;
import com.google.android.material.tabs.TabLayoutMediator;
import com.sucstepsoft.cm_utils.constant.PathConfig;
import com.sucstepsoft.cm_utils.core.retrofit_net.RetrofitManager;
import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity;
import com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView;
import com.sucstepsoft.cm_utils.utils.ExceptionHandler;
import com.tengshisoft.mudulemain.R;
import com.tengshisoft.mudulemain.R2;
import com.tengshisoft.mudulemain.cultural.beans.NewsTabBean;
import com.tengshisoft.mudulemain.cultural.fragment.NewsFragment;
import com.tengshisoft.mudulemain.cultural.net.HomeApi;
import com.tengshisoft.mudulemain.jncultural.beans.NewsTabBean;
import com.tengshisoft.mudulemain.jncultural.fragment.NewsFragment;
import com.tengshisoft.mudulemain.jncultural.net.HomeApi;
import java.util.ArrayList;
import java.util.List;

2
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsPdfActivity.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/news/NewsPdfActivity.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft.mudulemain.cultural.activitys.news;
package com.tengshisoft.mudulemain.jncultural.activitys.news;
import android.os.Environment;

4
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsWebActivity.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/news/NewsWebActivity.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft.mudulemain.cultural.activitys.news;
package com.tengshisoft.mudulemain.jncultural.activitys.news;
import android.content.pm.ActivityInfo;
import android.net.http.SslError;
@ -12,14 +12,12 @@ import android.webkit.WebSettings;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.gyf.immersionbar.ImmersionBar;
import com.sucstepsoft.cm_utils.constant.PathConfig;
import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity;
import com.sucstepsoft.cm_utils.utils.LogUtils;
import com.sucstepsoft.cm_utils.utils.StringUtils;
import com.tengshisoft.mudulemain.R;
import com.tengshisoft.mudulemain.R2;

8
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/AreaListAdapter.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/adapter/AreaListAdapter.java
View File

@ -1,16 +1,14 @@
package com.tengshisoft.mudulemain.cultural.adapter;
package com.tengshisoft.mudulemain.jncultural.adapter;
import android.content.Context;
import android.text.Layout;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.CompoundButton;
import com.sucstepsoft.cm_utils.core.widget.base.BaseRecyclerAdapter;
import com.tengshisoft.mudulemain.R;
import com.tengshisoft.mudulemain.cultural.beans.AreaListBean;
import com.tengshisoft.mudulemain.cultural.holder.AreaHolder;
import com.tengshisoft.mudulemain.jncultural.beans.AreaListBean;
import com.tengshisoft.mudulemain.jncultural.holder.AreaHolder;
import java.util.List;

11
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/CommentAdapter.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/adapter/CommentAdapter.java
View File

@ -1,11 +1,9 @@
package com.tengshisoft.mudulemain.cultural.adapter;
package com.tengshisoft.mudulemain.jncultural.adapter;
import android.app.Activity;
import android.content.Context;
import android.graphics.Color;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.TextureView;
import android.view.View;
import android.view.ViewGroup;
@ -13,17 +11,14 @@ import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.load.resource.bitmap.CircleCrop;
import com.bumptech.glide.request.RequestOptions;
import com.plattysoft.leonids.ParticleSystem;
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.sucstepsoft.cm_utils.utils.UserLgUtils;
import com.tengshisoft.mudulemain.R;
import com.tengshisoft.mudulemain.cultural.beans.CommentListBean;
import com.tengshisoft.mudulemain.cultural.holder.comment.CommentListHolder;
import com.tengshisoft.mudulemain.jncultural.beans.CommentListBean;
import com.tengshisoft.mudulemain.jncultural.holder.comment.CommentListHolder;
import java.util.List;

62
modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/adapter/LiveAdapter.java Normal file
View File

@ -0,0 +1,62 @@
package com.tengshisoft.mudulemain.jncultural.adapter;
import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.bumptech.glide.Glide;
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.RoundedCornersTransform;
import com.tengshisoft.mudulemain.R;
import com.tengshisoft.mudulemain.jncultural.beans.LiveBean;
import com.tengshisoft.mudulemain.jncultural.holder.LiveHolder;
import java.util.List;
/**
* 作者: adam
* 日期: 2020/5/28 - 2:21 PM
* 邮箱: itgaojian@163.com
* 描述:
*/
public class LiveAdapter extends BaseRecyclerAdapter<LiveBean, LiveHolder> {
public LiveAdapter(Context ctx, List<LiveBean> list) {
super(ctx, list);
// RoundedCornersTransform roundedCornersTransform = new RoundedCornersTransform(mContext, ConvertUtils.dp2px(5));
// roundedCornersTransform.setNeedCorner(true, true, true, true);
// options = new RequestOptions()
// .transform(new CenterInside(), roundedCornersTransform)
// .error(com.sucstepsoft.cm_utils.R.drawable.ic_img_default)
// .placeholder(com.sucstepsoft.cm_utils.R.drawable.ic_img_default);
}
@Override
public LiveHolder createHolder(ViewGroup parent, int viewType) {
View itemView = LayoutInflater.from(mContext).inflate(R.layout.item_live, parent, false);
return new LiveHolder(itemView);
}
@Override
public void bindHolder(LiveHolder liveHolder, int i) {
Glide.with(mContext)
.load(BaseUrlApi.BASE_LIVE_IMG_IP + mData.get(i).getUrl())
.apply(RequestOptions.bitmapTransform(new RoundedCornersTransform(mContext, 5)))
.centerInside()
.error(R.drawable.ic_img_default)
.placeholder(R.drawable.ic_img_default)
.into(liveHolder.mIvImg);
liveHolder.mTvTitle.setText(mData.get(i).getTitle());
if ("1".equals(mData.get(i).getType())) {
liveHolder.mTvType.setText("未开始");
} else if ("0".equals(mData.get(i).getType())) {
liveHolder.mTvType.setText("已结束");
} else if ("2".equals(mData.get(i).getType())) {
liveHolder.mTvType.setText("直播中");
} else {
liveHolder.mTvType.setText("未开始");
}
}
}

55
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/MainCommendAdapter.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/adapter/MainCommendAdapter.java
View File

@ -1,12 +1,12 @@
package com.tengshisoft.mudulemain.cultural.adapter;
package com.tengshisoft.mudulemain.jncultural.adapter;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.baidu.mapapi.model.LatLng;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.request.RequestOptions;
@ -15,8 +15,8 @@ import com.sucstepsoft.cm_utils.core.widget.base.BaseRecyclerAdapter;
import com.sucstepsoft.cm_utils.core.widget.base.RoundedCornersTransform;
import com.sucstepsoft.cm_utils.utils.ConvertUtils;
import com.tengshisoft.mudulemain.R;
import com.tengshisoft.mudulemain.cultural.beans.MainCommendBean;
import com.tengshisoft.mudulemain.cultural.holder.MainCommendHolder;
import com.tengshisoft.mudulemain.jncultural.beans.MainCommendBean;
import com.tengshisoft.mudulemain.jncultural.holder.MainCommendHolder;
import java.util.List;
@ -28,16 +28,16 @@ import java.util.List;
*/
public class MainCommendAdapter extends BaseRecyclerAdapter<MainCommendBean, MainCommendHolder> {
private final RequestOptions mPlaceholder;
public MainCommendAdapter(Context ctx, List<MainCommendBean> 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);
roundedCornersTransform.setNeedCorner(true, true, false, false);
mPlaceholder = new RequestOptions()
.transform(roundedCornersTransform)
.error(R.drawable.ic_img_default)
.placeholder(R.drawable.ic_img_default);
}
@Override
@ -51,25 +51,36 @@ public class MainCommendAdapter extends BaseRecyclerAdapter<MainCommendBean, Mai
if (!TextUtils.isEmpty(mData.get(i).getImgUrl())) {
String[] split = mData.get(i).getImgUrl().split(",");
if (1 == mData.get(i).getType()) {
//活动
Glide.with(mContext)
.load(BaseUrlApi.BASE_ACTIVITY_IMG_URL + split[0])
.apply(options)
.into(mainCommendHolder.mIvImg);
.load(BaseUrlApi.BASE_ACTIVITY_IMG_URL + split[0])
.apply(mPlaceholder)
.into(mainCommendHolder.mIvImg);
Drawable drawable = mContext.getResources().getDrawable(R.drawable.ic_location_hollow);
drawable.setBounds(0, 0, drawable.getMinimumWidth(), drawable.getMinimumHeight());
mainCommendHolder.mTvPhone.setCompoundDrawables(drawable, null, null, null);
} else {
//场馆
Glide.with(mContext)
.load(BaseUrlApi.BASE_PLACE_IMG_IP + split[0])
.apply(options)
.into(mainCommendHolder.mIvImg);
.load(BaseUrlApi.BASE_PLACE_IMG_IP + split[0])
.apply(mPlaceholder)
.into(mainCommendHolder.mIvImg);
Drawable drawable = mContext.getResources().getDrawable(R.drawable.ic_phone_hollow);
drawable.setBounds(0, 0, drawable.getMinimumWidth(), drawable.getMinimumHeight());
mainCommendHolder.mTvPhone.setCompoundDrawables(drawable, null, null, null);
}
} else {
Glide.with(mContext)
.load("")
.apply(options)
.into(mainCommendHolder.mIvImg);
.load("")
.apply(mPlaceholder)
.into(mainCommendHolder.mIvImg);
Drawable drawable = mContext.getResources().getDrawable(R.drawable.ic_phone_hollow);
drawable.setBounds(0, 0, drawable.getMinimumWidth(), drawable.getMinimumHeight());
mainCommendHolder.mTvPhone.setCompoundDrawables(drawable, null, null, null);
}
mainCommendHolder.mTvName.setText(mData.get(i).getName());
mainCommendHolder.mTvTime.setText(mData.get(i).getTime());
mainCommendHolder.mTvPhone.setText(mData.get(i).getPhone());
if (1 == mData.get(i).getType()) {
//活动
mainCommendHolder.mTvType.setText("精彩活动");

12
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/MainFuncAdapter.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/adapter/MainFuncAdapter.java
View File

@ -1,20 +1,16 @@
package com.tengshisoft.mudulemain.cultural.adapter;
package com.tengshisoft.mudulemain.jncultural.adapter;
import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import com.bumptech.glide.Glide;
import com.sucstepsoft.cm_utils.core.widget.base.BaseRecyclerAdapter;
import com.sucstepsoft.cm_utils.utils.ConvertUtils;
import com.sucstepsoft.cm_utils.utils.LogUtils;
import com.sucstepsoft.cm_utils.utils.ScreenUtils;
import com.tengshisoft.mudulemain.R;
import com.tengshisoft.mudulemain.cultural.beans.MainFuncBean;
import com.tengshisoft.mudulemain.cultural.holder.MainFuncHolder;
import com.tengshisoft.mudulemain.jncultural.beans.MainFuncBean;
import com.tengshisoft.mudulemain.jncultural.holder.MainFuncHolder;
import java.util.List;
@ -46,7 +42,7 @@ public class MainFuncAdapter extends BaseRecyclerAdapter<MainFuncBean, MainFuncH
@Override
public void bindHolder(MainFuncHolder mainFuncHolder, int i) {
mainFuncHolder.mTvName.setTypeFaceType(1);
mainFuncHolder.mTvName.setTypeFaceType(5);
Glide.with(mContext)
.load(mData.get(i).getIconRes())
.into(mainFuncHolder.mIvIcon);

24
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/NewsAdapter.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/adapter/NewsAdapter.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft.mudulemain.cultural.adapter;
package com.tengshisoft.mudulemain.jncultural.adapter;
import android.content.Context;
@ -10,32 +10,28 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.webkit.SslErrorHandler;
import android.webkit.WebResourceRequest;
import android.webkit.WebSettings;
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;
import com.tengshisoft.mudulemain.cultural.holder.news.NewsMovieHolder;
import com.tengshisoft.mudulemain.cultural.holder.news.NewsMultiPicHolder;
import com.tengshisoft.mudulemain.cultural.holder.news.NewsNoPicHolder;
import com.tengshisoft.mudulemain.cultural.holder.news.NewsSinglePicBottomHolder;
import com.tengshisoft.mudulemain.cultural.holder.news.NewsSinglePicLeftHolder;
import com.tengshisoft.mudulemain.cultural.holder.news.NewsSinglePicRightHolder;
import com.tengshisoft.mudulemain.cultural.holder.news.NewsVoiceHolder;
import com.tengshisoft.mudulemain.cultural.holder.news.NewsWebHolder;
import com.tengshisoft.mudulemain.jncultural.beans.NewsItemBean;
import com.tengshisoft.mudulemain.jncultural.holder.news.NewsMovieHolder;
import com.tengshisoft.mudulemain.jncultural.holder.news.NewsMultiPicHolder;
import com.tengshisoft.mudulemain.jncultural.holder.news.NewsNoPicHolder;
import com.tengshisoft.mudulemain.jncultural.holder.news.NewsSinglePicBottomHolder;
import com.tengshisoft.mudulemain.jncultural.holder.news.NewsSinglePicLeftHolder;
import com.tengshisoft.mudulemain.jncultural.holder.news.NewsSinglePicRightHolder;
import com.tengshisoft.mudulemain.jncultural.holder.news.NewsVoiceHolder;
import com.tengshisoft.mudulemain.jncultural.holder.news.NewsWebHolder;
import java.util.List;

189
modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/adapter/NewsMainAdapter.java Normal file
View File

@ -0,0 +1,189 @@
package com.tengshisoft.mudulemain.jncultural.adapter;
import android.content.Context;
import android.net.http.SslError;
import android.os.Build;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.webkit.SslErrorHandler;
import android.webkit.WebSettings;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import com.bumptech.glide.Glide;
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.RoundedCornersTransform;
import com.sucstepsoft.cm_utils.utils.ConvertUtils;
import com.sucstepsoft.cm_utils.utils.LogUtils;
import com.tengshisoft.mudulemain.R;
import com.tengshisoft.mudulemain.jncultural.beans.NewsItemBean;
import com.tengshisoft.mudulemain.jncultural.holder.news.NewsMainHolder;
import com.tengshisoft.mudulemain.jncultural.holder.news.NewsNoPicHolder;
import com.tengshisoft.mudulemain.jncultural.holder.news.NewsVoiceHolder;
import com.tengshisoft.mudulemain.jncultural.holder.news.NewsWebHolder;
import java.util.List;
import androidx.recyclerview.widget.RecyclerView;
/**
* 作者: adam
* 日期: 2020/4/13 - 5:29 PM
* 邮箱: itgaojian@163.com
* 描述:
*/
public class NewsMainAdapter extends BaseRecyclerAdapter<NewsItemBean.RowsBean, RecyclerView.ViewHolder> {
private RequestOptions mPicOptions;
public NewsMainAdapter(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(roundedCornersTransform)
.error(R.drawable.ic_img_default)
.placeholder(R.drawable.ic_img_default);
}
@Override
public RecyclerView.ViewHolder createHolder(ViewGroup parent, int viewType) {
if (viewType == PathConfig.NEWS_TYPE_TEXT) {
//无图片
View itemView = LayoutInflater.from(mContext).inflate(R.layout.item_news_no_pic, parent, false);
return new NewsNoPicHolder(itemView);
} else if (viewType == PathConfig.NEWS_TYPE_SINGLE_PIC_LEFT || viewType == PathConfig.NEWS_TYPE_SINGLE_PIC_RIGHT || viewType == PathConfig.NEWS_TYPE_SINGLE_PIC_BOTTOM || viewType == PathConfig.NEWS_TYPE_MULTI_PIC || viewType == PathConfig.NEWS_TYPE_VIDEO) {
//首页
View itemView = LayoutInflater.from(mContext).inflate(R.layout.item_news_main, parent, false);
return new NewsMainHolder(itemView);
} else if (viewType == PathConfig.NEWS_TYPE_VOICE) {
//音频
View itemView = LayoutInflater.from(mContext).inflate(R.layout.item_news_voice, parent, false);
return new NewsVoiceHolder(itemView);
} else if (viewType == PathConfig.NEWS_TYPE_WEB) {
//web
View itemView = LayoutInflater.from(mContext).inflate(R.layout.item_news_webview, parent, false);
NewsWebHolder holder = new NewsWebHolder(itemView);
return holder;
} else {
//默认文本
View itemView = LayoutInflater.from(mContext).inflate(R.layout.item_news_no_pic, parent, false);
return new NewsNoPicHolder(itemView);
}
}
@Override
public void bindHolder(RecyclerView.ViewHolder newsHolder, int i) {
NewsItemBean.RowsBean bean = mData.get(i);
int type = 0;
if (newsHolder instanceof NewsNoPicHolder) {
//无图片
NewsNoPicHolder holder = (NewsNoPicHolder) newsHolder;
holder.mTvTitle.setText(bean.getNewsContentTitle());
holder.mTvCommentNum.setText(bean.getNewsContentCommentNumber() + "评论");
holder.mTvPublishDate.setText(bean.getNewsContentPublishTime());
holder.mTvSource.setText(bean.getNewsContentAuthor());
type = 0;
} else if (newsHolder instanceof NewsMainHolder) {
//首页列表
NewsMainHolder holder = (NewsMainHolder) newsHolder;
holder.mTvTitle.setText(bean.getNewsContentTitle());
holder.mTvContent.setText(bean.getNewsContentContent());
holder.mTvTime.setText(bean.getNewsContentPublishTime());
Glide.with(mContext)
.load(BaseUrlApi.BASE_NEWS_IMG_URL + mData.get(i).getNewsContentCoverList().get(0).getContentCoverId())
.apply(mPicOptions)
.into(holder.mIvPic);
type = 0;
} else if (newsHolder instanceof NewsWebHolder) {
//web
NewsWebHolder holder = (NewsWebHolder) newsHolder;
WebSettings settings = holder.mWebView.getSettings();
settings.setJavaScriptEnabled(true);
settings.setDefaultTextEncodingName("utf-8");
settings.setUseWideViewPort(true);
settings.setLoadWithOverviewMode(true);
settings.setCacheMode(WebSettings.LOAD_NO_CACHE);
LogUtils.e(mData.get(i).getNewsConfigListText());
holder.mWebView.loadData(mData.get(i).getNewsConfigListText(), "text/html", "utf-8");
holder.mWebView.setWebViewClient(new WebViewClient() {
@Override
public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
holder.mWebView.getSettings()
.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
}
}
});
type = 1;
} else if (newsHolder instanceof NewsVoiceHolder) {
//音频
NewsVoiceHolder holder = (NewsVoiceHolder) newsHolder;
holder.mTvTitle.setText(bean.getNewsContentTitle());
holder.mTvCommentNum.setText(bean.getNewsContentCommentNumber() + "评论");
holder.mTvPublishDate.setText(bean.getNewsContentPublishTime());
holder.mTvSource.setText(bean.getNewsContentAuthor());
type = 0;
}
int finalType = type;
if (mClickByTypeListener != null) {
newsHolder.itemView.setOnClickListener(v -> mClickByTypeListener.onTypeClick(mData.get(i), finalType));
}
}
@Override
public int getItemViewType(int position) {
NewsItemBean.RowsBean bean = mData.get(position);
//key_1 三图; key_2 一图左;key_3 一图右;key_4 一图下;key_5 纯文字;key_6 视频;key_7 音频;
if ("0".equals(bean.getNewsConfigWebSwitch()) || "2".equals(bean.getNewsConfigWebSwitch())) {
//无自定义
//2自定义详情
if ("key_1".equals(bean.getTypesettingCode())) {
return PathConfig.NEWS_TYPE_MULTI_PIC;
} else if ("key_2".equals(bean.getTypesettingCode())) {
return PathConfig.NEWS_TYPE_SINGLE_PIC_LEFT;
} else if ("key_3".equals(bean.getTypesettingCode())) {
return PathConfig.NEWS_TYPE_SINGLE_PIC_RIGHT;
} else if ("key_4".equals(bean.getTypesettingCode())) {
return PathConfig.NEWS_TYPE_SINGLE_PIC_BOTTOM;
} else if ("key_5".equals(bean.getTypesettingCode())) {
return PathConfig.NEWS_TYPE_TEXT;
} else if ("key_6".equals(bean.getTypesettingCode())) {
return PathConfig.NEWS_TYPE_VIDEO;
} else if ("key_7".equals(bean.getTypesettingCode())) {
return PathConfig.NEWS_TYPE_VOICE;
} else {
return PathConfig.NEWS_TYPE_TEXT;
}
} else {
//1自定义列表
//3列表详情
return PathConfig.NEWS_TYPE_WEB;
}
}
private FunctionListener mFunctionListener;
public void addOnFunctionListener(FunctionListener listener) {
this.mFunctionListener = listener;
}
public interface FunctionListener {
void onClickListener();
}
public ItemClickByTypeListener mClickByTypeListener;
public void addOnItemClickByType(ItemClickByTypeListener listener) {
this.mClickByTypeListener = listener;
}
public interface ItemClickByTypeListener {
void onTypeClick(NewsItemBean.RowsBean bean, int type);
}
}

5
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/NewsMenuAdapter.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/adapter/NewsMenuAdapter.java
View File

@ -1,10 +1,9 @@
package com.tengshisoft.mudulemain.cultural.adapter;
package com.tengshisoft.mudulemain.jncultural.adapter;
import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.BaseAdapter;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
@ -14,7 +13,7 @@ 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.tengshisoft.mudulemain.R;
import com.tengshisoft.mudulemain.cultural.beans.NewsTabBean;
import com.tengshisoft.mudulemain.jncultural.beans.NewsTabBean;
import java.util.List;

4
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/PhotoAdapter.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/adapter/PhotoAdapter.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft.mudulemain.cultural.adapter;
package com.tengshisoft.mudulemain.jncultural.adapter;
import android.content.Context;
import android.view.LayoutInflater;
@ -9,7 +9,7 @@ import com.bumptech.glide.Glide;
import com.bumptech.glide.request.RequestOptions;
import com.sucstepsoft.cm_utils.core.widget.base.BaseRecyclerAdapter;
import com.tengshisoft.mudulemain.R;
import com.tengshisoft.mudulemain.cultural.holder.PhotoHolder;
import com.tengshisoft.mudulemain.jncultural.holder.PhotoHolder;
import java.util.List;

0
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/base/BaseMyApplication.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/base/BaseMyApplication.java
View File

2
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/AppTokenUser.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/AppTokenUser.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft.mudulemain.cultural.beans;
package com.tengshisoft.mudulemain.jncultural.beans;
import java.util.List;

2
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/AreaListBean.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/AreaListBean.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft.mudulemain.cultural.beans;
package com.tengshisoft.mudulemain.jncultural.beans;
import java.util.List;

2
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/BaseUserBean.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/BaseUserBean.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft.mudulemain.cultural.beans;
package com.tengshisoft.mudulemain.jncultural.beans;
/**
* 作者: Adam

2
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/CollectBean.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/CollectBean.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft.mudulemain.cultural.beans;
package com.tengshisoft.mudulemain.jncultural.beans;
/**
* 作者: adam

2
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/CommentListBean.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/CommentListBean.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft.mudulemain.cultural.beans;
package com.tengshisoft.mudulemain.jncultural.beans;
import java.util.List;

2
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/CommentPublishBean.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/CommentPublishBean.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft.mudulemain.cultural.beans;
package com.tengshisoft.mudulemain.jncultural.beans;
/**
* 作者: adam

2
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/CommentSuccessBean.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/CommentSuccessBean.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft.mudulemain.cultural.beans;
package com.tengshisoft.mudulemain.jncultural.beans;
/**
* 作者: adam

2
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/ForgetPwdBean.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/ForgetPwdBean.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft.mudulemain.cultural.beans;
package com.tengshisoft.mudulemain.jncultural.beans;
/**
* 作者: adam

2
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/LikeBean.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/LikeBean.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft.mudulemain.cultural.beans;
package com.tengshisoft.mudulemain.jncultural.beans;
/**
* 作者: adam

2
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/LiveBean.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/LiveBean.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft.mudulemain.cultural.beans;
package com.tengshisoft.mudulemain.jncultural.beans;
/**
* 作者: adam

2
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/LoginUser.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/LoginUser.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft.mudulemain.cultural.beans;
package com.tengshisoft.mudulemain.jncultural.beans;
/**
* 作者: Adam

20
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/MainCommendBean.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/MainCommendBean.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft.mudulemain.cultural.beans;
package com.tengshisoft.mudulemain.jncultural.beans;
/**
* 作者: adam
@ -11,6 +11,24 @@ public class MainCommendBean {
private String imgUrl;
private String id;
private String name;
private String phone;
private String time;
public String getPhone() {
return phone;
}
public void setPhone(String phone) {
this.phone = phone;
}
public String getTime() {
return time;
}
public void setTime(String time) {
this.time = time;
}
public String getName() {
return name;

2
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/MainFuncBean.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/MainFuncBean.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft.mudulemain.cultural.beans;
package com.tengshisoft.mudulemain.jncultural.beans;
/**
* 作者: adam

2
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/NewsCommentCount.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/NewsCommentCount.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft.mudulemain.cultural.beans;
package com.tengshisoft.mudulemain.jncultural.beans;
/**
* 作者: adam

38
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/NewsItemBean.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/NewsItemBean.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft.mudulemain.cultural.beans;
package com.tengshisoft.mudulemain.jncultural.beans;
import java.util.List;
@ -11,6 +11,15 @@ import java.util.List;
public class NewsItemBean {
@Override
public String toString() {
return "NewsItemBean{" +
"page=" + page +
", total=" + total +
", rows=" + rows +
'}';
}
/**
* rows : [{"newsContentId":"9a2142f3-f4f2-4074-b323-c5dfd9e67c66","newsContentTitle":"图文新闻测试图文新闻测试图文新闻测试图文新闻测试图文新闻测试图文新闻测试图文新闻测试","newsContentPublishTime":"2020-05-11","newsContentLabel":"娱乐|旅游","newsContentLabelList":[{"newsLabelConfigId":"711c3eec-5432-40fe-be4c-bade7706dd37","newsContentId":"9a2142f3-f4f2-4074-b323-c5dfd9e67c66","newsLabelId":"14ee92d3-664b-4f86-8fb3-fa6d42616700","labelName":"娱乐"},{"newsLabelConfigId":"dbbb20a0-fb29-47a8-a7b2-80681f81b142","newsContentId":"9a2142f3-f4f2-4074-b323-c5dfd9e67c66","newsLabelId":"e3a61bf7-4283-46c8-ada0-b17b9e6344a0","labelName":"旅游"}],"newsContentLikeNumber":0,"newsContentCommentNumber":0,"newsContentType":"2","newsContentAuthor":"图文新闻测试","newsContentCoverList":[{"newsContentCoverId":"28204ed1-e5a0-4883-a7d5-cad424a00573","contentCoverId":"0b567e8a-0517-42ee-87c2-d464080490dd","contentCoverOrder":0,"newsContentId":"9a2142f3-f4f2-4074-b323-c5dfd9e67c66"}],"templateRecordUrl":"news/image/2020/5/9a2142f3-f4f2-4074-b323-c5dfd9e67c66.html","typesettingCode":"key_2","newsConfigTop":"0","newsConfigHot":"0","newsConfigCommentImage":"1","newsConfigComment":"1","newsConfigListText":"","newsConfigDescriptionText":"","newsConfigWebSwitch":"0"}]
* page : 1
@ -305,6 +314,33 @@ public class NewsItemBean {
}
}
@Override
public String toString() {
return "RowsBean{" +
"newsContentId='" + newsContentId + '\'' +
", newsContentTitle='" + newsContentTitle + '\'' +
", newsContentPublishTime='" + newsContentPublishTime + '\'' +
", newsContentLabel='" + newsContentLabel + '\'' +
", newsContentLikeNumber=" + newsContentLikeNumber +
", newsContentCommentNumber=" + newsContentCommentNumber +
", newsContentType='" + newsContentType + '\'' +
", newsContentAuthor='" + newsContentAuthor + '\'' +
", templateRecordUrl='" + templateRecordUrl + '\'' +
", typesettingCode='" + typesettingCode + '\'' +
", newsConfigTop='" + newsConfigTop + '\'' +
", newsConfigHot='" + newsConfigHot + '\'' +
", newsConfigCommentImage='" + newsConfigCommentImage + '\'' +
", newsConfigComment='" + newsConfigComment + '\'' +
", newsConfigListText='" + newsConfigListText + '\'' +
", newsConfigDescriptionText='" + newsConfigDescriptionText + '\'' +
", newsConfigWebSwitch='" + newsConfigWebSwitch + '\'' +
", newsContentCollectStatus='" + newsContentCollectStatus + '\'' +
", newsContentContent='" + newsContentContent + '\'' +
", newsContentLabelList=" + newsContentLabelList +
", newsContentCoverList=" + newsContentCoverList +
'}';
}
public static class NewsContentCoverListBean {
/**
* newsContentCoverId : 28204ed1-e5a0-4883-a7d5-cad424a00573

2
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/NewsTabBean.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/NewsTabBean.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft.mudulemain.cultural.beans;
package com.tengshisoft.mudulemain.jncultural.beans;
/**
* 作者: adam

2
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/SearchBean.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/SearchBean.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft.mudulemain.cultural.beans;
package com.tengshisoft.mudulemain.jncultural.beans;
import java.util.List;

2
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/SuccessBean.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/SuccessBean.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft.mudulemain.cultural.beans;
package com.tengshisoft.mudulemain.jncultural.beans;
/**
* 作者: Adam

664
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/HomeFragment.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/fragment/HomeFragment.java
View File

@ -1,11 +1,10 @@
package com.tengshisoft.mudulemain.cultural.fragment;
package com.tengshisoft.mudulemain.jncultural.fragment;
import android.content.Context;
import android.graphics.Color;
import android.text.TextUtils;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.alibaba.android.arouter.facade.annotation.Route;
@ -19,7 +18,6 @@ import com.sucstepsoft.cm_utils.core.retrofit_net.BaseUrlApi;
import com.sucstepsoft.cm_utils.core.retrofit_net.RetrofitManager;
import com.sucstepsoft.cm_utils.core.widget.base.BannerImageTextAdapter;
import com.sucstepsoft.cm_utils.core.widget.base.BaseFragment;
import com.sucstepsoft.cm_utils.core.widget.views.ItemSplitDivider;
import com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView;
import com.sucstepsoft.cm_utils.utils.LogUtils;
import com.sucstepsoft.cm_utils.utils.ToastUtils;
@ -29,23 +27,23 @@ import com.tengshisoft.modulecultural.bean.CulturalLiveBean;
import com.tengshisoft.moduleplace.beans.PlaceListBean;
import com.tengshisoft.mudulemain.R;
import com.tengshisoft.mudulemain.R2;
import com.tengshisoft.mudulemain.cultural.activitys.base.MainActivity;
import com.tengshisoft.mudulemain.cultural.adapter.LiveAdapter;
import com.tengshisoft.mudulemain.cultural.adapter.MainCommendAdapter;
import com.tengshisoft.mudulemain.cultural.adapter.MainFuncAdapter;
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;
import com.tengshisoft.mudulemain.jncultural.activitys.base.MainActivity;
import com.tengshisoft.mudulemain.jncultural.adapter.LiveAdapter;
import com.tengshisoft.mudulemain.jncultural.adapter.MainCommendAdapter;
import com.tengshisoft.mudulemain.jncultural.adapter.MainFuncAdapter;
import com.tengshisoft.mudulemain.jncultural.adapter.NewsMainAdapter;
import com.tengshisoft.mudulemain.jncultural.beans.LiveBean;
import com.tengshisoft.mudulemain.jncultural.beans.MainCommendBean;
import com.tengshisoft.mudulemain.jncultural.beans.MainFuncBean;
import com.tengshisoft.mudulemain.jncultural.beans.NewsCommentCount;
import com.tengshisoft.mudulemain.jncultural.beans.NewsItemBean;
import com.tengshisoft.mudulemain.jncultural.beans.NewsTabBean;
import com.tengshisoft.mudulemain.jncultural.net.HomeApi;
import com.youth.banner.Banner;
import com.youth.banner.config.IndicatorConfig;
import com.youth.banner.indicator.CircleIndicator;
import com.youth.banner.transformer.ScaleInTransformer;
import org.aspectj.lang.annotation.Around;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
@ -94,16 +92,14 @@ public class HomeFragment extends BaseFragment {
ImageView mIvCommendEmpty;
@BindView(R2.id.tv_live)
TypeFaceTextView mTvLive;
@BindView(R2.id.ll_live)
LinearLayout mLlLive;
@BindView(R2.id.ll_main_news)
LinearLayout mLlMainNews;
private Unbinder mBind;
private List<MainFuncBean> mFuncBeans = new ArrayList<>();
private List<BaseImageBean> mBannerList = new ArrayList<>();
private List<NewsItemBean.RowsBean> mNewsBeans = new ArrayList<>();
private List<LiveBean> mLiveBeans = new ArrayList<>();
private NewsAdapter mMAdapter;
private NewsMainAdapter mMAdapter;
private RecyclerViewSkeletonScreen mNewsSkeleton;
private MainCommendAdapter mCommendAdapter;
private RecyclerViewSkeletonScreen mCommendSkeleton;
@ -120,13 +116,13 @@ public class HomeFragment extends BaseFragment {
mSrlView.setEnableRefresh(false);
// mLlMainNews.setOnClickListener(v -> ARouter.getInstance().build(PathConfig.PATH_MODULE_MAIN_NEWS_MAIN).navigation());
mRlvMainNews.setLayoutManager(new LinearLayoutManager(mActivity, LinearLayoutManager.VERTICAL, false));
mRlvMainNews.addItemDecoration(new ItemSplitDivider(mActivity, LinearLayoutManager.VERTICAL, 1, Color.parseColor("#F2F2F2")));
// mRlvMainNews.addItemDecoration(new ItemSplitDivider(mActivity, LinearLayoutManager.VERTICAL, 1, Color.parseColor("#F2F2F2")));
mRlvMainNews.setAdapter(mMAdapter);
mRlvLives.setLayoutManager(new GridLayoutManager(mActivity, 2));
mRlvLives.addItemDecoration(new ItemSplitDivider(mActivity, LinearLayoutManager.VERTICAL, 1, Color.parseColor("#F2F2F2")));
// mRlvLives.addItemDecoration(new ItemSplitDivider(mActivity, LinearLayoutManager.VERTICAL, 1, Color.parseColor("#F2F2F2")));
mLiveAdapter = new LiveAdapter(mActivity, mLiveBeans);
mRlvLives.setAdapter(mLiveAdapter);
mMAdapter = new NewsAdapter(mActivity, mNewsBeans);
mMAdapter = new NewsMainAdapter(mActivity, mNewsBeans);
mMAdapter.addOnItemClickByType(this::showNewsDetail);
mCommendAdapter = new MainCommendAdapter(mActivity, mMainCommendBeans);
mRlvCommend.setLayoutManager(new LinearLayoutManager(mActivity, LinearLayoutManager.HORIZONTAL, false));
@ -135,16 +131,16 @@ public class HomeFragment extends BaseFragment {
if (1 == mainCommendBean.getType()) {
//活动
ARouter.getInstance()
.build(PathConfig.PATH_MODULEACTIVITY_ACTIVITY_DETAIL)
.withString("id", mainCommendBean.getId())
.navigation();
.build(PathConfig.PATH_MODULEACTIVITY_ACTIVITY_DETAIL)
.withString("id", mainCommendBean.getId())
.navigation();
} else {
//场馆
ARouter.getInstance()
.build(PathConfig.PATH_MODULE_PLACE_ACTIVITY_PLACEDETAIL)
.withString("id", mainCommendBean.getId())
.withString("title", mainCommendBean.getName())
.navigation();
.build(PathConfig.PATH_MODULE_PLACE_ACTIVITY_PLACEDETAIL)
.withString("id", mainCommendBean.getId())
.withString("title", mainCommendBean.getName())
.navigation();
}
});
mLiveAdapter.addOnItemClickListener(liveBean -> {
@ -152,46 +148,46 @@ public class HomeFragment extends BaseFragment {
if ("0".equals(liveBean.getType())) {
//已经结束
ARouter.getInstance()
.build(PathConfig.PATH_MODULE_CULTURAL_LIVE_LOCKBACK)
.withString("id", liveBean.getId())
.navigation();
.build(PathConfig.PATH_MODULE_CULTURAL_LIVE_LOCKBACK)
.withString("id", liveBean.getId())
.navigation();
} else if ("1".equals(liveBean.getType())) {
//未开始
ARouter.getInstance()
.build(PathConfig.PATH_MODULE_CULTURAL_LIVE_DETAIL)
.withString("id", liveBean.getId())
.withString("type", "1")
.navigation();
.build(PathConfig.PATH_MODULE_CULTURAL_LIVE_DETAIL)
.withString("id", liveBean.getId())
.withString("type", "1")
.navigation();
} else if ("2".equals(liveBean.getType())) {
//直播中
ARouter.getInstance()
.build(PathConfig.PATH_MODULE_CULTURAL_LIVE_DETAIL)
.withString("id", liveBean.getId())
.withString("type", "2")
.navigation();
.build(PathConfig.PATH_MODULE_CULTURAL_LIVE_DETAIL)
.withString("id", liveBean.getId())
.withString("type", "2")
.navigation();
} else {
ToastUtils.showShort("数据错误");
}
});
mMainCommendBeans.clear();
mNewsSkeleton = Skeleton.bind(mRlvMainNews)
.adapter(mMAdapter)
.count(5)
.load(R.layout.item_skeleton_news)
.show();
.adapter(mMAdapter)
.count(5)
.load(R.layout.item_skeleton_news)
.show();
mCommendSkeleton = Skeleton.bind(mRlvCommend)
.adapter(mCommendAdapter)
.load(R.layout.item_skeleton_image)
.show();
.adapter(mCommendAdapter)
.load(R.layout.item_skeleton_image)
.show();
mBannerSkeleton = Skeleton.bind(mBanner)
.load(R.layout.item_skeleton_banner)
.show();
.load(R.layout.item_skeleton_banner)
.show();
mLiveSkeleton = Skeleton.bind(mRlvLives)
.adapter(mLiveAdapter)
.count(5)
.load(R.layout.item_skeleton_live_grid)
.show();
.adapter(mLiveAdapter)
.count(5)
.load(R.layout.item_skeleton_live_grid)
.show();
buildMainFuncMenu();
buildBannerData();
getNewsList(null);
@ -202,23 +198,23 @@ public class HomeFragment extends BaseFragment {
BaseImageBean bean = (BaseImageBean) data;
if ("6".equals(bean.getNewsContentType())) {
ARouter.getInstance()
.build(PathConfig.PATH_MODULE_MAIN_NEWS_WEB)
.withString("title", bean.getTitle())
.withString("url", bean.getNewContentContent())
.navigation();
.build(PathConfig.PATH_MODULE_MAIN_NEWS_WEB)
.withString("title", bean.getTitle())
.withString("url", bean.getNewContentContent())
.navigation();
} else {
if (!TextUtils.isEmpty(bean.getId())) {
ARouter.getInstance()
.build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL)
.withString("id", bean.getId())
.withString("url", bean.getUrl())
.withString("isComment", bean.getIsComment())//是否可以评论
.withString("isCommentImg", bean.getIsCommentImg())//评论是否可以上传图片
.withString("isCollect", bean.getIsCollect())
.withString("photo", bean.getPhoto())
.withString("title", bean.getTitle())
.withInt("type", bean.getNewsType())
.navigation();
.build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL)
.withString("id", bean.getId())
.withString("url", bean.getUrl())
.withString("isComment", bean.getIsComment())//是否可以评论
.withString("isCommentImg", bean.getIsCommentImg())//评论是否可以上传图片
.withString("isCollect", bean.getIsCollect())
.withString("photo", bean.getPhoto())
.withString("title", bean.getTitle())
.withInt("type", bean.getNewsType())
.navigation();
}
}
});
@ -231,15 +227,15 @@ public class HomeFragment extends BaseFragment {
private void getMainCommendList() {
Observable[] mObservales = new Observable[2];
Observable<PlaceListBean> hot = RetrofitManager.getInstance()
.create(HomeApi.class)
.getPlaceByOrder(UserLgUtils.getLocationLat(), UserLgUtils.getLocationLng(), "hot", "1", "3")
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
.create(HomeApi.class)
.getPlaceByOrder(UserLgUtils.getLocationLat(), UserLgUtils.getLocationLng(), "hot", "1", "3")
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
Observable<ActivityListBeans> mainActivityList = RetrofitManager.getInstance()
.create(HomeApi.class)
.getMainActivityList("1", "3")
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
.create(HomeApi.class)
.getMainActivityList("1", "3")
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
mObservales[0] = hot;
mObservales[1] = mainActivityList;
Observable observable = Observable.mergeArrayDelayError(mObservales);
@ -263,17 +259,22 @@ public class HomeFragment extends BaseFragment {
bean.setId(rowsBean.getVenuesInfoId());
bean.setImgUrl(rowsBean.getVenuePanorama());
bean.setName(rowsBean.getVenueName());
bean.setTime(rowsBean.getBusinessHours());
bean.setPhone(rowsBean.getVenueTelephone());
mMainCommendBeans.add(bean);
}
} else if (o instanceof ActivityListBeans) {
ActivityListBeans activityListBeans = (ActivityListBeans) o;
for (int i = 0; i < activityListBeans.getRows().size(); i++) {
ActivityListBeans.RowsBean rowsBean = activityListBeans.getRows().get(i);
LogUtils.e(rowsBean);
MainCommendBean bean = new MainCommendBean();
bean.setType(1);
bean.setId(rowsBean.getActivityLibraryId());
bean.setImgUrl(rowsBean.getActivityImage());
bean.setName(rowsBean.getActivityTitle());
bean.setTime(rowsBean.getActivityStartTime());
bean.setPhone(rowsBean.getActivityAddress());
mMainCommendBeans.add(bean);
}
}
@ -311,51 +312,51 @@ public class HomeFragment extends BaseFragment {
private void getLiveList() {
mLiveBeans.clear();
RetrofitManager.getInstance()
.create(HomeApi.class)
.getLiveRecord("1", "4")
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<CulturalLiveBean>() {
@Override
public void onSubscribe(Disposable d) {
}
.create(HomeApi.class)
.getLiveRecord("1", "4")
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<CulturalLiveBean>() {
@Override
public void onSubscribe(Disposable d) {
}
@Override
public void onNext(CulturalLiveBean culturalLiveBean) {
if (culturalLiveBean != null && culturalLiveBean.getRows() != null && culturalLiveBean.getRows().size() > 0) {
mIvLiveEmpty.setVisibility(View.GONE);
for (int i = 0; i < culturalLiveBean.getRows().size(); i++) {
List<CulturalLiveBean.RowsBean> rows = culturalLiveBean.getRows();
LiveBean bean = new LiveBean();
bean.setUrl(rows.get(i).getLivePlanPhoto());
bean.setTime(rows.get(i).getLivePlanStart());
bean.setTitle(rows.get(i).getLivePlanName());
bean.setType(rows.get(i).getLiveStatus());
bean.setId(rows.get(i).getLivePlanId());
mLiveBeans.add(bean);
}
mLiveAdapter.setData(mLiveBeans);
} else {
mIvLiveEmpty.setVisibility(View.VISIBLE);
@Override
public void onNext(CulturalLiveBean culturalLiveBean) {
if (culturalLiveBean != null && culturalLiveBean.getRows() != null && culturalLiveBean.getRows().size() > 0) {
mIvLiveEmpty.setVisibility(View.GONE);
for (int i = 0; i < culturalLiveBean.getRows().size(); i++) {
List<CulturalLiveBean.RowsBean> rows = culturalLiveBean.getRows();
LiveBean bean = new LiveBean();
bean.setUrl(rows.get(i).getLivePlanPhoto());
bean.setTime(rows.get(i).getLivePlanStart());
bean.setTitle(rows.get(i).getLivePlanName());
bean.setType(rows.get(i).getLiveStatus());
bean.setId(rows.get(i).getLivePlanId());
mLiveBeans.add(bean);
}
if (mLiveSkeleton != null) {
mLiveSkeleton.hide();
}
}
@Override
public void onError(Throwable e) {
mLiveAdapter.setData(mLiveBeans);
} else {
mIvLiveEmpty.setVisibility(View.VISIBLE);
if (mLiveSkeleton != null) {
mLiveSkeleton.hide();
}
}
@Override
public void onComplete() {
if (mLiveSkeleton != null) {
mLiveSkeleton.hide();
}
});
}
@Override
public void onError(Throwable e) {
mIvLiveEmpty.setVisibility(View.VISIBLE);
if (mLiveSkeleton != null) {
mLiveSkeleton.hide();
}
}
@Override
public void onComplete() {
}
});
}
@ -369,10 +370,10 @@ public class HomeFragment extends BaseFragment {
String url = "";
if ("6".equals(rowsBean.getNewsContentType())) {
ARouter.getInstance()
.build(PathConfig.PATH_MODULE_MAIN_NEWS_WEB)
.withString("title", rowsBean.getNewsContentTitle())
.withString("url", rowsBean.getNewsContentContent())
.navigation();
.build(PathConfig.PATH_MODULE_MAIN_NEWS_WEB)
.withString("title", rowsBean.getNewsContentTitle())
.withString("url", rowsBean.getNewsContentContent())
.navigation();
} else {
int newsType = 0;
if (type == 1) {
@ -392,82 +393,85 @@ public class HomeFragment extends BaseFragment {
url = rowsBean.getTemplateRecordUrl();
}
ARouter.getInstance()
.build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL)
.withString("id", rowsBean.getNewsContentId())
.withString("url", url)
.withString("isComment", rowsBean.getNewsConfigComment())//是否可以评论
.withString("isCommentImg", rowsBean.getNewsConfigCommentImage())//评论是否可以上传图片
.withString("isCollect", rowsBean.getNewsContentCollectStatus())
.withString("photo", BaseUrlApi.BASE_NEWS_IMG_URL + rowsBean.getNewsContentCoverList().get(0).getContentCoverId())
.withString("title", rowsBean.getNewsContentTitle())
.withInt("type", newsType)
.navigation();
.build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL)
.withString("id", rowsBean.getNewsContentId())
.withString("url", url)
.withString("isComment", rowsBean.getNewsConfigComment())//是否可以评论
.withString("isCommentImg", rowsBean.getNewsConfigCommentImage())//评论是否可以上传图片
.withString("isCollect", rowsBean.getNewsContentCollectStatus())
.withString("photo", BaseUrlApi.BASE_NEWS_IMG_URL + rowsBean.getNewsContentCoverList().get(0).getContentCoverId())
.withString("title", rowsBean.getNewsContentTitle())
.withInt("type", newsType)
.navigation();
}
}
private void getBannerData() {
RetrofitManager.getInstance()
.create(HomeApi.class)
.getMainNewsList(PathConfig.NEWS_BANNER_ID, "5", "1")
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<NewsItemBean>() {
@Override
public void onSubscribe(Disposable d) {
.create(HomeApi.class)
.getMainNewsList(PathConfig.NEWS_BANNER_ID, "5", "1")
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<NewsItemBean>() {
@Override
public void onSubscribe(Disposable d) {
}
}
@Override
public void onNext(NewsItemBean newsItemBean) {
if (newsItemBean != null && newsItemBean.getRows().size() > 0) {
List<NewsItemBean.RowsBean> rows = newsItemBean.getRows();
if (rows.size() > 0) {
mBannerList.clear();
for (int i = 0; i < rows.size(); i++) {
NewsItemBean.RowsBean rowsBean = rows.get(i);
BaseImageBean bean = new BaseImageBean();
bean.setName(rows.get(i).getNewsContentTitle());
bean.setId(rows.get(i).getNewsContentId());
List<NewsItemBean.RowsBean.NewsContentCoverListBean> newsContentCoverList = rows.get(i).getNewsContentCoverList();
String newsContentCoverId = newsContentCoverList.get(0).getContentCoverId();
bean.setImgUrl(BaseUrlApi.BASE_NEWS_IMG_URL + newsContentCoverId);
bean.setUrl(rowsBean.getTemplateRecordUrl());
bean.setIsComment(rowsBean.getNewsConfigComment());
bean.setIsCollect(rowsBean.getNewsContentCollectStatus());
bean.setTitle(rowsBean.getNewsContentTitle());
bean.setNewsContentType(rowsBean.getNewsContentType());
bean.setNewContentContent(rowsBean.getNewsContentContent());
bean.setNewsType(0);
bean.setPhoto(BaseUrlApi.BASE_NEWS_IMG_URL + newsContentCoverId);
mBannerList.add(bean);
}
mBannerImageAdapter.setDatas(mBannerList);
mBannerImageAdapter.notifyDataSetChanged();
mBanner.start();
@Override
public void onNext(NewsItemBean newsItemBean) {
if (newsItemBean != null && newsItemBean.getRows().size() > 0) {
List<NewsItemBean.RowsBean> rows = newsItemBean.getRows();
if (rows.size() > 0) {
mBannerList.clear();
for (int i = 0; i < rows.size(); i++) {
NewsItemBean.RowsBean rowsBean = rows.get(i);
BaseImageBean bean = new BaseImageBean();
bean.setName(rows.get(i).getNewsContentTitle());
bean.setId(rows.get(i).getNewsContentId());
List<NewsItemBean.RowsBean.NewsContentCoverListBean> newsContentCoverList = rows.get(i).getNewsContentCoverList();
String newsContentCoverId = newsContentCoverList.get(0).getContentCoverId();
bean.setImgUrl(BaseUrlApi.BASE_NEWS_IMG_URL + newsContentCoverId);
bean.setUrl(rowsBean.getTemplateRecordUrl());
bean.setIsComment(rowsBean.getNewsConfigComment());
bean.setIsCollect(rowsBean.getNewsContentCollectStatus());
bean.setTitle(rowsBean.getNewsContentTitle());
bean.setNewsContentType(rowsBean.getNewsContentType());
bean.setNewContentContent(rowsBean.getNewsContentContent());
bean.setNewsType(0);
bean.setPhoto(BaseUrlApi.BASE_NEWS_IMG_URL + newsContentCoverId);
mBannerList.add(bean);
}
} else {
mBannerImageAdapter.setDatas(mBannerList);
mBannerImageAdapter.notifyDataSetChanged();
mBanner.start();
}
}
@Override
public void onError(Throwable e) {
}
@Override
public void onComplete() {
} else {
}
});
}
@Override
public void onError(Throwable e) {
}
@Override
public void onComplete() {
}
});
}
private void buildBannerData() {
mBannerList.clear();
BaseImageBean bean = new BaseImageBean();
bean.setName("日喀则市数字文化云");
bean.setName("乌兰察布市数字文化云");
mBannerList.add(bean);
mBannerImageAdapter = new BannerImageTextAdapter(mBannerList);
mBanner.setAdapter(mBannerImageAdapter);
CircleIndicator indicator = new CircleIndicator(mMainActivity);
mBanner.setIndicator(indicator);
mBanner.setIndicatorSelectedColor(Color.WHITE);
mBanner.setPageTransformer(new ScaleInTransformer());
mBanner.start();
if (mBannerSkeleton != null) {
@ -483,157 +487,157 @@ public class HomeFragment extends BaseFragment {
*/
private void getNewsTabs() {
RetrofitManager.getInstance()
.create(HomeApi.class)
.getNewsTabListByPid(PathConfig.NEWS_ID)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<List<NewsTabBean>>() {
@Override
public void onSubscribe(Disposable d) {
}
.create(HomeApi.class)
.getNewsTabListByPid(PathConfig.NEWS_ID)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<List<NewsTabBean>>() {
@Override
public void onSubscribe(Disposable d) {
}
@Override
public void onNext(List<NewsTabBean> newsTabBeans) {
if (newsTabBeans != null && newsTabBeans.size() > 0) {
mIvNewsEmpty.setVisibility(View.GONE);
Random random = new Random();
int i = random.nextInt(newsTabBeans.size());
if (TextUtils.isEmpty(UserLgUtils.getToken())) {
} else {
getNewsListByToken(newsTabBeans.get(i));
}
@Override
public void onNext(List<NewsTabBean> newsTabBeans) {
if (newsTabBeans != null && newsTabBeans.size() > 0) {
mIvNewsEmpty.setVisibility(View.GONE);
Random random = new Random();
int i = random.nextInt(newsTabBeans.size());
if (TextUtils.isEmpty(UserLgUtils.getToken())) {
} else {
if (mNewsSkeleton != null) {
mNewsSkeleton.hide();
}
mIvNewsEmpty.setVisibility(View.VISIBLE);
getNewsListByToken(newsTabBeans.get(i));
}
}
@Override
public void onError(Throwable e) {
} else {
if (mNewsSkeleton != null) {
mNewsSkeleton.hide();
}
mIvNewsEmpty.setVisibility(View.VISIBLE);
}
}
@Override
public void onComplete() {
@Override
public void onError(Throwable e) {
if (mNewsSkeleton != null) {
mNewsSkeleton.hide();
}
});
mIvNewsEmpty.setVisibility(View.VISIBLE);
}
@Override
public void onComplete() {
}
});
}
private void getNewsListByToken(NewsTabBean newsTabBean) {
RetrofitManager.getInstance()
.create(HomeApi.class)
.getNewsMainListByToken(newsTabBean.getNewsDirectoriesId(), "5", "1", UserLgUtils.getToken())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<NewsItemBean>() {
@Override
public void onSubscribe(Disposable d) {
.create(HomeApi.class)
.getNewsMainListByToken(newsTabBean.getNewsDirectoriesId(), "5", "1", UserLgUtils.getToken())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<NewsItemBean>() {
@Override
public void onSubscribe(Disposable d) {
}
}
@Override
public void onNext(NewsItemBean newsItemBean) {
if (newsItemBean != null) {
if (newsItemBean.getRows() != null) {
if (newsItemBean.getRows().size() > 5) {
mNewsBeans = newsItemBean.getRows().subList(0, 5);
} else {
mNewsBeans = newsItemBean.getRows();
}
if (newsItemBean.getRows().size() > 0) {
mIvNewsEmpty.setVisibility(View.GONE);
} else {
mIvNewsEmpty.setVisibility(View.VISIBLE);
}
@Override
public void onNext(NewsItemBean newsItemBean) {
if (newsItemBean != null) {
if (newsItemBean.getRows() != null) {
if (newsItemBean.getRows().size() > 5) {
mNewsBeans = newsItemBean.getRows().subList(0, 5);
} else {
mNewsBeans = newsItemBean.getRows();
}
if (newsItemBean.getRows().size() > 0) {
mIvNewsEmpty.setVisibility(View.GONE);
} else {
mIvNewsEmpty.setVisibility(View.VISIBLE);
}
getCommentCount(1, newsItemBean);
// TODO mMAdapter.setData(mNewsBeans);
} else {
mIvNewsEmpty.setVisibility(View.VISIBLE);
}
if (mNewsSkeleton != null) {
mNewsSkeleton.hide();
}
}
@Override
public void onError(Throwable e) {
if (mNewsSkeleton != null) {
mNewsSkeleton.hide();
}
getCommentCount(1, newsItemBean);
// TODO mMAdapter.setData(mNewsBeans);
} else {
mIvNewsEmpty.setVisibility(View.VISIBLE);
}
@Override
public void onComplete() {
if (mNewsSkeleton != null) {
mNewsSkeleton.hide();
}
});
}
@Override
public void onError(Throwable e) {
if (mNewsSkeleton != null) {
mNewsSkeleton.hide();
}
mIvNewsEmpty.setVisibility(View.VISIBLE);
}
@Override
public void onComplete() {
}
});
}
private void getNewsList(NewsTabBean newsTabBean) {
//获取新闻
RetrofitManager.getInstance()
.create(HomeApi.class)
.getNewsTabListByPid(PathConfig.NEWS_ID, "5", "1")
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<NewsItemBean>() {
@Override
public void onSubscribe(Disposable d) {
.create(HomeApi.class)
.getNewsTabListByPid(PathConfig.NEWS_ID, "5", "1")
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<NewsItemBean>() {
@Override
public void onSubscribe(Disposable d) {
}
}
@Override
public void onNext(NewsItemBean newsItemBean) {
if (newsItemBean != null) {
if (newsItemBean.getRows() != null) {
if (newsItemBean.getRows().size() > 5) {
mNewsBeans = newsItemBean.getRows().subList(0, 5);
} else {
mNewsBeans = newsItemBean.getRows();
}
if (newsItemBean.getRows().size() > 0) {
mIvNewsEmpty.setVisibility(View.GONE);
} else {
mIvNewsEmpty.setVisibility(View.VISIBLE);
}
@Override
public void onNext(NewsItemBean newsItemBean) {
if (newsItemBean != null) {
if (newsItemBean.getRows() != null) {
if (newsItemBean.getRows().size() > 5) {
mNewsBeans = newsItemBean.getRows().subList(0, 5);
} else {
mNewsBeans = newsItemBean.getRows();
}
if (newsItemBean.getRows().size() > 0) {
mIvNewsEmpty.setVisibility(View.GONE);
} else {
mIvNewsEmpty.setVisibility(View.VISIBLE);
}
getCommentCount(1, newsItemBean);
// TODO mMAdapter.setData(mNewsBeans);
} else {
mIvNewsEmpty.setVisibility(View.VISIBLE);
}
if (mNewsSkeleton != null) {
mNewsSkeleton.hide();
}
}
@Override
public void onError(Throwable e) {
if (mNewsSkeleton != null) {
mNewsSkeleton.hide();
}
getCommentCount(1, newsItemBean);
// TODO mMAdapter.setData(mNewsBeans);
} else {
mIvNewsEmpty.setVisibility(View.VISIBLE);
}
@Override
public void onComplete() {
if (mNewsSkeleton != null) {
mNewsSkeleton.hide();
}
});
}
@Override
public void onError(Throwable e) {
if (mNewsSkeleton != null) {
mNewsSkeleton.hide();
}
mIvNewsEmpty.setVisibility(View.VISIBLE);
}
@Override
public void onComplete() {
}
});
}
/**
@ -651,42 +655,42 @@ public class HomeFragment extends BaseFragment {
}
}
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) {
.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());
}
@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);
}
mNewsBeans = newsItemBean.getRows();
mMAdapter.setData(mNewsBeans);
}
@Override
public void onError(@io.reactivex.annotations.NonNull Throwable e) {
mNewsBeans = newsItemBean.getRows();
mMAdapter.setData(mNewsBeans);
}
@Override
public void onError(@io.reactivex.annotations.NonNull Throwable e) {
mNewsBeans = newsItemBean.getRows();
mMAdapter.setData(mNewsBeans);
}
@Override
public void onComplete() {
@Override
public void onComplete() {
}
});
}
});
}
}
@ -724,7 +728,7 @@ public class HomeFragment extends BaseFragment {
cultivlateBean.setIconRes(R.drawable.ic_live_icon);
cultivlateBean.setTitle("在线培训");
MainFuncBean tourBean = new MainFuncBean();
tourBean.setIconRes(R.drawable.ic_place_icon);
tourBean.setIconRes(R.drawable.ic_travel_icon);
tourBean.setTitle("文化旅游");
mFuncBeans.add(showBean);
@ -790,29 +794,29 @@ public class HomeFragment extends BaseFragment {
ARouter.getInstance().build(PathConfig.PATH_MODULE_CULTURAL_VOUNTEER_MAIN).navigation();
} else if ("文化动态".equals(mainFuncBean.getTitle())) {
ARouter.getInstance().build(PathConfig.PATH_MODULE_MAIN_NEWS_MAIN)
.withString("title", "文化动态")
.withString("id", PathConfig.NEWS_ID)
.navigation();
.withString("title", "文化动态")
.withString("id", PathConfig.NEWS_ID)
.navigation();
} else if ("展览展示".equals(mainFuncBean.getTitle())) {
ARouter.getInstance().build(PathConfig.PATH_MODULE_MAIN_NEWS_MAIN)
.withString("title", "展览展示")
.withString("id", PathConfig.NEWS_SHOW_ID)
.navigation();
.withString("title", "展览展示")
.withString("id", PathConfig.NEWS_SHOW_ID)
.navigation();
} else if ("数图资源".equals(mainFuncBean.getTitle())) {
ARouter.getInstance().build(PathConfig.PATH_MODULE_MAIN_NEWS_MAIN)
.withString("title", "数图资源")
.withString("id", PathConfig.NEWS_BOOKS_ID)
.navigation();
.withString("title", "数图资源")
.withString("id", PathConfig.NEWS_BOOKS_ID)
.navigation();
} else if ("在线培训".equals(mainFuncBean.getTitle())) {
ARouter.getInstance().build(PathConfig.PATH_MODULE_MAIN_NEWS_MAIN)
.withString("title", "在线培训")
.withString("id", PathConfig.NEWS_CULTIVATE_ID)
.navigation();
.withString("title", "在线培训")
.withString("id", PathConfig.NEWS_CULTIVATE_ID)
.navigation();
} else if ("文化旅游".equals(mainFuncBean.getTitle())) {
ARouter.getInstance().build(PathConfig.PATH_MODULE_MAIN_NEWS_LIST)
.withString("id", PathConfig.NEWS_TOUR_ID)
.withString("title", "文化旅游")
.navigation();
.withString("id", PathConfig.NEWS_TOUR_ID)
.withString("title", "文化旅游")
.navigation();
}
}

17
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/NewsFragment.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/fragment/NewsFragment.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft.mudulemain.cultural.fragment;
package com.tengshisoft.mudulemain.jncultural.fragment;
import android.graphics.Color;
import android.text.TextUtils;
@ -7,25 +7,22 @@ import android.view.View;
import com.alibaba.android.arouter.launcher.ARouter;
import com.ethanhua.skeleton.RecyclerViewSkeletonScreen;
import com.ethanhua.skeleton.Skeleton;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.sucstepsoft.cm_utils.constant.PathConfig;
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.BaseFragment;
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.UserLgUtils;
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;
import com.tengshisoft.mudulemain.jncultural.adapter.NewsAdapter;
import com.tengshisoft.mudulemain.jncultural.adapter.NewsMenuAdapter;
import com.tengshisoft.mudulemain.jncultural.beans.NewsCommentCount;
import com.tengshisoft.mudulemain.jncultural.beans.NewsItemBean;
import com.tengshisoft.mudulemain.jncultural.beans.NewsTabBean;
import com.tengshisoft.mudulemain.jncultural.net.HomeApi;
import java.security.MessageDigest;
import java.util.ArrayList;
import java.util.List;

3
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/AreaHolder.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/AreaHolder.java
View File

@ -1,8 +1,7 @@
package com.tengshisoft.mudulemain.cultural.holder;
package com.tengshisoft.mudulemain.jncultural.holder;
import android.view.View;
import android.widget.CheckBox;
import android.widget.TextView;
import com.tengshisoft.mudulemain.R;

4
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/LiveHolder.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/LiveHolder.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft.mudulemain.cultural.holder;
package com.tengshisoft.mudulemain.jncultural.holder;
import android.view.View;
import android.widget.ImageView;
@ -19,13 +19,11 @@ public class LiveHolder extends RecyclerView.ViewHolder {
public TextView mTvTitle;
public TextView mTvType;
public ImageView mIvImg;
public TextView mTvTime;
public LiveHolder(@NonNull View itemView) {
super(itemView);
mTvTitle = itemView.findViewById(R.id.tv_title);
mTvType = itemView.findViewById(R.id.tv_type);
mIvImg = itemView.findViewById(R.id.iv_img);
mTvTime = itemView.findViewById(R.id.tv_time);
}
}

9
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/MainCommendHolder.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/MainCommendHolder.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft.mudulemain.cultural.holder;
package com.tengshisoft.mudulemain.jncultural.holder;
import android.view.View;
import android.widget.ImageView;
@ -19,10 +19,15 @@ public class MainCommendHolder extends RecyclerView.ViewHolder {
public TextView mTvType;
public ImageView mIvImg;
public TextView mTvName;
public TextView mTvTime;
public TextView mTvPhone;
public MainCommendHolder(@NonNull View itemView) {
super(itemView);
mTvType = itemView.findViewById(R.id.tv_type);
mIvImg = itemView.findViewById(R.id.iv_img);
mTvName=itemView.findViewById(R.id.tv_name);
mTvName = itemView.findViewById(R.id.tv_name);
mTvTime = itemView.findViewById(R.id.tv_time);
mTvPhone = itemView.findViewById(R.id.tv_phone);
}
}

3
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/MainFuncHolder.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/MainFuncHolder.java
View File

@ -1,8 +1,7 @@
package com.tengshisoft.mudulemain.cultural.holder;
package com.tengshisoft.mudulemain.jncultural.holder;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView;
import com.tengshisoft.mudulemain.R;

2
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/NewsHolder.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/NewsHolder.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft.mudulemain.cultural.holder;
package com.tengshisoft.mudulemain.jncultural.holder;
import android.view.View;

2
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/PhotoHolder.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/PhotoHolder.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft.mudulemain.cultural.holder;
package com.tengshisoft.mudulemain.jncultural.holder;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;

3
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/comment/CommentListHolder.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/comment/CommentListHolder.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft.mudulemain.cultural.holder.comment;
package com.tengshisoft.mudulemain.jncultural.holder.comment;
import android.view.View;
import android.widget.ImageView;
@ -9,7 +9,6 @@ import com.tengshisoft.mudulemain.R;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
/**
* 作者: adam

31
modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/news/NewsMainHolder.java Normal file
View File

@ -0,0 +1,31 @@
package com.tengshisoft.mudulemain.jncultural.holder.news;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import com.tengshisoft.mudulemain.R;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
/**
* 作者: adam
* 日期: 2020/5/12 - 10:28 AM
* 邮箱: itgaojian@163.com
* 描述: 首页列表
*/
public class NewsMainHolder extends RecyclerView.ViewHolder {
public ImageView mIvPic;
public TextView mTvTitle;
public TextView mTvContent;
public TextView mTvTime;
public NewsMainHolder(@NonNull View itemView) {
super(itemView);
mIvPic = itemView.findViewById(R.id.iv_pic);
mTvTitle = itemView.findViewById(R.id.tv_title);
mTvContent = itemView.findViewById(R.id.tv_content);
mTvTime = itemView.findViewById(R.id.tv_time);
}
}

2
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/news/NewsMovieHolder.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/news/NewsMovieHolder.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft.mudulemain.cultural.holder.news;
package com.tengshisoft.mudulemain.jncultural.holder.news;
import android.view.View;
import android.widget.ImageView;

2
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/news/NewsMultiPicHolder.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/news/NewsMultiPicHolder.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft.mudulemain.cultural.holder.news;
package com.tengshisoft.mudulemain.jncultural.holder.news;
import android.view.View;
import android.widget.ImageView;

2
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/news/NewsNoPicHolder.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/news/NewsNoPicHolder.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft.mudulemain.cultural.holder.news;
package com.tengshisoft.mudulemain.jncultural.holder.news;
import android.view.View;
import android.widget.ImageView;

2
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/news/NewsSinglePicBottomHolder.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/news/NewsSinglePicBottomHolder.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft.mudulemain.cultural.holder.news;
package com.tengshisoft.mudulemain.jncultural.holder.news;
import android.view.View;
import android.widget.ImageView;

2
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/news/NewsSinglePicHolder.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/news/NewsSinglePicHolder.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft.mudulemain.cultural.holder.news;
package com.tengshisoft.mudulemain.jncultural.holder.news;
import android.view.View;
import android.widget.ImageView;

2
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/news/NewsSinglePicLeftHolder.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/news/NewsSinglePicLeftHolder.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft.mudulemain.cultural.holder.news;
package com.tengshisoft.mudulemain.jncultural.holder.news;
import android.view.View;
import android.widget.ImageView;

2
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/news/NewsSinglePicRightHolder.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/news/NewsSinglePicRightHolder.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft.mudulemain.cultural.holder.news;
package com.tengshisoft.mudulemain.jncultural.holder.news;
import android.view.View;
import android.widget.ImageView;

2
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/news/NewsVoiceHolder.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/news/NewsVoiceHolder.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft.mudulemain.cultural.holder.news;
package com.tengshisoft.mudulemain.jncultural.holder.news;
import android.view.View;
import android.widget.ImageView;

4
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/news/NewsWebHolder.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/news/NewsWebHolder.java
View File

@ -1,9 +1,9 @@
package com.tengshisoft.mudulemain.cultural.holder.news;
package com.tengshisoft.mudulemain.jncultural.holder.news;
import android.view.View;
import com.tengshisoft.mudulemain.R;
import com.tengshisoft.mudulemain.cultural.widget.NewsNoClickWebView;
import com.tengshisoft.mudulemain.jncultural.widget.NewsNoClickWebView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;

16
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/net/HomeApi.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/net/HomeApi.java
View File

@ -1,17 +1,17 @@
package com.tengshisoft.mudulemain.cultural.net;
package com.tengshisoft.mudulemain.jncultural.net;
import com.sucstepsoft.cm_utils.core.beans.BaseSuccessBean;
import com.tengshisoft.moduleactivity.beans.ActivityListBeans;
import com.tengshisoft.modulecultural.bean.CulturalLiveBean;
import com.tengshisoft.modulecultural.bean.LegacyListBean;
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;
import com.tengshisoft.mudulemain.jncultural.beans.AreaListBean;
import com.tengshisoft.mudulemain.jncultural.beans.BaseUserBean;
import com.tengshisoft.mudulemain.jncultural.beans.CommentListBean;
import com.tengshisoft.mudulemain.jncultural.beans.NewsCommentCount;
import com.tengshisoft.mudulemain.jncultural.beans.NewsItemBean;
import com.tengshisoft.mudulemain.jncultural.beans.NewsTabBean;
import com.tengshisoft.mudulemain.jncultural.beans.SearchBean;
import java.util.List;

2
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/utils/AesUtil.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/utils/AesUtil.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft.mudulemain.cultural.utils;
package com.tengshisoft.mudulemain.jncultural.utils;
import android.util.Base64;

2
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/utils/ExceptionHandler.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/utils/ExceptionHandler.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft.mudulemain.cultural.utils;
package com.tengshisoft.mudulemain.jncultural.utils;
import android.text.TextUtils;

2
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/utils/GetIdUtil.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/utils/GetIdUtil.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft.mudulemain.cultural.utils;
package com.tengshisoft.mudulemain.jncultural.utils;
import android.annotation.SuppressLint;
import android.content.Context;

2
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/utils/GpsUtils.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/utils/GpsUtils.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft.mudulemain.cultural.utils;
package com.tengshisoft.mudulemain.jncultural.utils;
import android.app.PendingIntent;
import android.content.Context;

2
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/utils/PointUtils.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/utils/PointUtils.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft.mudulemain.cultural.utils;//package com.sucstepsoft.txrealtimelocation.utils;
package com.tengshisoft.mudulemain.jncultural.utils;//package com.sucstepsoft.txrealtimelocation.utils;
//
//import com.baidu.mapapi.model.LatLng;
//

2
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/utils/RegressionLine.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/utils/RegressionLine.java
View File

@ -1,4 +1,4 @@
package com.tengshisoft.mudulemain.cultural.utils;
package com.tengshisoft.mudulemain.jncultural.utils;
/**
* 作者: Adam

19
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/widget/ButtomCommentListDialogView.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/widget/ButtomCommentListDialogView.java
View File

@ -1,14 +1,12 @@
package com.tengshisoft.mudulemain.cultural.widget;
package com.tengshisoft.mudulemain.jncultural.widget;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.app.ProgressDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.graphics.Color;
import android.graphics.RenderNode;
import android.graphics.drawable.ColorDrawable;
import android.net.Uri;
import android.os.Build;
@ -22,7 +20,6 @@ import android.view.View;
import android.view.Window;
import android.view.WindowManager;
import android.view.inputmethod.InputMethodManager;
import android.widget.Adapter;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.LinearLayout;
@ -34,7 +31,6 @@ import com.bumptech.glide.Glide;
import com.bumptech.glide.load.resource.bitmap.CircleCrop;
import com.bumptech.glide.request.RequestOptions;
import com.google.gson.Gson;
import com.plattysoft.leonids.ParticleSystem;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.sucstepsoft.cm_utils.constant.PathConfig;
import com.sucstepsoft.cm_utils.core.beans.AddPhotoBean;
@ -51,12 +47,12 @@ import com.sucstepsoft.cm_utils.utils.ToastUtils;
import com.sucstepsoft.cm_utils.utils.UIUtil;
import com.sucstepsoft.cm_utils.utils.UserLgUtils;
import com.tengshisoft.mudulemain.R;
import com.tengshisoft.mudulemain.cultural.adapter.CommentAdapter;
import com.tengshisoft.mudulemain.cultural.beans.BaseUserBean;
import com.tengshisoft.mudulemain.cultural.beans.CommentListBean;
import com.tengshisoft.mudulemain.cultural.beans.CommentPublishBean;
import com.tengshisoft.mudulemain.cultural.beans.LikeBean;
import com.tengshisoft.mudulemain.cultural.net.HomeApi;
import com.tengshisoft.mudulemain.jncultural.adapter.CommentAdapter;
import com.tengshisoft.mudulemain.jncultural.beans.BaseUserBean;
import com.tengshisoft.mudulemain.jncultural.beans.CommentListBean;
import com.tengshisoft.mudulemain.jncultural.beans.CommentPublishBean;
import com.tengshisoft.mudulemain.jncultural.beans.LikeBean;
import com.tengshisoft.mudulemain.jncultural.net.HomeApi;
import java.io.File;
import java.util.ArrayList;
@ -65,7 +61,6 @@ import java.util.List;
import androidx.core.content.FileProvider;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import io.reactivex.Observer;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;

10
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/widget/NewsNoClickWebView.java → modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/widget/NewsNoClickWebView.java
View File

@ -1,18 +1,10 @@
package com.tengshisoft.mudulemain.cultural.widget;
package com.tengshisoft.mudulemain.jncultural.widget;
import android.annotation.SuppressLint;
import android.content.Context;
import android.os.Build;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.webkit.WebView;
import com.sucstepsoft.cm_utils.utils.LogUtils;
import java.util.Map;
import androidx.annotation.RequiresApi;
/**
* 作者: adam
* 日期: 2020/5/12 - 2:15 PM

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 903 B

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 991 B

BIN
modulemain/src/main/res/drawable-xhdpi/ic_clock_hollow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 317 B

BIN
modulemain/src/main/res/drawable-xhdpi/ic_clock_icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 569 B

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Some files were not shown because too many files have changed in this diff Show More