From 061e86256f6dc7cdb51014437c7d9003098e11fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=81=A5?= Date: Wed, 9 Feb 2022 11:29:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/.name | 1 + app/build.gradle | 4 +- .../ExampleInstrumentedTest.java | 6 +- app/src/main/AndroidManifest.xml | 6 +- .../{ => jncultural}/BaseMyApplication.java | 2 +- .../wxapi/WXEntryActivity.java | 4 +- app/src/main/res/values/strings.xml | 2 +- .../ExampleUnitTest.java | 2 +- build.gradle | 2 +- cm_utils/build.gradle | 5 +- .../update/utils/NotificationHelper.java | 2 +- .../widget/base/BannerImageTextAdapter.java | 22 +- .../res/drawable-xhdpi/ic_location_hollow.png | Bin 0 -> 989 bytes .../src/main/res/drawable/sp_main_live_bg.xml | 11 + .../src/main/res/layout/base_activity.xml | 2 +- .../src/main/res/layout/item_banner_text.xml | 1 + cm_utils/src/main/res/values/colors.xml | 9 +- .../beans/ActivityListBeans.java | 34 + modulemain/src/main/AndroidManifest.xml | 24 +- .../activitys/base/SplashActivity.java | 91 --- .../cultural/adapter/LiveAdapter.java | 71 -- .../activitys/base/ChooseCityActivity.java | 14 +- .../activitys/base/DemoActivity.java | 19 +- .../activitys/base/ForgatPwdActivity.java | 6 +- .../activitys/base/LoginActivity.java | 29 +- .../activitys/base/MainActivity.java | 32 +- .../activitys/base/RegisterActivity.java | 3 +- .../activitys/base/SplashActivity.java | 91 +++ .../activitys/news/NewsDetailActivity.java | 22 +- .../activitys/news/NewsListActivity.java | 26 +- .../activitys/news/NewsMainActivity.java | 11 +- .../activitys/news/NewsPdfActivity.java | 2 +- .../activitys/news/NewsWebActivity.java | 4 +- .../adapter/AreaListAdapter.java | 8 +- .../adapter/CommentAdapter.java | 11 +- .../jncultural/adapter/LiveAdapter.java | 62 ++ .../adapter/MainCommendAdapter.java | 55 +- .../adapter/MainFuncAdapter.java | 12 +- .../adapter/NewsAdapter.java | 24 +- .../jncultural/adapter/NewsMainAdapter.java | 189 +++++ .../adapter/NewsMenuAdapter.java | 5 +- .../adapter/PhotoAdapter.java | 4 +- .../base/BaseMyApplication.java | 0 .../beans/AppTokenUser.java | 2 +- .../beans/AreaListBean.java | 2 +- .../beans/BaseUserBean.java | 2 +- .../beans/CollectBean.java | 2 +- .../beans/CommentListBean.java | 2 +- .../beans/CommentPublishBean.java | 2 +- .../beans/CommentSuccessBean.java | 2 +- .../beans/ForgetPwdBean.java | 2 +- .../beans/LikeBean.java | 2 +- .../beans/LiveBean.java | 2 +- .../beans/LoginUser.java | 2 +- .../beans/MainCommendBean.java | 20 +- .../beans/MainFuncBean.java | 2 +- .../beans/NewsCommentCount.java | 2 +- .../beans/NewsItemBean.java | 38 +- .../beans/NewsTabBean.java | 2 +- .../beans/SearchBean.java | 2 +- .../beans/SuccessBean.java | 2 +- .../fragment/HomeFragment.java | 664 +++++++++--------- .../fragment/NewsFragment.java | 17 +- .../holder/AreaHolder.java | 3 +- .../holder/LiveHolder.java | 4 +- .../holder/MainCommendHolder.java | 9 +- .../holder/MainFuncHolder.java | 3 +- .../holder/NewsHolder.java | 2 +- .../holder/PhotoHolder.java | 2 +- .../holder/comment/CommentListHolder.java | 3 +- .../holder/news/NewsMainHolder.java | 31 + .../holder/news/NewsMovieHolder.java | 2 +- .../holder/news/NewsMultiPicHolder.java | 2 +- .../holder/news/NewsNoPicHolder.java | 2 +- .../news/NewsSinglePicBottomHolder.java | 2 +- .../holder/news/NewsSinglePicHolder.java | 2 +- .../holder/news/NewsSinglePicLeftHolder.java | 2 +- .../holder/news/NewsSinglePicRightHolder.java | 2 +- .../holder/news/NewsVoiceHolder.java | 2 +- .../holder/news/NewsWebHolder.java | 4 +- .../{cultural => jncultural}/net/HomeApi.java | 16 +- .../utils/AesUtil.java | 2 +- .../utils/ExceptionHandler.java | 2 +- .../utils/GetIdUtil.java | 2 +- .../utils/GpsUtils.java | 2 +- .../utils/PointUtils.java | 2 +- .../utils/RegressionLine.java | 2 +- .../widget/ButtomCommentListDialogView.java | 19 +- .../widget/NewsNoClickWebView.java | 10 +- .../res/drawable-xhdpi/ic_activity_icon.png | Bin 6815 -> 1748 bytes .../res/drawable-xhdpi/ic_activity_normal.png | Bin 3066 -> 903 bytes .../res/drawable-xhdpi/ic_activity_sel.png | Bin 3154 -> 991 bytes .../res/drawable-xhdpi/ic_clock_hollow.png | Bin 0 -> 317 bytes .../main/res/drawable-xhdpi/ic_clock_icon.png | Bin 0 -> 569 bytes .../res/drawable-xhdpi/ic_cultural_normal.png | Bin 3517 -> 1532 bytes .../res/drawable-xhdpi/ic_cultural_sel.png | Bin 3548 -> 1589 bytes .../ic_cultural_trends_icon.png | Bin 2917 -> 2508 bytes .../res/drawable-xhdpi/ic_home_normal.png | Bin 1812 -> 1182 bytes .../main/res/drawable-xhdpi/ic_home_sel.png | Bin 1781 -> 1616 bytes .../res/drawable-xhdpi/ic_legacy_icon.png | Bin 4564 -> 2367 bytes .../main/res/drawable-xhdpi/ic_live_icon.png | Bin 5400 -> 1826 bytes .../res/drawable-xhdpi/ic_mine_normal.png | Bin 2957 -> 1374 bytes .../main/res/drawable-xhdpi/ic_mine_sel.png | Bin 2869 -> 1389 bytes .../res/drawable-xhdpi/ic_phone_hollow.png | Bin 0 -> 386 bytes .../main/res/drawable-xhdpi/ic_place_icon.png | Bin 6479 -> 1910 bytes .../res/drawable-xhdpi/ic_place_normal.png | Bin 1829 -> 1336 bytes .../main/res/drawable-xhdpi/ic_place_sel.png | Bin 1860 -> 1566 bytes .../main/res/drawable-xhdpi/ic_show_icon.png | Bin 3287 -> 1802 bytes .../res/drawable-xhdpi/ic_travel_icon.png | Bin 0 -> 2051 bytes .../res/drawable-xhdpi/ic_video_play_icon.png | Bin 0 -> 453 bytes .../res/drawable-xhdpi/ic_volunteer_icon.png | Bin 6154 -> 1682 bytes .../res/drawable/shape_main_bottom_bg.xml | 2 +- .../main/res/drawable/sp_main_bottom_bg.xml | 11 + .../main/res/layout/activity_choose_city.xml | 4 +- .../src/main/res/layout/activity_demo.xml | 2 +- .../main/res/layout/activity_forgat_pwd.xml | 2 +- .../src/main/res/layout/activity_login.xml | 2 +- .../src/main/res/layout/activity_main.xml | 2 +- .../main/res/layout/activity_news_detail.xml | 2 +- .../main/res/layout/activity_news_main.xml | 2 +- .../src/main/res/layout/activity_news_pdf.xml | 2 +- .../src/main/res/layout/activity_news_web.xml | 2 +- .../src/main/res/layout/activity_register.xml | 2 +- .../src/main/res/layout/activity_splash.xml | 2 +- .../src/main/res/layout/fragment_home.xml | 127 ++-- modulemain/src/main/res/layout/item_live.xml | 100 ++- .../src/main/res/layout/item_main_commend.xml | 84 ++- .../src/main/res/layout/item_news_main.xml | 75 ++ .../src/main/res/layout/item_news_webview.xml | 2 +- .../activity/ChangePhoneActivity.java | 5 - .../activity/ChangePwdActivity.java | 4 - .../modulemine/activity/CollectActivity.java | 5 +- .../activity/MineInfoEditActivity.java | 8 - .../modulemine/activity/SettingActivity.java | 3 - .../fragments/MineMainFragment.java | 15 - .../tengshisoft/modulemine/net/MineApi.java | 2 +- 136 files changed, 1280 insertions(+), 1022 deletions(-) create mode 100644 .idea/.name rename app/src/androidTest/java/com/tengshisoft/{cultural => jncultural}/ExampleInstrumentedTest.java (87%) rename app/src/main/java/com/tengshisoft/{ => jncultural}/BaseMyApplication.java (98%) rename app/src/main/java/com/tengshisoft/{cultural => jncultural}/wxapi/WXEntryActivity.java (79%) rename app/src/test/java/com/tengshisoft/{cultural => jncultural}/ExampleUnitTest.java (90%) create mode 100644 cm_utils/src/main/res/drawable-xhdpi/ic_location_hollow.png create mode 100644 cm_utils/src/main/res/drawable/sp_main_live_bg.xml delete mode 100644 modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/SplashActivity.java delete mode 100644 modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/LiveAdapter.java rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/activitys/base/ChooseCityActivity.java (97%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/activitys/base/DemoActivity.java (62%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/activitys/base/ForgatPwdActivity.java (98%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/activitys/base/LoginActivity.java (89%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/activitys/base/MainActivity.java (95%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/activitys/base/RegisterActivity.java (99%) create mode 100644 modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/base/SplashActivity.java rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/activitys/news/NewsDetailActivity.java (98%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/activitys/news/NewsListActivity.java (92%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/activitys/news/NewsMainActivity.java (95%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/activitys/news/NewsPdfActivity.java (98%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/activitys/news/NewsWebActivity.java (97%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/adapter/AreaListAdapter.java (82%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/adapter/CommentAdapter.java (93%) create mode 100644 modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/adapter/LiveAdapter.java rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/adapter/MainCommendAdapter.java (51%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/adapter/MainFuncAdapter.java (78%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/adapter/NewsAdapter.java (94%) create mode 100644 modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/adapter/NewsMainAdapter.java rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/adapter/NewsMenuAdapter.java (93%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/adapter/PhotoAdapter.java (91%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/base/BaseMyApplication.java (100%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/beans/AppTokenUser.java (98%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/beans/AreaListBean.java (98%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/beans/BaseUserBean.java (83%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/beans/CollectBean.java (88%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/beans/CommentListBean.java (99%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/beans/CommentPublishBean.java (98%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/beans/CommentSuccessBean.java (71%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/beans/ForgetPwdBean.java (93%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/beans/LikeBean.java (92%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/beans/LiveBean.java (94%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/beans/LoginUser.java (97%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/beans/MainCommendBean.java (66%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/beans/MainFuncBean.java (89%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/beans/NewsCommentCount.java (90%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/beans/NewsItemBean.java (87%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/beans/NewsTabBean.java (98%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/beans/SearchBean.java (98%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/beans/SuccessBean.java (69%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/fragment/HomeFragment.java (54%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/fragment/NewsFragment.java (96%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/holder/AreaHolder.java (85%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/holder/LiveHolder.java (83%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/holder/MainCommendHolder.java (70%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/holder/MainFuncHolder.java (88%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/holder/NewsHolder.java (86%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/holder/PhotoHolder.java (90%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/holder/comment/CommentListHolder.java (94%) create mode 100644 modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/holder/news/NewsMainHolder.java rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/holder/news/NewsMovieHolder.java (95%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/holder/news/NewsMultiPicHolder.java (95%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/holder/news/NewsNoPicHolder.java (94%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/holder/news/NewsSinglePicBottomHolder.java (95%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/holder/news/NewsSinglePicHolder.java (94%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/holder/news/NewsSinglePicLeftHolder.java (95%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/holder/news/NewsSinglePicRightHolder.java (95%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/holder/news/NewsVoiceHolder.java (94%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/holder/news/NewsWebHolder.java (78%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/net/HomeApi.java (95%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/utils/AesUtil.java (96%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/utils/ExceptionHandler.java (98%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/utils/GetIdUtil.java (98%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/utils/GpsUtils.java (97%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/utils/PointUtils.java (98%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/utils/RegressionLine.java (70%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/widget/ButtomCommentListDialogView.java (98%) rename modulemain/src/main/java/com/tengshisoft/mudulemain/{cultural => jncultural}/widget/NewsNoClickWebView.java (82%) create mode 100644 modulemain/src/main/res/drawable-xhdpi/ic_clock_hollow.png create mode 100644 modulemain/src/main/res/drawable-xhdpi/ic_clock_icon.png create mode 100644 modulemain/src/main/res/drawable-xhdpi/ic_phone_hollow.png create mode 100644 modulemain/src/main/res/drawable-xhdpi/ic_travel_icon.png create mode 100644 modulemain/src/main/res/drawable-xhdpi/ic_video_play_icon.png create mode 100644 modulemain/src/main/res/drawable/sp_main_bottom_bg.xml create mode 100644 modulemain/src/main/res/layout/item_news_main.xml 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 BannerAdapterPx&mq|oHR9HvtmP@D{MHGhrQ*Ex`!Yhgfy&;f=3L0IA!Dz(97*tGrY;G1xByhWm zF$$6gf+#pXK_R*jhn_lhM^O;Lg&GwUl?1sY7YPW)ECPxV@rAkwiU_9rmkNEQ88b6I z9W)53<32-rhBP913W1jKe&((#g4PdR^31Az5R{%UKA_u+qf5t-2xkV%|E%!IYeO29F z2ci~$we|%7TSz_{LTC?5oTh18L>>XqQPq1#L5u{j*4_r-EfLw^y?=L9!cvj-B;NsW zyQ=OQ_Mf2u&biA-enhg(*Q0a8Qbt>2;sqMp;C!0B65TG{=guJp#av}%>Z_) z>N(W}*4nQC{0QJ6fIk4N2C!IF&+Uu*1;BPyeW?*Znx;>P$U0SBxsbqG8z=lMRbAd! zY&XfDLI@ixvGXK93?V$+2*6tVDuAP^dUx5|r6j-3^Zc4#ueYz7bY^B|l`&>6Ns?t* zmK~0J*4mc=oTjRGHU)T(Rc~$z5Jcp3 z?|r=6@xGr=@;edP=)HfvuLTYQh5)&19ElHAVywU>YQ6z z6vdo~Jg%xb3b+0I zMYGAU-_tO#pB<$;=qDqTB86|IYxNb6cZD14yFfR^NbeAQ~%B z-imLcH%v`UUC?f~i*X7s#GVjVF5u0XZRnaS9EJJq7R=Y4D#gL=iXi00000 LNkvXXu0mjfqk_fA literal 0 HcmV?d00001 diff --git a/cm_utils/src/main/res/drawable/sp_main_live_bg.xml b/cm_utils/src/main/res/drawable/sp_main_live_bg.xml new file mode 100644 index 0000000..e0d92a2 --- /dev/null +++ b/cm_utils/src/main/res/drawable/sp_main_live_bg.xml @@ -0,0 +1,11 @@ + + + + + + \ 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 67451041cc4472a2597ff00375ef1c9cf5925624..8d8783957d0a51ddbb3906811574e68f324bb864 100644 GIT binary patch literal 1748 zcmah|SyWS36n!Anh)j_nqaqQtVim0u7KJb-pdcVsL{ta_L99%sfTW5D0y4%>Dka4M z!yp71f>MYAAu#g0UVz(|ubx0O%G6?h5hNiXY~nR4PFbRIAkx1i>&o zH8nLohu5!P|2YTk)hFc>znX*Asl_Knn`o;(7k(D!EdP46;-}+hv)2D*KG)#C>C1-y z?f5@+!Cs!hKHkE8Ji}0)Q7F%NKhHRfXL^8-4CgNj=c5ktEe`W7BluR4d}}=42G6&R z;xCC3ER7b}5d_N!0{a*N`iNlp5y6T$!OEk8uj2));{}e#gx~xiT$dnpN))b76n>j5 z+?Xuflp@@mBHVI9xRoe!CW>6rMBCFuuIVC7hR8ibf^ljU-E>E=Z#&(rAj5P$rEjlg5@yeP9TPr_zU6I$I$Zu2>&=rMrMM<-wv_)~DRawqZUc9NKb||ZF zt7zS-nr>BXkE*Um)xc6U_JMRZ*fIdN4uEZgVEYhwa~Qle40ha8caEyNIqDvcy7!@) zHKxA%2h=|f4U9vB6VT8EG{S{OpFj^Lp|R(hiI;b--Z)9v@ zy2#9Yv6YSOQdc*OyQde<_xrtxDJL>WKT*nlF26>rsjaJTYGW{O-|6mU^|9~v4-O5F zjNX618GFGKia<4_Z9VrUwUy0bpK*ua|pB>)3yImnUKuKq}w zqn_;dW#!2aDGNCacgyJNZ7#iByGU|3{0(5fGuyxXdMjdj@3O+=y_LS4(1PZp)%}Ix z2XfcPzhmqQN%G)|udy(p_Q3uP@97Aym3y*tPOV3{(S5V$>0ap5bGJJ)lw2(WjQo z5UX_Ey<&bT>#iIWNpfjVf;y004JUJH#phexZkGr(XqMk9K`POo6ukJHIho^8*{84H z_o{V;&Kh)!C!UmWr+qn-kv{A3ommSSZ|&d{wTR#_zVlRjza?|>C-r>7tMIE67ANao z->@C|P^X!79ll<)*ueWi{dh!@vzm#xy$u)UBs5t8(d{ifZ}q`PX5`1mj?$064SDXj zuCom=E>(I)_dm?X9`Z&4f~Ai>06)MMsg5zv)-k8_&sR){dmXGI|E2}B}6ei1oVGK#dAT>bbK6W3TW zx~e7%te&bI3l#URPWURGJw6mVpr~ag><;L>(d@%4uJIJN@9c6pFYBt38O5`4v~1)7 zm?F1JLpi0ttg|G4cnA71pO$Pn6yU#x03EW9K4x!AL8*R@H?gsEP9 zj7_TfsjQ7{MLX*<_$$-ucPFGxZ;e=~IdT(}-eCJC22nPXE_b5rdi~7Pa8V5{)F2AM z8F6p3*kq*H)oh<~4R!b-(Xb+8))ae?7E{0&eJT6 e{dPaL`Mqvly+ULkckf56u}z^ln4BI_SsRr5Ol literal 6815 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 N002ovPDHLkV1lLk;Qjyr 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 8908627131427d7ee6057e87dc3116e7a6977661..ac6d85474135f0723214ff61b2ff483dc263459c 100644 GIT binary patch literal 903 zcmeAS@N?(olHy`uVBq!ia0vp^3P7yH!3-ohbF|L_DaPU;cPEB*=VV?2*?9pzA+A8d zhK7b!t5!{#G->|)`F(wTGiT16I&~_L3nU@zIdkR!84z;TtXb2iPoFVk29N<1oIQIs zgbf#gh$C}>YzP-f0<{1Yz_}0xP!P@lvf%)t9>Rqf3uHqCk=4VMLDXP60HO=c1h`QU z^XWr=|36Ov7~+*BL4LsuENtu?oLoG75|Xm=$|@S#I{F6Y7M50aE^eOQzJ3A0A>k2` zQL%9eiOE^nx%mYZwe<~+O)ae*o&6IgPMtnu=B&B%7A{@3V&&?!8#Zm;x^vIoeFqO6 zK6>KR=`-ifU$}Jn>h+tqA3S{Y_{r1fFJHfX_v!POZ$Ezi`u+Ex`}-boVDvkAx;Tbd zoPIj_Y7n!dh>JAGJ0Mth@UE@{6U#J#ghK23^UNYS3D3DL`oGUx_40P8vS-)YD6WW! zF>~^^slV)2vtQRzW%vE8!-?&myZ0I==(q*R-r1`1f`8s6g&vQMj&j^jydDXjw_Npn zZz$U)`59NWre9QZwDT)Dw69QKKQZ!6&EAL?3ZILwwf@yz(lSSMkC^AAU9wJYDV|p+ zEpcpLu%}I4>a@+IC51VWZ)Q3BC7*tDLdPfZ^rIU(Jjth%&g*=!a^7|EZ+z>g)~U}d zHc!~b^FZH#bL#bk`GVD tTgd+*L^(CLWqpmPo_z7&Psid{^3UR#a-!EDzZMv!44$rjF6*2UngB$p(2xKC literal 3066 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 IM6N<$g3r0g!2kdN 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 86d56a0a3e6b7b5c412267653f413d9404d69d86..ab0aebee36f00ca86cc43e0ee7eb32eb32e7e824 100644 GIT binary patch literal 991 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 literal 3517 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 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 54707727c08240a968ed4ed107e0e81c0634da70..5c787f53e6ad3e9be6de63390d85e3f5fee28bd6 100644 GIT binary patch literal 1589 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 literal 1812 zcmV+v2kZEWP)FkARy5u#(^&1%MSqWCDOQN%X%V;+u@I{a&y4S78$f1cYrZ0IURn$|Qbb z@py|dw#)1Fp2!%PQ5woBIH9UwFu0P4o+6^zh?s2XePkHMhKh=cZ>y@R?D&}de!ru# zvT~+v+Z%|eK31lTOe+ci=NMzJMk0}2xtRO10xlE^<#En$i$pPj9K}$;nMs901%10FIH-3RMx&mxf`i4Tr8vqU=;vS#R_i3izyij^~clRAc zBvxLrWfObcM2p8)h`777v^2D6(W1y$<4{&yFc`dtbG|iJCKM){YXIQMfq{YchK7bP z0Hj<1#*$2PbMqAi1qJs;qtTZDV0NOmh)8VP+7WTBX_`Ner9WwKqP9ZBHAJ)y0H!BV zSuY~KTU=bc(d~BsIhFureJ#tX0Dwl$`FunyPU3$G0G=r+DLL$RyOriyDR81Lvn)%L z7^@L6Kf&Z5A)B_`uaRX^f&;_Nm9BDF~)W{9F7+}9?u2Y z7bFEP5D17M#0quUrW_IbMEwK+A)n8eQ1{>!IwGbPmk!NpD}ifF}AvGBD$}(w)Tun0{<&;0*qx@okVm)Jh(_CvT)h5Wl~!+4G!_7 z2A9TI(~3(2QX&%#PJ>emD#z%4<< zI~7?-xpB@fFvglvoo1Rei-T0=IWX4X6d_LtBGi;uIAZ3WKZtH@0Prb?IqsLmbn8fQT-;JtG^yc-f14WQh2P!{KQ6cs$|~ozx=@ zPP8sgb@%r6it9&<5z$3N$!-No1(OTo*suLxAmZM!9P(BImx}}^dLJ5`;v3T7G&n^9 zif&qQ8k`~lMK`TD4Nj4OqMKHn2B%0s(M>B(5!^r1{FsZ^H>0Wm0000 CyhN-3 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 003727e8dbdeddf7da9917c9799db5f7ffb1c8fd..bb74c4e80bac142a8cc777bdb9498831c7146afe 100644 GIT binary patch literal 1616 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 X{tnEGyjCd!00000NkvXXu0mjf>+DS* 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 7080a9003cb6c3f9c7521e919cb82bc51d8421b4..1ed6b895838f8f7c32db8f7d8ecbcc3ba34c4d55 100644 GIT binary patch literal 2367 zcmV-F3BdM=P)Px-`AI}URCwC$U3YL4RT#g&bi_dv6=gtl6h#yiMn|d?0~&-u8HZ4$M2dhEgQ0{H z=^0TJUzK z(rMwkefxGxEPOQL1md0s2(K&dDRqlRQCg`^0DNM4VByk2l>F*MNyEDLRD%G$urQeo zi2Mg3leh@D03{_Q%`xL-CO}0HC&W#ltY9!^>SDw{5H8}#Zvp_oLzqDVBf8esk${{% z>{Ai!c6(#&z8zr%*BKeeTT@>(MNcEnF;cz8dE&6%gECAcmyuaNpjG5~Js2dPfQh6t zB7KH*;$rPVWesVJoPZ;(vNbfr5AQN!0*<@Hefhy# z6eA^QgS;r_q}AlKDHzqj=9*PE_bmqm(KPxoGJ@Vb^&>|;kC74dZfq=B#12MA&@EyI zIqDonM$nO?Q~+9|BpwDVF+uxj z95nw-e;?Z6=K~g-V0@wl*6y`J_C=?BKNF%J7y?uVm4nLD;Dk7J$p!7EaH+O1h}tg37OXA(D^S zG%bP$R1eJxVRcB*dZHmDgrIs*eKaXV%#W6k5W$0(A1vAwA}rSA7eXE#QV7qDH9+T? z9E2}4L91~F=!EaP%;Mk`jIPr6{>V2hmeZyXHm3w}zuIKd>Pvik49+E`*&(Yygs-<+ zVbZ#?r*q&^6J!<$^7~`w1$cK32kH3&B(jIQaf|yG(AEStj5WB62Q^6`sxy7n$JrdAAVX?Y6<>4P_#IwTXvm8+cfM zzz*GFI62+Al;QJ4UM_z~jjWGf5TNhZH9w*6L>r+kP7GZ$mi6CfZ{{E}!A-tXD3YK0 z^H<&9Q}aY=)BBI&xYF=M23kpnD6Yb+Tx7gijwjVr21+xtKn(4m-xi#*tZIPw+7zQ~ z0WPTsR_?Y#XKeFtn%pE>Y%b_Hy^NfZ@f>V8;3oV7B<&=Q+^JVXexlIqzK2BLe5fpD zl(gRl-RGDg|C$IJ58CDYs+ynJcFfUm!r=6jF4}H|XCup=&M|9wSp?5-7UTEiggwNr zN8-a5xd&GySmYXa6ZHN96XahJ;g2%{^hcjSpKU&5hp>f)(zMp>wZU6o8A_WO3G*43 zXek%Y(8JOcThJC71bv3?(hV1kj<+HiHk|6)algE4L@DJw-Y|gqeh+JyBJ{={*s<%p0xh90Hd}dD zMTpvDDIH(5!Su=MB#Eu!s6JY2cCYAYG93NKU;{iq-T>>+Cs0?E#tdiv6481%Sea^r z(dZ|Jud=}OjXZpb7`e&}n@~&=w9^buwvINFF`XedLKx06oj8dGun(F4a39k2;{34?J@kJ8JdUs{wlaH+Y%psgEx(DB4h^+ z;?|;HcwxMu!pOJ0IORv~FHSI^AF+YpVvCUd0vc^cZ|2=|-&F+nnxHr{u-UrKxinQT z%`VH&yW)aDOL%nViU|1nNgNOPS6!N{k7k89cvghobIZ+lpb&i)Sl~#$$b<+4a&f>m z^t)>2z)_G{-Oq&Z5q>&s_euzw`(RCzkFj!3-Ng8ImrW~m`&V=S@V*si z&uaSrI{H5Os6$J=CZ{I1fG}YXY6C6?_!xtJ9j6=Re^8`X3IfvSCaa{iaYP~86h$qY zqOfg(RI*JF9d^gaP{+nuY%4i6Y$eAwR}B8qwKO-jK*w2nFP)E152Rq0^O-{PSLzThA7$yM>wnZq3k+X;4E+EA002ovPDHLkV1lfQXovs+ literal 4564 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 Dix#3= 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 aa9c2134ea6cb22d7e071bc27ffa3cf270a1a3fb..7c3e9908b6058c579d3fd5789110d380e0e90c02 100644 GIT binary patch literal 1389 zcmV-z1(N!SP)Px)CrLy>R9M5kR}X9xRTw`6rV@em&xXV4K)2qNjR~Rzjk2k*h$L#%N$A~mV~KNM z7Bz}!oXIS@M56>DM#xP38x@qzKLHaLC~dDsHyjR~Ob6|~>oSKraFMoGhn(NLzP4x6 zyS6~M*4t)yZ1raP9`ohAZmrcCXV&c)Q z6s1g|F4$AAOf|D&6BybLqU0#OCKf$oZ5o<+Ubd}Vuof#zQ+^zFdBDtxufh9ict2%k zrOhzD*UY1%@cuV37d&&!!XrL!!}A)0msvRR4UN$-$X4v$()!Tl`raBWDC7dyTUhBi zm_L?UFYPn4Bc(YRpXnU2m^jIuSZw0Z=a#iWCV%gVC9r;nM$d3|J*~r+s%TS-Hl1$@ zfu4sz{vtYmEM6O!qdOUPzMV{rWsBV@_o8{@?&@XZ`>SpddzRS^K{&;mLFWloH;a03 zs4^fGA4u+;l{V-p3w!M)Q7`>w)JLBNQHaE3pKVXf!z|QW2W5IEB&AGp!u7w8bDKwJ zz=uE_p|nR&Nz`vI17kxP!x1eI*+-v@dYKws53{I)RELa{HT6L)Cos;V@ggo%o@uc% zxS#-x9EcmUjYS2f0RxJ-%S&a!whG36B0v!KQYIZm^}k<%^C0d8@k4bGmlX^Qk-;r` z=w*SvhZu-PJr&E-zehaRU9AFxIT0W8q;4oUyA>)REEnp(Qh9AJe5VasuQ%AfLO#p7O;& zIycCErY<7bwk5(4&jY3(b3^7T2;D_Ia1=ZszC_S?GZ>!^nY}l)JKL*afu5`Dsh(?R zLj^ppq32&R%?EG4PKfU-_#>?$0RE_M@fW9+l`E0?xx_X}NM74g;wc4tF9Q!8Nw)i< z#^9CMI3AeaG}xLfE5E&pG#eb($MQV~$bx+(Nzm}Iear7i#-9(>fUQZ8v$#zYevTi% zu3GnNe{1`;S%i4rBD?Q1Vl_kZ66p6~{bXbH}i7JdgJgA1F_^)xilRae~Cy?T3R=f>L-W3wH|gip+v3)12uxr%skl74vL z;KoU5tmcWgp0d6`I5&FLd4;_R{N>-PBa-Vm&7Q_%%=>K@0-N zXv5~6?HA%=lh=HUBeayz^JMk<-aj2}AGww^ADVtHwjtr}hgu&{J8ip?dmZfXzX?dZ?2UQayMxaK1oaW^3_zJ@~Y&?i}xu vLwz73x&Muk--p3NU1nZ-0`7)4<*N5T{+;SKxzU5k00000NkvXXu0mjf4v2## literal 2869 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 literal 0 HcmV?d00001 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 c21423bcd9e71941c5022a7359b3dda9ca53bf21..bb3b767253e93887f85a8a981b2651c7657e9358 100644 GIT binary patch literal 1910 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 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 9f9f9e9cae7ffb14ba4ff78d3d4ca6777668c75c..0c4f26cb365ef8b83e225b39dbbf32faf11392d4 100644 GIT binary patch literal 1336 zcmeAS@N?(olHy`uVBq!ia0vp^N+8U^3=*07`vZ_-EDmyaVpw-h<|P9IlW>4fh$~RA zp`l?F7)+WpY5x5Aixw@KJ9jRSJ#E^wIdkSrnKEVO%$f7%&6_=Y_SC6Ufl?3#P!K2! zWCNAWm@#A4tXV(?kPBo_pFSNZ3uHq`pa`4+R0fxY=tAQ{6a$q30ZoIHKz{Dq5`E?>EN z?fQ+Iw{G9L_wdo@wc2K-dlYqmXvNaG1*e`bu!P5%Yw@F z4PWB#uRLTE>iAmXe8G5Ah`1M=DQePIoNnbJA-_`xUNy?3wZV`pqm# zz0Og_0w`TW_;9C$O;pLLS3o!?UDO`2zvu6%G7N~y9xnK0dS zb34D_$2Q#xH}*w-!4*X&>=E|v+DcYGgq(BQe4ak3^*AMYLFti@{UhycMdOL=3SL#N z>?xr#ZS&1etg>9!n4w%LvB_)K!!%)~N%k8BCl#H`P+XmCzpIj8&^1MI!M*hP513u< zKFYrGSyt&y$H1TbpaM zfA`Y43btuSPHKlaK8%>Ld8%eWfc*b+K^ku*mD{tfId1#*hru$_f#Wh(_t-VC0uelF{r G5}E+ChogZ2 literal 1829 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 - + + + + + + \ 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;