diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..824f3ae --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +cultural \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index df69934..e5b4a2e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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 diff --git a/app/src/androidTest/java/com/tengshisoft/cultural/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/tengshisoft/jncultural/ExampleInstrumentedTest.java similarity index 87% rename from app/src/androidTest/java/com/tengshisoft/cultural/ExampleInstrumentedTest.java rename to app/src/androidTest/java/com/tengshisoft/jncultural/ExampleInstrumentedTest.java index 36fefe3..a2b8e7e 100644 --- a/app/src/androidTest/java/com/tengshisoft/cultural/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/tengshisoft/jncultural/ExampleInstrumentedTest.java @@ -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; diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9272586..71bca27 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,9 +1,9 @@ + package="com.tengshisoft.jncultural"> - 日喀则市数字文化云 + 乌兰察布数字文化云 diff --git a/app/src/test/java/com/tengshisoft/cultural/ExampleUnitTest.java b/app/src/test/java/com/tengshisoft/jncultural/ExampleUnitTest.java similarity index 90% rename from app/src/test/java/com/tengshisoft/cultural/ExampleUnitTest.java rename to app/src/test/java/com/tengshisoft/jncultural/ExampleUnitTest.java index d854a64..2a9416f 100644 --- a/app/src/test/java/com/tengshisoft/cultural/ExampleUnitTest.java +++ b/app/src/test/java/com/tengshisoft/jncultural/ExampleUnitTest.java @@ -1,4 +1,4 @@ -package com.tengshisoft.cultural; +package com.tengshisoft.jncultural; import org.junit.Test; diff --git a/build.gradle b/build.gradle index eb93a30..fb32ad4 100644 --- a/build.gradle +++ b/build.gradle @@ -52,7 +52,7 @@ task clean(type: Delete) { } ext { gCompileSdkVersion = 29 - gMinSdkVersion = 16 + gMinSdkVersion = 21 gTargetSdkVersion = 29 gVersionCode = 12 gVersionName = '1.1.2' diff --git a/cm_utils/build.gradle b/cm_utils/build.gradle index c9756a0..446b07d 100755 --- a/cm_utils/build.gradle +++ b/cm_utils/build.gradle @@ -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' } diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/network/update/utils/NotificationHelper.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/network/update/utils/NotificationHelper.java index d7bbab1..3501952 100644 --- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/network/update/utils/NotificationHelper.java +++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/network/update/utils/NotificationHelper.java @@ -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) diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/BannerImageTextAdapter.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/BannerImageTextAdapter.java index 83fbe04..77a986c 100644 --- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/BannerImageTextAdapter.java +++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/BannerImageTextAdapter.java @@ -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 + + + + + \ No newline at end of file diff --git a/cm_utils/src/main/res/layout/base_activity.xml b/cm_utils/src/main/res/layout/base_activity.xml index ced4072..35e9b89 100755 --- a/cm_utils/src/main/res/layout/base_activity.xml +++ b/cm_utils/src/main/res/layout/base_activity.xml @@ -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="内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙内蒙" /> diff --git a/cm_utils/src/main/res/layout/item_banner_text.xml b/cm_utils/src/main/res/layout/item_banner_text.xml index 1360f35..127fd56 100644 --- a/cm_utils/src/main/res/layout/item_banner_text.xml +++ b/cm_utils/src/main/res/layout/item_banner_text.xml @@ -24,5 +24,6 @@ android:padding="8dp" android:singleLine="true" android:textColor="@color/white" + android:visibility="gone" tools:text="新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题" /> \ No newline at end of file diff --git a/cm_utils/src/main/res/values/colors.xml b/cm_utils/src/main/res/values/colors.xml index bf8d9f3..afff1cf 100755 --- a/cm_utils/src/main/res/values/colors.xml +++ b/cm_utils/src/main/res/values/colors.xml @@ -14,7 +14,7 @@ #39000000 #D70715 - #9F1512 + #122939 #77D70715 #889F1512 #339F1512 @@ -93,10 +93,10 @@ #686767 #535353 #00000000 - #9F1512 - #9F1512 + #FFFFFF + #FFFFFF - #FCF9F2 + #FAFAFA #F1F1F6 #F2F2F2 #BABABA @@ -161,6 +161,7 @@ #525252 #525252 #525252 + #122939 #8F8F8F #535353 #666666 diff --git a/moduleactivity/src/main/java/com/tengshisoft/moduleactivity/beans/ActivityListBeans.java b/moduleactivity/src/main/java/com/tengshisoft/moduleactivity/beans/ActivityListBeans.java index 5bf0ea3..79e5b93 100644 --- a/moduleactivity/src/main/java/com/tengshisoft/moduleactivity/beans/ActivityListBeans.java +++ b/moduleactivity/src/main/java/com/tengshisoft/moduleactivity/beans/ActivityListBeans.java @@ -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; } diff --git a/modulemain/src/main/AndroidManifest.xml b/modulemain/src/main/AndroidManifest.xml index 7cf9634..c71ba30 100644 --- a/modulemain/src/main/AndroidManifest.xml +++ b/modulemain/src/main/AndroidManifest.xml @@ -30,24 +30,24 @@ android:maxAspectRatio="2.4" android:resizeableActivity="true"> @@ -62,31 +62,31 @@ android:value="portrait|landscape" /> diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/SplashActivity.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/SplashActivity.java deleted file mode 100644 index 55fe1d8..0000000 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/SplashActivity.java +++ /dev/null @@ -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() { - @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(); - } - } -} diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/LiveAdapter.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/LiveAdapter.java deleted file mode 100644 index 1deba37..0000000 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/LiveAdapter.java +++ /dev/null @@ -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 { - public LiveAdapter(Context ctx, List list) { - super(ctx, list); - RoundedCornersTransform roundedCornersTransform = new RoundedCornersTransform(mContext, ConvertUtils.dp2px(5)); - roundedCornersTransform.setNeedCorner(true, true, true, true); - options = new RequestOptions() - .override(500, 500) - .error(com.sucstepsoft.cm_utils.R.drawable.ic_img_default) - .placeholder(com.sucstepsoft.cm_utils.R.drawable.ic_img_default) - .transform(roundedCornersTransform) - .diskCacheStrategy(DiskCacheStrategy.NONE); - } - - @Override - 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()); - } -} diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/ChooseCityActivity.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/base/ChooseCityActivity.java similarity index 97% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/ChooseCityActivity.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/base/ChooseCityActivity.java index 254fa83..c933687 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/ChooseCityActivity.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/base/ChooseCityActivity.java @@ -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; diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/DemoActivity.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/base/DemoActivity.java similarity index 62% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/DemoActivity.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/base/DemoActivity.java index 2ebc00c..9079d3b 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/DemoActivity.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/base/DemoActivity.java @@ -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; diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/ForgatPwdActivity.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/base/ForgatPwdActivity.java similarity index 98% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/ForgatPwdActivity.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/base/ForgatPwdActivity.java index e518e01..7e1e3dd 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/ForgatPwdActivity.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/base/ForgatPwdActivity.java @@ -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; diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/LoginActivity.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/base/LoginActivity.java similarity index 89% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/LoginActivity.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/base/LoginActivity.java index ef7df43..7389167 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/LoginActivity.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/base/LoginActivity.java @@ -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) diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/MainActivity.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/base/MainActivity.java similarity index 95% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/MainActivity.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/base/MainActivity.java index b6bd506..4de4c95 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/MainActivity.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/base/MainActivity.java @@ -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); diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/RegisterActivity.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/base/RegisterActivity.java similarity index 99% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/RegisterActivity.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/base/RegisterActivity.java index 8c5726e..f3be5e6 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/RegisterActivity.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/base/RegisterActivity.java @@ -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; diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/base/SplashActivity.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/base/SplashActivity.java new file mode 100644 index 0000000..736e2a6 --- /dev/null +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/base/SplashActivity.java @@ -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() { + @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(); + } + } +} diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsDetailActivity.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/news/NewsDetailActivity.java similarity index 98% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsDetailActivity.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/news/NewsDetailActivity.java index f142990..294f265 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsDetailActivity.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/news/NewsDetailActivity.java @@ -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); diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsListActivity.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/news/NewsListActivity.java similarity index 92% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsListActivity.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/news/NewsListActivity.java index f76fc52..3a3a4b2 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsListActivity.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/news/NewsListActivity.java @@ -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; diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsMainActivity.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/news/NewsMainActivity.java similarity index 95% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsMainActivity.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/news/NewsMainActivity.java index 588253a..fd9ceb8 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsMainActivity.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/news/NewsMainActivity.java @@ -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; diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsPdfActivity.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/news/NewsPdfActivity.java similarity index 98% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsPdfActivity.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/news/NewsPdfActivity.java index bf17efb..633991b 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsPdfActivity.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/news/NewsPdfActivity.java @@ -1,4 +1,4 @@ -package com.tengshisoft.mudulemain.cultural.activitys.news; +package com.tengshisoft.mudulemain.jncultural.activitys.news; import android.os.Environment; diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsWebActivity.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/news/NewsWebActivity.java similarity index 97% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsWebActivity.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/news/NewsWebActivity.java index d061675..20aeba8 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsWebActivity.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/news/NewsWebActivity.java @@ -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; diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/AreaListAdapter.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/adapter/AreaListAdapter.java similarity index 82% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/AreaListAdapter.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/adapter/AreaListAdapter.java index 904e72f..cd4a2e5 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/AreaListAdapter.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/adapter/AreaListAdapter.java @@ -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; diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/CommentAdapter.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/adapter/CommentAdapter.java similarity index 93% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/CommentAdapter.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/adapter/CommentAdapter.java index 9682542..ad62d2d 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/CommentAdapter.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/adapter/CommentAdapter.java @@ -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; diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/adapter/LiveAdapter.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/adapter/LiveAdapter.java new file mode 100644 index 0000000..05bae7b --- /dev/null +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/adapter/LiveAdapter.java @@ -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 { + public LiveAdapter(Context ctx, List 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("未开始"); + } + } +} diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/MainCommendAdapter.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/adapter/MainCommendAdapter.java similarity index 51% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/MainCommendAdapter.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/adapter/MainCommendAdapter.java index bb4a50e..97d484b 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/MainCommendAdapter.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/adapter/MainCommendAdapter.java @@ -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 { + private final RequestOptions mPlaceholder; + public MainCommendAdapter(Context ctx, List list) { super(ctx, list); RoundedCornersTransform roundedCornersTransform = new RoundedCornersTransform(mContext, ConvertUtils.dp2px(5)); - roundedCornersTransform.setNeedCorner(true, true, true, true); - options = new RequestOptions() - .override(500, 500) - .error(com.sucstepsoft.cm_utils.R.drawable.ic_img_default) - .placeholder(com.sucstepsoft.cm_utils.R.drawable.ic_img_default) - .transform(roundedCornersTransform) - .diskCacheStrategy(DiskCacheStrategy.NONE); + 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 { + private RequestOptions mPicOptions; + + public NewsMainAdapter(Context ctx, List 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); + } +} diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/NewsMenuAdapter.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/adapter/NewsMenuAdapter.java similarity index 93% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/NewsMenuAdapter.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/adapter/NewsMenuAdapter.java index d6f7425..41698e7 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/NewsMenuAdapter.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/adapter/NewsMenuAdapter.java @@ -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; diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/PhotoAdapter.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/adapter/PhotoAdapter.java similarity index 91% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/PhotoAdapter.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/adapter/PhotoAdapter.java index 77c842e..1b470f7 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/PhotoAdapter.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/adapter/PhotoAdapter.java @@ -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; diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/base/BaseMyApplication.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/base/BaseMyApplication.java similarity index 100% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/base/BaseMyApplication.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/base/BaseMyApplication.java diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/AppTokenUser.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/AppTokenUser.java similarity index 98% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/AppTokenUser.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/AppTokenUser.java index 94dab3a..92d0cb9 100755 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/AppTokenUser.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/AppTokenUser.java @@ -1,4 +1,4 @@ -package com.tengshisoft.mudulemain.cultural.beans; +package com.tengshisoft.mudulemain.jncultural.beans; import java.util.List; diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/AreaListBean.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/AreaListBean.java similarity index 98% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/AreaListBean.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/AreaListBean.java index be246ac..e6fc18f 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/AreaListBean.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/AreaListBean.java @@ -1,4 +1,4 @@ -package com.tengshisoft.mudulemain.cultural.beans; +package com.tengshisoft.mudulemain.jncultural.beans; import java.util.List; diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/BaseUserBean.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/BaseUserBean.java similarity index 83% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/BaseUserBean.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/BaseUserBean.java index 1a0334a..f05446b 100755 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/BaseUserBean.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/BaseUserBean.java @@ -1,4 +1,4 @@ -package com.tengshisoft.mudulemain.cultural.beans; +package com.tengshisoft.mudulemain.jncultural.beans; /** * 作者: Adam diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/CollectBean.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/CollectBean.java similarity index 88% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/CollectBean.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/CollectBean.java index c7cee15..4a8a511 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/CollectBean.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/CollectBean.java @@ -1,4 +1,4 @@ -package com.tengshisoft.mudulemain.cultural.beans; +package com.tengshisoft.mudulemain.jncultural.beans; /** * 作者: adam diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/CommentListBean.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/CommentListBean.java similarity index 99% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/CommentListBean.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/CommentListBean.java index 71724ec..0186661 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/CommentListBean.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/CommentListBean.java @@ -1,4 +1,4 @@ -package com.tengshisoft.mudulemain.cultural.beans; +package com.tengshisoft.mudulemain.jncultural.beans; import java.util.List; diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/CommentPublishBean.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/CommentPublishBean.java similarity index 98% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/CommentPublishBean.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/CommentPublishBean.java index e4c90b6..4e0ed6c 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/CommentPublishBean.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/CommentPublishBean.java @@ -1,4 +1,4 @@ -package com.tengshisoft.mudulemain.cultural.beans; +package com.tengshisoft.mudulemain.jncultural.beans; /** * 作者: adam diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/CommentSuccessBean.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/CommentSuccessBean.java similarity index 71% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/CommentSuccessBean.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/CommentSuccessBean.java index 815484f..64f7807 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/CommentSuccessBean.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/CommentSuccessBean.java @@ -1,4 +1,4 @@ -package com.tengshisoft.mudulemain.cultural.beans; +package com.tengshisoft.mudulemain.jncultural.beans; /** * 作者: adam diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/ForgetPwdBean.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/ForgetPwdBean.java similarity index 93% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/ForgetPwdBean.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/ForgetPwdBean.java index a9193e8..a8ea89e 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/ForgetPwdBean.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/ForgetPwdBean.java @@ -1,4 +1,4 @@ -package com.tengshisoft.mudulemain.cultural.beans; +package com.tengshisoft.mudulemain.jncultural.beans; /** * 作者: adam diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/LikeBean.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/LikeBean.java similarity index 92% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/LikeBean.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/LikeBean.java index 75756fb..a610888 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/LikeBean.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/LikeBean.java @@ -1,4 +1,4 @@ -package com.tengshisoft.mudulemain.cultural.beans; +package com.tengshisoft.mudulemain.jncultural.beans; /** * 作者: adam diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/LiveBean.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/LiveBean.java similarity index 94% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/LiveBean.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/LiveBean.java index 0bb9d3d..bc01b5e 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/LiveBean.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/LiveBean.java @@ -1,4 +1,4 @@ -package com.tengshisoft.mudulemain.cultural.beans; +package com.tengshisoft.mudulemain.jncultural.beans; /** * 作者: adam diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/LoginUser.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/LoginUser.java similarity index 97% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/LoginUser.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/LoginUser.java index 4d3c50e..d86720c 100755 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/LoginUser.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/LoginUser.java @@ -1,4 +1,4 @@ -package com.tengshisoft.mudulemain.cultural.beans; +package com.tengshisoft.mudulemain.jncultural.beans; /** * 作者: Adam diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/MainCommendBean.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/MainCommendBean.java similarity index 66% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/MainCommendBean.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/MainCommendBean.java index 912cd2c..4124463 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/MainCommendBean.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/MainCommendBean.java @@ -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; diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/MainFuncBean.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/MainFuncBean.java similarity index 89% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/MainFuncBean.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/MainFuncBean.java index 3d6dc41..6039762 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/MainFuncBean.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/MainFuncBean.java @@ -1,4 +1,4 @@ -package com.tengshisoft.mudulemain.cultural.beans; +package com.tengshisoft.mudulemain.jncultural.beans; /** * 作者: adam diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/NewsCommentCount.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/NewsCommentCount.java similarity index 90% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/NewsCommentCount.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/NewsCommentCount.java index 3380d49..6cdd198 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/NewsCommentCount.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/NewsCommentCount.java @@ -1,4 +1,4 @@ -package com.tengshisoft.mudulemain.cultural.beans; +package com.tengshisoft.mudulemain.jncultural.beans; /** * 作者: adam diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/NewsItemBean.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/NewsItemBean.java similarity index 87% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/NewsItemBean.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/NewsItemBean.java index 11a7f94..90a75e5 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/NewsItemBean.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/NewsItemBean.java @@ -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 diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/NewsTabBean.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/NewsTabBean.java similarity index 98% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/NewsTabBean.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/NewsTabBean.java index ebdd9b5..42f0dda 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/NewsTabBean.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/NewsTabBean.java @@ -1,4 +1,4 @@ -package com.tengshisoft.mudulemain.cultural.beans; +package com.tengshisoft.mudulemain.jncultural.beans; /** * 作者: adam diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/SearchBean.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/SearchBean.java similarity index 98% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/SearchBean.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/SearchBean.java index ce26807..3e693db 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/SearchBean.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/SearchBean.java @@ -1,4 +1,4 @@ -package com.tengshisoft.mudulemain.cultural.beans; +package com.tengshisoft.mudulemain.jncultural.beans; import java.util.List; diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/SuccessBean.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/SuccessBean.java similarity index 69% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/SuccessBean.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/SuccessBean.java index 3ea9a7e..f2cfd6a 100755 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/beans/SuccessBean.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/beans/SuccessBean.java @@ -1,4 +1,4 @@ -package com.tengshisoft.mudulemain.cultural.beans; +package com.tengshisoft.mudulemain.jncultural.beans; /** * 作者: Adam diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/HomeFragment.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/fragment/HomeFragment.java similarity index 54% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/HomeFragment.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/fragment/HomeFragment.java index 986bceb..79257f6 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/HomeFragment.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/fragment/HomeFragment.java @@ -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 mFuncBeans = new ArrayList<>(); private List mBannerList = new ArrayList<>(); private List mNewsBeans = new ArrayList<>(); private List 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 hot = RetrofitManager.getInstance() - .create(HomeApi.class) - .getPlaceByOrder(UserLgUtils.getLocationLat(), UserLgUtils.getLocationLng(), "hot", "1", "3") - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()); + .create(HomeApi.class) + .getPlaceByOrder(UserLgUtils.getLocationLat(), UserLgUtils.getLocationLng(), "hot", "1", "3") + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()); Observable mainActivityList = RetrofitManager.getInstance() - .create(HomeApi.class) - .getMainActivityList("1", "3") - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()); + .create(HomeApi.class) + .getMainActivityList("1", "3") + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()); mObservales[0] = hot; mObservales[1] = mainActivityList; Observable observable = Observable.mergeArrayDelayError(mObservales); @@ -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() { - @Override - public void onSubscribe(Disposable d) { - } + .create(HomeApi.class) + .getLiveRecord("1", "4") + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(Disposable d) { + } - @Override - public void onNext(CulturalLiveBean culturalLiveBean) { - if (culturalLiveBean != null && culturalLiveBean.getRows() != null && culturalLiveBean.getRows().size() > 0) { - mIvLiveEmpty.setVisibility(View.GONE); - for (int i = 0; i < culturalLiveBean.getRows().size(); i++) { - List rows = culturalLiveBean.getRows(); - LiveBean bean = new LiveBean(); - bean.setUrl(rows.get(i).getLivePlanPhoto()); - bean.setTime(rows.get(i).getLivePlanStart()); - bean.setTitle(rows.get(i).getLivePlanName()); - bean.setType(rows.get(i).getLiveStatus()); - bean.setId(rows.get(i).getLivePlanId()); - mLiveBeans.add(bean); - } - 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 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() { - @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() { + @Override + public void onSubscribe(Disposable d) { - } + } - @Override - public void onNext(NewsItemBean newsItemBean) { - if (newsItemBean != null && newsItemBean.getRows().size() > 0) { - List rows = newsItemBean.getRows(); - if (rows.size() > 0) { - mBannerList.clear(); - for (int i = 0; i < rows.size(); i++) { - NewsItemBean.RowsBean rowsBean = rows.get(i); - BaseImageBean bean = new BaseImageBean(); - bean.setName(rows.get(i).getNewsContentTitle()); - bean.setId(rows.get(i).getNewsContentId()); - List newsContentCoverList = rows.get(i).getNewsContentCoverList(); - String newsContentCoverId = newsContentCoverList.get(0).getContentCoverId(); - bean.setImgUrl(BaseUrlApi.BASE_NEWS_IMG_URL + newsContentCoverId); - bean.setUrl(rowsBean.getTemplateRecordUrl()); - bean.setIsComment(rowsBean.getNewsConfigComment()); - bean.setIsCollect(rowsBean.getNewsContentCollectStatus()); - bean.setTitle(rowsBean.getNewsContentTitle()); - bean.setNewsContentType(rowsBean.getNewsContentType()); - bean.setNewContentContent(rowsBean.getNewsContentContent()); - bean.setNewsType(0); - bean.setPhoto(BaseUrlApi.BASE_NEWS_IMG_URL + newsContentCoverId); - mBannerList.add(bean); - } - mBannerImageAdapter.setDatas(mBannerList); - mBannerImageAdapter.notifyDataSetChanged(); - mBanner.start(); + @Override + public void onNext(NewsItemBean newsItemBean) { + if (newsItemBean != null && newsItemBean.getRows().size() > 0) { + List rows = newsItemBean.getRows(); + if (rows.size() > 0) { + mBannerList.clear(); + for (int i = 0; i < rows.size(); i++) { + NewsItemBean.RowsBean rowsBean = rows.get(i); + BaseImageBean bean = new BaseImageBean(); + bean.setName(rows.get(i).getNewsContentTitle()); + bean.setId(rows.get(i).getNewsContentId()); + List newsContentCoverList = rows.get(i).getNewsContentCoverList(); + String newsContentCoverId = newsContentCoverList.get(0).getContentCoverId(); + bean.setImgUrl(BaseUrlApi.BASE_NEWS_IMG_URL + newsContentCoverId); + bean.setUrl(rowsBean.getTemplateRecordUrl()); + bean.setIsComment(rowsBean.getNewsConfigComment()); + bean.setIsCollect(rowsBean.getNewsContentCollectStatus()); + bean.setTitle(rowsBean.getNewsContentTitle()); + bean.setNewsContentType(rowsBean.getNewsContentType()); + bean.setNewContentContent(rowsBean.getNewsContentContent()); + bean.setNewsType(0); + bean.setPhoto(BaseUrlApi.BASE_NEWS_IMG_URL + newsContentCoverId); + mBannerList.add(bean); } - } 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>() { - @Override - public void onSubscribe(Disposable d) { - } + .create(HomeApi.class) + .getNewsTabListByPid(PathConfig.NEWS_ID) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer>() { + @Override + public void onSubscribe(Disposable d) { + } - @Override - public void onNext(List newsTabBeans) { - if (newsTabBeans != null && newsTabBeans.size() > 0) { - mIvNewsEmpty.setVisibility(View.GONE); - Random random = new Random(); - int i = random.nextInt(newsTabBeans.size()); - if (TextUtils.isEmpty(UserLgUtils.getToken())) { - - } else { - getNewsListByToken(newsTabBeans.get(i)); - } + @Override + public void onNext(List newsTabBeans) { + if (newsTabBeans != null && newsTabBeans.size() > 0) { + mIvNewsEmpty.setVisibility(View.GONE); + Random random = new Random(); + int i = random.nextInt(newsTabBeans.size()); + if (TextUtils.isEmpty(UserLgUtils.getToken())) { } else { - 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() { - @Override - public void onSubscribe(Disposable d) { + .create(HomeApi.class) + .getNewsMainListByToken(newsTabBean.getNewsDirectoriesId(), "5", "1", UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(Disposable d) { - } + } - @Override - public void onNext(NewsItemBean newsItemBean) { - if (newsItemBean != null) { - if (newsItemBean.getRows() != null) { - if (newsItemBean.getRows().size() > 5) { - mNewsBeans = newsItemBean.getRows().subList(0, 5); - } else { - mNewsBeans = newsItemBean.getRows(); - } - if (newsItemBean.getRows().size() > 0) { - mIvNewsEmpty.setVisibility(View.GONE); - } 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() { - @Override - public void onSubscribe(Disposable d) { + .create(HomeApi.class) + .getNewsTabListByPid(PathConfig.NEWS_ID, "5", "1") + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(Disposable d) { - } + } - @Override - public void onNext(NewsItemBean newsItemBean) { - if (newsItemBean != null) { - if (newsItemBean.getRows() != null) { - if (newsItemBean.getRows().size() > 5) { - mNewsBeans = newsItemBean.getRows().subList(0, 5); - } else { - mNewsBeans = newsItemBean.getRows(); - } - if (newsItemBean.getRows().size() > 0) { - mIvNewsEmpty.setVisibility(View.GONE); - } 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>() { - @Override - public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) { + .create(HomeApi.class) + .getNewsCommentNum(ids) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer>() { + @Override + public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) { - } + } - @Override - public void onNext(@io.reactivex.annotations.NonNull List newsCommentCounts) { - if (newsCommentCounts != null && newsCommentCounts.size() > 0) { - for (int i = 0; i < newsCommentCounts.size(); i++) { - for (int j = 0; j < newsItemBean.getRows().size(); j++) { - if (newsItemBean.getRows().get(j).getNewsContentId().equals(newsCommentCounts.get(i).getNewsContentId())) { - newsItemBean.getRows().get(j).setNewsContentCommentNumber(newsCommentCounts.get(i).getCommentCount()); - } + @Override + public void onNext(@io.reactivex.annotations.NonNull List newsCommentCounts) { + if (newsCommentCounts != null && newsCommentCounts.size() > 0) { + for (int i = 0; i < newsCommentCounts.size(); i++) { + for (int j = 0; j < newsItemBean.getRows().size(); j++) { + if (newsItemBean.getRows().get(j).getNewsContentId().equals(newsCommentCounts.get(i).getNewsContentId())) { + newsItemBean.getRows().get(j).setNewsContentCommentNumber(newsCommentCounts.get(i).getCommentCount()); } } } - mNewsBeans = newsItemBean.getRows(); - mMAdapter.setData(mNewsBeans); } + mNewsBeans = newsItemBean.getRows(); + mMAdapter.setData(mNewsBeans); + } - @Override - public void onError(@io.reactivex.annotations.NonNull Throwable e) { - mNewsBeans = newsItemBean.getRows(); - mMAdapter.setData(mNewsBeans); - } + @Override + public void onError(@io.reactivex.annotations.NonNull Throwable e) { + mNewsBeans = newsItemBean.getRows(); + mMAdapter.setData(mNewsBeans); + } - @Override - public void onComplete() { + @Override + public void onComplete() { - } - }); + } + }); } } @@ -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(); } } diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/NewsFragment.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/fragment/NewsFragment.java similarity index 96% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/NewsFragment.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/fragment/NewsFragment.java index 38fc458..a09a674 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/NewsFragment.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/fragment/NewsFragment.java @@ -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; diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/AreaHolder.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/AreaHolder.java similarity index 85% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/AreaHolder.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/AreaHolder.java index 7da2066..bde9456 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/AreaHolder.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/AreaHolder.java @@ -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; diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/LiveHolder.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/LiveHolder.java similarity index 83% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/LiveHolder.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/LiveHolder.java index cbc9420..a30e34a 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/LiveHolder.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/LiveHolder.java @@ -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); } } diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/MainCommendHolder.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/MainCommendHolder.java similarity index 70% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/MainCommendHolder.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/MainCommendHolder.java index 5cf0e9e..b45293c 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/MainCommendHolder.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/MainCommendHolder.java @@ -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); } } diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/MainFuncHolder.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/MainFuncHolder.java similarity index 88% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/MainFuncHolder.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/MainFuncHolder.java index fb5c160..a2a5c12 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/MainFuncHolder.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/MainFuncHolder.java @@ -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; diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/NewsHolder.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/NewsHolder.java similarity index 86% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/NewsHolder.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/NewsHolder.java index 75f4792..8022d6f 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/NewsHolder.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/NewsHolder.java @@ -1,4 +1,4 @@ -package com.tengshisoft.mudulemain.cultural.holder; +package com.tengshisoft.mudulemain.jncultural.holder; import android.view.View; diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/PhotoHolder.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/PhotoHolder.java similarity index 90% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/PhotoHolder.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/PhotoHolder.java index 7524188..3b9cfb1 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/PhotoHolder.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/PhotoHolder.java @@ -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; diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/comment/CommentListHolder.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/comment/CommentListHolder.java similarity index 94% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/comment/CommentListHolder.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/comment/CommentListHolder.java index fc6ae76..5cd5f2f 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/comment/CommentListHolder.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/comment/CommentListHolder.java @@ -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 diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/news/NewsMainHolder.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/news/NewsMainHolder.java new file mode 100644 index 0000000..449a3b5 --- /dev/null +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/news/NewsMainHolder.java @@ -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); + } +} diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/news/NewsMovieHolder.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/news/NewsMovieHolder.java similarity index 95% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/news/NewsMovieHolder.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/news/NewsMovieHolder.java index 5488a32..6e2f78b 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/news/NewsMovieHolder.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/news/NewsMovieHolder.java @@ -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; diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/news/NewsMultiPicHolder.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/news/NewsMultiPicHolder.java similarity index 95% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/news/NewsMultiPicHolder.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/news/NewsMultiPicHolder.java index b93977f..a6f149b 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/news/NewsMultiPicHolder.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/news/NewsMultiPicHolder.java @@ -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; diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/news/NewsNoPicHolder.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/news/NewsNoPicHolder.java similarity index 94% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/news/NewsNoPicHolder.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/news/NewsNoPicHolder.java index 0a883c4..55282f0 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/news/NewsNoPicHolder.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/news/NewsNoPicHolder.java @@ -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; diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/news/NewsSinglePicBottomHolder.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/news/NewsSinglePicBottomHolder.java similarity index 95% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/news/NewsSinglePicBottomHolder.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/news/NewsSinglePicBottomHolder.java index bd92824..8c23813 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/news/NewsSinglePicBottomHolder.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/news/NewsSinglePicBottomHolder.java @@ -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; diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/news/NewsSinglePicHolder.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/news/NewsSinglePicHolder.java similarity index 94% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/news/NewsSinglePicHolder.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/news/NewsSinglePicHolder.java index 2756a33..b514da0 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/news/NewsSinglePicHolder.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/news/NewsSinglePicHolder.java @@ -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; diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/news/NewsSinglePicLeftHolder.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/news/NewsSinglePicLeftHolder.java similarity index 95% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/news/NewsSinglePicLeftHolder.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/news/NewsSinglePicLeftHolder.java index 4480a78..7ac3fc5 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/news/NewsSinglePicLeftHolder.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/news/NewsSinglePicLeftHolder.java @@ -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; diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/news/NewsSinglePicRightHolder.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/news/NewsSinglePicRightHolder.java similarity index 95% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/news/NewsSinglePicRightHolder.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/news/NewsSinglePicRightHolder.java index 982d8da..77e2015 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/news/NewsSinglePicRightHolder.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/news/NewsSinglePicRightHolder.java @@ -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; diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/news/NewsVoiceHolder.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/news/NewsVoiceHolder.java similarity index 94% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/news/NewsVoiceHolder.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/news/NewsVoiceHolder.java index 4261699..bbd26e0 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/news/NewsVoiceHolder.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/news/NewsVoiceHolder.java @@ -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; diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/news/NewsWebHolder.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/news/NewsWebHolder.java similarity index 78% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/news/NewsWebHolder.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/news/NewsWebHolder.java index 3c7b5e6..0c79db7 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/holder/news/NewsWebHolder.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/news/NewsWebHolder.java @@ -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; diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/net/HomeApi.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/net/HomeApi.java similarity index 95% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/net/HomeApi.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/net/HomeApi.java index c4a7323..2d7318a 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/net/HomeApi.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/net/HomeApi.java @@ -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; diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/utils/AesUtil.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/utils/AesUtil.java similarity index 96% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/utils/AesUtil.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/utils/AesUtil.java index e2097bc..730a7d7 100755 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/utils/AesUtil.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/utils/AesUtil.java @@ -1,4 +1,4 @@ -package com.tengshisoft.mudulemain.cultural.utils; +package com.tengshisoft.mudulemain.jncultural.utils; import android.util.Base64; diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/utils/ExceptionHandler.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/utils/ExceptionHandler.java similarity index 98% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/utils/ExceptionHandler.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/utils/ExceptionHandler.java index 74c1754..4d0b999 100755 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/utils/ExceptionHandler.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/utils/ExceptionHandler.java @@ -1,4 +1,4 @@ -package com.tengshisoft.mudulemain.cultural.utils; +package com.tengshisoft.mudulemain.jncultural.utils; import android.text.TextUtils; diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/utils/GetIdUtil.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/utils/GetIdUtil.java similarity index 98% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/utils/GetIdUtil.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/utils/GetIdUtil.java index 8338c7d..e114214 100755 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/utils/GetIdUtil.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/utils/GetIdUtil.java @@ -1,4 +1,4 @@ -package com.tengshisoft.mudulemain.cultural.utils; +package com.tengshisoft.mudulemain.jncultural.utils; import android.annotation.SuppressLint; import android.content.Context; diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/utils/GpsUtils.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/utils/GpsUtils.java similarity index 97% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/utils/GpsUtils.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/utils/GpsUtils.java index 47c762e..6736fda 100755 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/utils/GpsUtils.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/utils/GpsUtils.java @@ -1,4 +1,4 @@ -package com.tengshisoft.mudulemain.cultural.utils; +package com.tengshisoft.mudulemain.jncultural.utils; import android.app.PendingIntent; import android.content.Context; diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/utils/PointUtils.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/utils/PointUtils.java similarity index 98% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/utils/PointUtils.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/utils/PointUtils.java index 649f74d..70e606c 100755 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/utils/PointUtils.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/utils/PointUtils.java @@ -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; // diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/utils/RegressionLine.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/utils/RegressionLine.java similarity index 70% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/utils/RegressionLine.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/utils/RegressionLine.java index f50a172..e7b5aeb 100755 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/utils/RegressionLine.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/utils/RegressionLine.java @@ -1,4 +1,4 @@ -package com.tengshisoft.mudulemain.cultural.utils; +package com.tengshisoft.mudulemain.jncultural.utils; /** * 作者: Adam diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/widget/ButtomCommentListDialogView.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/widget/ButtomCommentListDialogView.java similarity index 98% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/widget/ButtomCommentListDialogView.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/widget/ButtomCommentListDialogView.java index 6cd67a6..a2181f2 100755 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/widget/ButtomCommentListDialogView.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/widget/ButtomCommentListDialogView.java @@ -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; diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/widget/NewsNoClickWebView.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/widget/NewsNoClickWebView.java similarity index 82% rename from modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/widget/NewsNoClickWebView.java rename to modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/widget/NewsNoClickWebView.java index 4bf7c41..74472d3 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/widget/NewsNoClickWebView.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/widget/NewsNoClickWebView.java @@ -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 diff --git a/modulemain/src/main/res/drawable-xhdpi/ic_activity_icon.png b/modulemain/src/main/res/drawable-xhdpi/ic_activity_icon.png index 6745104..8d87839 100644 Binary files a/modulemain/src/main/res/drawable-xhdpi/ic_activity_icon.png and b/modulemain/src/main/res/drawable-xhdpi/ic_activity_icon.png differ diff --git a/modulemain/src/main/res/drawable-xhdpi/ic_activity_normal.png b/modulemain/src/main/res/drawable-xhdpi/ic_activity_normal.png index 8908627..ac6d854 100644 Binary files a/modulemain/src/main/res/drawable-xhdpi/ic_activity_normal.png and b/modulemain/src/main/res/drawable-xhdpi/ic_activity_normal.png differ diff --git a/modulemain/src/main/res/drawable-xhdpi/ic_activity_sel.png b/modulemain/src/main/res/drawable-xhdpi/ic_activity_sel.png index 86d56a0..ab0aebe 100644 Binary files a/modulemain/src/main/res/drawable-xhdpi/ic_activity_sel.png and b/modulemain/src/main/res/drawable-xhdpi/ic_activity_sel.png differ diff --git a/modulemain/src/main/res/drawable-xhdpi/ic_clock_hollow.png b/modulemain/src/main/res/drawable-xhdpi/ic_clock_hollow.png new file mode 100644 index 0000000..f76171f Binary files /dev/null and b/modulemain/src/main/res/drawable-xhdpi/ic_clock_hollow.png differ diff --git a/modulemain/src/main/res/drawable-xhdpi/ic_clock_icon.png b/modulemain/src/main/res/drawable-xhdpi/ic_clock_icon.png new file mode 100644 index 0000000..351aaed Binary files /dev/null and b/modulemain/src/main/res/drawable-xhdpi/ic_clock_icon.png differ diff --git a/modulemain/src/main/res/drawable-xhdpi/ic_cultural_normal.png b/modulemain/src/main/res/drawable-xhdpi/ic_cultural_normal.png index 987e005..b3461ff 100644 Binary files a/modulemain/src/main/res/drawable-xhdpi/ic_cultural_normal.png and b/modulemain/src/main/res/drawable-xhdpi/ic_cultural_normal.png differ diff --git a/modulemain/src/main/res/drawable-xhdpi/ic_cultural_sel.png b/modulemain/src/main/res/drawable-xhdpi/ic_cultural_sel.png index 5470772..5c787f5 100644 Binary files a/modulemain/src/main/res/drawable-xhdpi/ic_cultural_sel.png and b/modulemain/src/main/res/drawable-xhdpi/ic_cultural_sel.png differ diff --git a/modulemain/src/main/res/drawable-xhdpi/ic_cultural_trends_icon.png b/modulemain/src/main/res/drawable-xhdpi/ic_cultural_trends_icon.png index 4d22afd..5aa56c2 100644 Binary files a/modulemain/src/main/res/drawable-xhdpi/ic_cultural_trends_icon.png and b/modulemain/src/main/res/drawable-xhdpi/ic_cultural_trends_icon.png differ diff --git a/modulemain/src/main/res/drawable-xhdpi/ic_home_normal.png b/modulemain/src/main/res/drawable-xhdpi/ic_home_normal.png index d887292..7c19fc0 100644 Binary files a/modulemain/src/main/res/drawable-xhdpi/ic_home_normal.png and b/modulemain/src/main/res/drawable-xhdpi/ic_home_normal.png differ diff --git a/modulemain/src/main/res/drawable-xhdpi/ic_home_sel.png b/modulemain/src/main/res/drawable-xhdpi/ic_home_sel.png index 003727e..bb74c4e 100644 Binary files a/modulemain/src/main/res/drawable-xhdpi/ic_home_sel.png and b/modulemain/src/main/res/drawable-xhdpi/ic_home_sel.png differ diff --git a/modulemain/src/main/res/drawable-xhdpi/ic_legacy_icon.png b/modulemain/src/main/res/drawable-xhdpi/ic_legacy_icon.png index 7080a90..1ed6b89 100644 Binary files a/modulemain/src/main/res/drawable-xhdpi/ic_legacy_icon.png and b/modulemain/src/main/res/drawable-xhdpi/ic_legacy_icon.png differ diff --git a/modulemain/src/main/res/drawable-xhdpi/ic_live_icon.png b/modulemain/src/main/res/drawable-xhdpi/ic_live_icon.png index 5005d2f..e3531b4 100644 Binary files a/modulemain/src/main/res/drawable-xhdpi/ic_live_icon.png and b/modulemain/src/main/res/drawable-xhdpi/ic_live_icon.png differ diff --git a/modulemain/src/main/res/drawable-xhdpi/ic_mine_normal.png b/modulemain/src/main/res/drawable-xhdpi/ic_mine_normal.png index fa9171d..8938782 100644 Binary files a/modulemain/src/main/res/drawable-xhdpi/ic_mine_normal.png and b/modulemain/src/main/res/drawable-xhdpi/ic_mine_normal.png differ diff --git a/modulemain/src/main/res/drawable-xhdpi/ic_mine_sel.png b/modulemain/src/main/res/drawable-xhdpi/ic_mine_sel.png index aa9c213..7c3e990 100644 Binary files a/modulemain/src/main/res/drawable-xhdpi/ic_mine_sel.png and b/modulemain/src/main/res/drawable-xhdpi/ic_mine_sel.png differ diff --git a/modulemain/src/main/res/drawable-xhdpi/ic_phone_hollow.png b/modulemain/src/main/res/drawable-xhdpi/ic_phone_hollow.png new file mode 100644 index 0000000..623fd90 Binary files /dev/null and b/modulemain/src/main/res/drawable-xhdpi/ic_phone_hollow.png differ diff --git a/modulemain/src/main/res/drawable-xhdpi/ic_place_icon.png b/modulemain/src/main/res/drawable-xhdpi/ic_place_icon.png index c21423b..bb3b767 100644 Binary files a/modulemain/src/main/res/drawable-xhdpi/ic_place_icon.png and b/modulemain/src/main/res/drawable-xhdpi/ic_place_icon.png differ diff --git a/modulemain/src/main/res/drawable-xhdpi/ic_place_normal.png b/modulemain/src/main/res/drawable-xhdpi/ic_place_normal.png index 9f9f9e9..0c4f26c 100644 Binary files a/modulemain/src/main/res/drawable-xhdpi/ic_place_normal.png and b/modulemain/src/main/res/drawable-xhdpi/ic_place_normal.png differ diff --git a/modulemain/src/main/res/drawable-xhdpi/ic_place_sel.png b/modulemain/src/main/res/drawable-xhdpi/ic_place_sel.png index ab2eaea..73a3763 100644 Binary files a/modulemain/src/main/res/drawable-xhdpi/ic_place_sel.png and b/modulemain/src/main/res/drawable-xhdpi/ic_place_sel.png differ diff --git a/modulemain/src/main/res/drawable-xhdpi/ic_show_icon.png b/modulemain/src/main/res/drawable-xhdpi/ic_show_icon.png index 22c3870..2b2ce12 100644 Binary files a/modulemain/src/main/res/drawable-xhdpi/ic_show_icon.png and b/modulemain/src/main/res/drawable-xhdpi/ic_show_icon.png differ diff --git a/modulemain/src/main/res/drawable-xhdpi/ic_travel_icon.png b/modulemain/src/main/res/drawable-xhdpi/ic_travel_icon.png new file mode 100644 index 0000000..6b5bafe Binary files /dev/null and b/modulemain/src/main/res/drawable-xhdpi/ic_travel_icon.png differ diff --git a/modulemain/src/main/res/drawable-xhdpi/ic_video_play_icon.png b/modulemain/src/main/res/drawable-xhdpi/ic_video_play_icon.png new file mode 100644 index 0000000..a64f955 Binary files /dev/null and b/modulemain/src/main/res/drawable-xhdpi/ic_video_play_icon.png differ diff --git a/modulemain/src/main/res/drawable-xhdpi/ic_volunteer_icon.png b/modulemain/src/main/res/drawable-xhdpi/ic_volunteer_icon.png index 71c7ce5..b1d31df 100644 Binary files a/modulemain/src/main/res/drawable-xhdpi/ic_volunteer_icon.png and b/modulemain/src/main/res/drawable-xhdpi/ic_volunteer_icon.png differ diff --git a/modulemain/src/main/res/drawable/shape_main_bottom_bg.xml b/modulemain/src/main/res/drawable/shape_main_bottom_bg.xml index ceb76c1..10dac1c 100644 --- a/modulemain/src/main/res/drawable/shape_main_bottom_bg.xml +++ b/modulemain/src/main/res/drawable/shape_main_bottom_bg.xml @@ -1,7 +1,7 @@ - + + + + + + \ No newline at end of file diff --git a/modulemain/src/main/res/layout/activity_choose_city.xml b/modulemain/src/main/res/layout/activity_choose_city.xml index b35d4ca..7432d16 100644 --- a/modulemain/src/main/res/layout/activity_choose_city.xml +++ b/modulemain/src/main/res/layout/activity_choose_city.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent" android:background="@color/white" android:orientation="vertical" - tools:context=".cultural.activitys.base.ChooseCityActivity"> + tools:context=".jncultural.activitys.base.ChooseCityActivity"> diff --git a/modulemain/src/main/res/layout/activity_demo.xml b/modulemain/src/main/res/layout/activity_demo.xml index 783079b..e643120 100644 --- a/modulemain/src/main/res/layout/activity_demo.xml +++ b/modulemain/src/main/res/layout/activity_demo.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - tools:context=".cultural.activitys.base.DemoActivity" + tools:context=".jncultural.activitys.base.DemoActivity" tools:ignore="WebViewLayout"> + tools:context=".jncultural.activitys.base.RegisterActivity"> + tools:context=".jncultural.activitys.base.LoginActivity"> + android:background="@color/bg_gray"> + tools:context=".jncultural.activitys.news.NewsDetailActivity"> + tools:context=".jncultural.activitys.news.NewsMainActivity"> + tools:context=".jncultural.activitys.news.NewsPdfActivity"> + tools:context=".jncultural.activitys.news.NewsWebActivity"> \ No newline at end of file diff --git a/modulemain/src/main/res/layout/activity_register.xml b/modulemain/src/main/res/layout/activity_register.xml index f9f4c13..16f3de7 100644 --- a/modulemain/src/main/res/layout/activity_register.xml +++ b/modulemain/src/main/res/layout/activity_register.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".cultural.activitys.base.RegisterActivity"> + tools:context=".jncultural.activitys.base.RegisterActivity"> + tools:context=".jncultural.activitys.base.SplashActivity"> + android:layout_height="220dp" + android:layout_marginTop="15dp" /> + android:layout_height="wrap_content" + android:layout_marginTop="15dp"> - + android:padding="5dp" + android:text="精彩推荐" + android:textColor="@color/app_title_9f_no" + android:textSize="16sp" + android:textStyle="bold" + app:text_type_cus="5" /> - - - - - - - - - - - - - - - - + android:padding="5dp" + android:text="文化动态" + android:textColor="@color/app_title_9f_no" + android:textSize="16sp" + android:textStyle="bold" + app:text_type_cus="5" /> @@ -180,35 +149,19 @@ android:layout_height="2dp" android:background="@color/gray_line" /> - + android:padding="5dp" + android:text="直播专区" + android:textColor="@color/app_title_9f_no" + android:textSize="16sp" + android:textStyle="bold" + app:text_type_cus="5" /> - - - - - - - - + android:layout_height="wrap_content" + android:layout_margin="8dp" + android:orientation="vertical"> - + android:layout_height="110dp"> - - - + - - - + android:textSize="10sp" + tools:text="直播中" /> - \ No newline at end of file + + + + + + + \ No newline at end of file diff --git a/modulemain/src/main/res/layout/item_main_commend.xml b/modulemain/src/main/res/layout/item_main_commend.xml index 643deac..dfda2ed 100644 --- a/modulemain/src/main/res/layout/item_main_commend.xml +++ b/modulemain/src/main/res/layout/item_main_commend.xml @@ -1,46 +1,82 @@ - + android:layout_margin="10dp" + android:background="@drawable/shp_rectangle_white" + android:orientation="vertical"> + + + + + + + + - - - - \ No newline at end of file + \ No newline at end of file diff --git a/modulemain/src/main/res/layout/item_news_main.xml b/modulemain/src/main/res/layout/item_news_main.xml new file mode 100644 index 0000000..85c6bbc --- /dev/null +++ b/modulemain/src/main/res/layout/item_news_main.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modulemain/src/main/res/layout/item_news_webview.xml b/modulemain/src/main/res/layout/item_news_webview.xml index ca1d3d2..7760f87 100644 --- a/modulemain/src/main/res/layout/item_news_webview.xml +++ b/modulemain/src/main/res/layout/item_news_webview.xml @@ -6,7 +6,7 @@ android:orientation="vertical"> - diff --git a/modulemine/src/main/java/com/tengshisoft/modulemine/activity/ChangePhoneActivity.java b/modulemine/src/main/java/com/tengshisoft/modulemine/activity/ChangePhoneActivity.java index 1a6e7a9..5f7899c 100644 --- a/modulemine/src/main/java/com/tengshisoft/modulemine/activity/ChangePhoneActivity.java +++ b/modulemine/src/main/java/com/tengshisoft/modulemine/activity/ChangePhoneActivity.java @@ -2,7 +2,6 @@ package com.tengshisoft.modulemine.activity; import android.annotation.SuppressLint; import android.app.ProgressDialog; -import android.os.Bundle; import android.text.TextUtils; import android.widget.Button; import android.widget.EditText; @@ -10,14 +9,11 @@ import android.widget.EditText; import com.alibaba.android.arouter.facade.annotation.Route; import com.google.gson.Gson; import com.sucstepsoft.cm_utils.constant.PathConfig; -import com.sucstepsoft.cm_utils.constant.RegexConstants; 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.widget.base.BaseActivity; import com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView; -import com.sucstepsoft.cm_utils.utils.EncryptUtils; import com.sucstepsoft.cm_utils.utils.ExceptionHandler; import com.sucstepsoft.cm_utils.utils.RegexUtils; import com.sucstepsoft.cm_utils.utils.ToastUtils; @@ -26,7 +22,6 @@ import com.sucstepsoft.cm_utils.utils.UserLgUtils; import com.tengshisoft.modulemine.R; import com.tengshisoft.modulemine.R2; import com.tengshisoft.modulemine.beans.ChangePhoneBean; -import com.tengshisoft.mudulemain.cultural.net.HomeApi; import java.util.concurrent.TimeUnit; diff --git a/modulemine/src/main/java/com/tengshisoft/modulemine/activity/ChangePwdActivity.java b/modulemine/src/main/java/com/tengshisoft/modulemine/activity/ChangePwdActivity.java index 928d82e..5c5f1b3 100644 --- a/modulemine/src/main/java/com/tengshisoft/modulemine/activity/ChangePwdActivity.java +++ b/modulemine/src/main/java/com/tengshisoft/modulemine/activity/ChangePwdActivity.java @@ -1,7 +1,6 @@ package com.tengshisoft.modulemine.activity; import android.app.ProgressDialog; -import android.os.Bundle; import android.text.Editable; import android.text.Selection; import android.text.TextUtils; @@ -11,12 +10,10 @@ import android.widget.EditText; import android.widget.ImageView; import com.alibaba.android.arouter.facade.annotation.Route; -import com.alibaba.android.arouter.launcher.ARouter; import com.google.gson.Gson; import com.sucstepsoft.cm_utils.constant.PathConfig; import com.sucstepsoft.cm_utils.constant.RegexConstants; 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.widget.base.BaseActivity; @@ -30,7 +27,6 @@ import com.sucstepsoft.cm_utils.utils.UserLgUtils; import com.tengshisoft.modulemine.R; import com.tengshisoft.modulemine.R2; import com.tengshisoft.modulemine.beans.ChangePwdBean; -import com.tengshisoft.mudulemain.cultural.net.HomeApi; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/modulemine/src/main/java/com/tengshisoft/modulemine/activity/CollectActivity.java b/modulemine/src/main/java/com/tengshisoft/modulemine/activity/CollectActivity.java index c4084cd..3ac02d9 100644 --- a/modulemine/src/main/java/com/tengshisoft/modulemine/activity/CollectActivity.java +++ b/modulemine/src/main/java/com/tengshisoft/modulemine/activity/CollectActivity.java @@ -15,10 +15,9 @@ import com.sucstepsoft.cm_utils.utils.UserLgUtils; import com.tengshisoft.modulemine.R; import com.tengshisoft.modulemine.R2; import com.tengshisoft.modulemine.net.MineApi; -import com.tengshisoft.mudulemain.cultural.adapter.NewsAdapter; -import com.tengshisoft.mudulemain.cultural.beans.NewsItemBean; +import com.tengshisoft.mudulemain.jncultural.adapter.NewsAdapter; +import com.tengshisoft.mudulemain.jncultural.beans.NewsItemBean; -import java.security.MessageDigest; import java.util.ArrayList; import java.util.List; diff --git a/modulemine/src/main/java/com/tengshisoft/modulemine/activity/MineInfoEditActivity.java b/modulemine/src/main/java/com/tengshisoft/modulemine/activity/MineInfoEditActivity.java index ead42ca..9092c61 100644 --- a/modulemine/src/main/java/com/tengshisoft/modulemine/activity/MineInfoEditActivity.java +++ b/modulemine/src/main/java/com/tengshisoft/modulemine/activity/MineInfoEditActivity.java @@ -4,10 +4,7 @@ import android.app.ProgressDialog; import android.graphics.Color; import android.graphics.drawable.Drawable; import android.text.TextUtils; -import android.util.Base64; import android.view.Gravity; -import android.view.TextureView; -import android.view.View; import android.widget.CheckBox; import android.widget.EditText; import android.widget.LinearLayout; @@ -41,24 +38,19 @@ import com.sucstepsoft.cm_utils.utils.UIUtil; import com.sucstepsoft.cm_utils.utils.UserLgUtils; import com.tengshisoft.modulemine.R; import com.tengshisoft.modulemine.R2; -import com.tengshisoft.mudulemain.cultural.beans.AppTokenUser; -import com.tengshisoft.mudulemain.cultural.utils.AesUtil; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; import java.util.HashMap; -import java.util.IdentityHashMap; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; -import butterknife.BindInt; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.Unbinder; -import io.reactivex.MaybeEmitter; import io.reactivex.Observable; import io.reactivex.Observer; import io.reactivex.android.schedulers.AndroidSchedulers; diff --git a/modulemine/src/main/java/com/tengshisoft/modulemine/activity/SettingActivity.java b/modulemine/src/main/java/com/tengshisoft/modulemine/activity/SettingActivity.java index c091cf3..640065d 100644 --- a/modulemine/src/main/java/com/tengshisoft/modulemine/activity/SettingActivity.java +++ b/modulemine/src/main/java/com/tengshisoft/modulemine/activity/SettingActivity.java @@ -25,9 +25,6 @@ import com.sucstepsoft.cm_utils.utils.UIUtil; import com.sucstepsoft.cm_utils.utils.UserLgUtils; import com.tengshisoft.modulemine.R; import com.tengshisoft.modulemine.R2; -import com.tengshisoft.mudulemain.cultural.activitys.base.MainActivity; - -import org.aspectj.lang.annotation.Around; import androidx.annotation.Nullable; import butterknife.BindView; diff --git a/modulemine/src/main/java/com/tengshisoft/modulemine/fragments/MineMainFragment.java b/modulemine/src/main/java/com/tengshisoft/modulemine/fragments/MineMainFragment.java index a066c80..f8a1fc7 100644 --- a/modulemine/src/main/java/com/tengshisoft/modulemine/fragments/MineMainFragment.java +++ b/modulemine/src/main/java/com/tengshisoft/modulemine/fragments/MineMainFragment.java @@ -2,20 +2,15 @@ package com.tengshisoft.modulemine.fragments; import android.app.ProgressDialog; import android.content.Intent; -import android.content.res.Configuration; import android.database.Cursor; -import android.hardware.camera2.CameraCaptureSession; import android.net.Uri; import android.os.Build; -import android.os.Bundle; import android.os.Environment; import android.provider.MediaStore; import android.text.TextUtils; -import android.util.Base64; import android.view.Gravity; import android.view.View; import android.widget.ImageView; -import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; @@ -23,9 +18,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.gyf.immersionbar.ImmersionBar; -import com.gyf.immersionbar.components.SimpleImmersionOwner; -import com.gyf.immersionbar.components.SimpleImmersionProxy; import com.sucstepsoft.cm_utils.constant.PathConfig; import com.sucstepsoft.cm_utils.constant.PermissionConstants; import com.sucstepsoft.cm_utils.core.beans.BaseSuccessBean; @@ -37,11 +29,8 @@ import com.sucstepsoft.cm_utils.core.retrofit_net.api.BaseApiService; import com.sucstepsoft.cm_utils.core.retrofit_net.bean.BaseUserInfo; import com.sucstepsoft.cm_utils.core.widget.base.BaseFragment; import com.sucstepsoft.cm_utils.core.widget.base.BaseFuncAdapter; -import com.sucstepsoft.cm_utils.core.widget.base.BaseRecyclerAdapter; import com.sucstepsoft.cm_utils.core.widget.views.ButtomDialogView; -import com.sucstepsoft.cm_utils.core.widget.views.FuncBtnAdapter; import com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView; -import com.sucstepsoft.cm_utils.utils.LogUtils; import com.sucstepsoft.cm_utils.utils.PermissionUtils; import com.sucstepsoft.cm_utils.utils.ProiderUtil; import com.sucstepsoft.cm_utils.utils.ToastUtils; @@ -49,9 +38,6 @@ import com.sucstepsoft.cm_utils.utils.UIUtil; import com.sucstepsoft.cm_utils.utils.UserLgUtils; import com.tengshisoft.modulemine.R; import com.tengshisoft.modulemine.R2; -import com.tengshisoft.mudulemain.cultural.beans.AppTokenUser; -import com.tengshisoft.mudulemain.cultural.beans.BaseUserBean; -import com.tengshisoft.mudulemain.cultural.utils.AesUtil; import java.io.File; import java.util.ArrayList; @@ -61,7 +47,6 @@ import androidx.annotation.Nullable; import androidx.core.content.FileProvider; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import butterknife.BindInt; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.Unbinder; diff --git a/modulemine/src/main/java/com/tengshisoft/modulemine/net/MineApi.java b/modulemine/src/main/java/com/tengshisoft/modulemine/net/MineApi.java index d5b6f59..d6c9eba 100644 --- a/modulemine/src/main/java/com/tengshisoft/modulemine/net/MineApi.java +++ b/modulemine/src/main/java/com/tengshisoft/modulemine/net/MineApi.java @@ -1,7 +1,7 @@ package com.tengshisoft.modulemine.net; import com.tengshisoft.modulemine.beans.MineOrderBean; -import com.tengshisoft.mudulemain.cultural.beans.NewsItemBean; +import com.tengshisoft.mudulemain.jncultural.beans.NewsItemBean; import io.reactivex.Observable; import retrofit2.http.GET;